diff --git a/src/ints/bios.cpp b/src/ints/bios.cpp
index ca8d2987..f67866ab 100644
--- a/src/ints/bios.cpp
+++ b/src/ints/bios.cpp
@@ -16,24 +16,26 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: bios.cpp,v 1.40 2005-02-24 17:50:58 qbix79 Exp $ */
+/* $Id: bios.cpp,v 1.41 2005-03-25 11:59:24 qbix79 Exp $ */
 
-#include <time.h>
 #include "dosbox.h"
+#include "mem.h"
 #include "bios.h"
 #include "regs.h"
 #include "cpu.h"
 #include "callback.h"
 #include "inout.h"
-#include "mem.h"
 #include "pic.h"
 #include "joystick.h"
-#include "dos_inc.h"
 #include "mouse.h"
+#include "setup.h"
 
-static Bitu call_int1a,call_int11,call_int8,call_int17,call_int12,call_int15,call_int1c;
-static Bitu call_int1,call_int70,call_int14;
+
+/* if mem_systems 0 then size_extended is reported as the real size else 
+ * zero is reported. ems and xms can increase or decrease the other_memsystems
+ * counter using the BIOS_ZeroExtendedSize call */
 static Bit16u size_extended;
+static Bits other_memsystems=0;
 
 static Bitu INT70_Handler(void) {
 	/* Acknowledge irq with cmos */
@@ -311,7 +313,7 @@ static Bitu INT15_Handler(void) {
 			break;
 		}	
 	case 0x88:	/* SYSTEM - GET EXTENDED MEMORY SIZE (286+) */
-		reg_ax=size_extended;
+		reg_ax=other_memsystems?0:size_extended;
 		LOG(LOG_BIOS,LOG_NORMAL)("INT15:Function 0x88 Remaining %04X kb",reg_ax);
 		CALLBACK_SCF(false);
 		break;
@@ -414,108 +416,132 @@ static Bitu INT1_Single_Step(void) {
 	return CBRET_NONE;
 }
 
-void BIOS_ZeroExtendedSize(void) {
-	size_extended=0;
+void BIOS_ZeroExtendedSize(bool in) {
+	if(in) other_memsystems++; 
+	else other_memsystems--;
+	if(other_memsystems < 0) other_memsystems=0;
 }
 
 void BIOS_SetupKeyboard(void);
 void BIOS_SetupDisks(void);
 
-void BIOS_Init(Section* sec) {
-	MSG_Add("BIOS_CONFIGFILE_HELP","Nothing to setup yet!\n");
-	/* Clear the Bios Data Area */
-	for (Bit16u i=0;i<1024;i++) real_writeb(0x40,i,0);
-	/* Setup all the interrupt handlers the bios controls */
-	/* INT 8 Clock IRQ Handler */
-	//TODO Maybe give this a special callback that will also call int 8 instead of starting 
-	//a new system
-	call_int8=CALLBACK_Allocate();	
-	CALLBACK_Setup(call_int8,&INT8_Handler,CB_IRET,"Int 8 Clock");
-	phys_writeb(CB_BASE+(call_int8<<4)+0,(Bit8u)0xFE);		//GRP 4
-	phys_writeb(CB_BASE+(call_int8<<4)+1,(Bit8u)0x38);		//Extra Callback instruction
-	phys_writew(CB_BASE+(call_int8<<4)+2,call_int8);		//The immediate word          
-	phys_writeb(CB_BASE+(call_int8<<4)+4,(Bit8u)0x50);		// push ax
-	phys_writeb(CB_BASE+(call_int8<<4)+5,(Bit8u)0xb0);		// mov al, 0x20
-	phys_writeb(CB_BASE+(call_int8<<4)+6,(Bit8u)0x20);
-	phys_writeb(CB_BASE+(call_int8<<4)+7,(Bit8u)0xe6);		// out 0x20, al
-	phys_writeb(CB_BASE+(call_int8<<4)+8,(Bit8u)0x20);
-	phys_writeb(CB_BASE+(call_int8<<4)+9,(Bit8u)0x58);		// pop ax
-	phys_writeb(CB_BASE+(call_int8<<4)+10,(Bit8u)0xcf);		// iret
+class BIOS:public Module_base{
+private:
+	CALLBACK_HandlerObject callback[10];
+public:
+	BIOS(Section* configuration):Module_base(configuration){
+		MSG_Add("BIOS_CONFIGFILE_HELP","Nothing to setup yet!\n");
+		/* Clear the Bios Data Area */
+		for (Bit16u i=0;i<1024;i++) real_writeb(0x40,i,0);
+		/* Setup all the interrupt handlers the bios controls */
+		/* INT 8 Clock IRQ Handler */
+		//TODO Maybe give this a special callback that will also call int 8 instead of starting 
+		//a new system
+		callback[0].Install(INT8_Handler,CB_IRET,"Int 8 Clock");
+		callback[0].Set_RealVec(0x8);
+		Bit16u call_int8=callback[0].Get_callback();
+		phys_writeb(CB_BASE+(call_int8<<4)+0,(Bit8u)0xFE);		//GRP 4
+		phys_writeb(CB_BASE+(call_int8<<4)+1,(Bit8u)0x38);		//Extra Callback instruction
+		phys_writew(CB_BASE+(call_int8<<4)+2,call_int8);		//The immediate word          
+		phys_writeb(CB_BASE+(call_int8<<4)+4,(Bit8u)0x50);		// push ax
+		phys_writeb(CB_BASE+(call_int8<<4)+5,(Bit8u)0xb0);		// mov al, 0x20
+		phys_writeb(CB_BASE+(call_int8<<4)+6,(Bit8u)0x20);
+		phys_writeb(CB_BASE+(call_int8<<4)+7,(Bit8u)0xe6);		// out 0x20, al
+		phys_writeb(CB_BASE+(call_int8<<4)+8,(Bit8u)0x20);
+		phys_writeb(CB_BASE+(call_int8<<4)+9,(Bit8u)0x58);		// pop ax
+		phys_writeb(CB_BASE+(call_int8<<4)+10,(Bit8u)0xcf);		// iret
 
-	mem_writed(BIOS_TIMER,0);			//Calculate the correct time
-	RealSetVec(0x8,CALLBACK_RealPointer(call_int8));
-	/* INT 11 Get equipment list */
-	call_int11=CALLBACK_Allocate();	
-	CALLBACK_Setup(call_int11,&INT11_Handler,CB_IRET,"Int 11 Equipment");
-	RealSetVec(0x11,CALLBACK_RealPointer(call_int11));
-	/* INT 12 Memory Size default at 640 kb */
-	call_int12=CALLBACK_Allocate();	
-	CALLBACK_Setup(call_int12,&INT12_Handler,CB_IRET,"Int 12 Memory");
-	RealSetVec(0x12,CALLBACK_RealPointer(call_int12));
-	mem_writew(BIOS_MEMORY_SIZE,640);
-	/* INT 13 Bios Disk Support */
-	BIOS_SetupDisks();
-	call_int14=CALLBACK_Allocate();	
-	CALLBACK_Setup(call_int14,&INT14_Handler,CB_IRET,"Int 14 COM-port");
-	RealSetVec(0x14,CALLBACK_RealPointer(call_int14));
-	/* INT 15 Misc Calls */
-	call_int15=CALLBACK_Allocate();	
-	CALLBACK_Setup(call_int15,&INT15_Handler,CB_IRET,"Int 15 Bios");
-	RealSetVec(0x15,CALLBACK_RealPointer(call_int15));
-	/* INT 16 Keyboard handled in another file */
-	BIOS_SetupKeyboard();
-	/* INT 16 Printer Routines */
-	call_int17=CALLBACK_Allocate();	
-	CALLBACK_Setup(call_int17,&INT17_Handler,CB_IRET,"Int 17 Printer");
-	RealSetVec(0x17,CALLBACK_RealPointer(call_int17));
-	/* INT 1A TIME and some other functions */
-	call_int1a=CALLBACK_Allocate();	
-	CALLBACK_Setup(call_int1a,&INT1A_Handler,CB_IRET_STI,"Int 1a Time");
-	RealSetVec(0x1A,CALLBACK_RealPointer(call_int1a));
-	/* INT 1C System Timer tick called from INT 8 */
-	call_int1c=CALLBACK_Allocate();
-	CALLBACK_Setup(call_int1c,&INT1C_Handler,CB_IRET,"Int 1c Timer tick");
-	RealSetVec(0x1C,CALLBACK_RealPointer(call_int1c));
-	/* IRQ 8 RTC Handler */
-	call_int70=CALLBACK_Allocate();
-	CALLBACK_Setup(call_int70,&INT70_Handler,CB_IRET,"Int 70 RTC");
-	RealSetVec(0x70,CALLBACK_RealPointer(call_int70));
+		mem_writed(BIOS_TIMER,0);			//Calculate the correct time
 
-	/* Some defeault CPU error interrupt handlers */
-	call_int1=CALLBACK_Allocate();
-	CALLBACK_Setup(call_int1,&INT1_Single_Step,CB_IRET,"Int 1 Single step");
-	RealSetVec(0x1,CALLBACK_RealPointer(call_int1));
+		/* INT 11 Get equipment list */
+		callback[1].Install(&INT11_Handler,CB_IRET,"Int 11 Equipment");
+		callback[1].Set_RealVec(0x11);
 
-	/* Setup some stuff in 0x40 bios segment */
-	/* Test for parallel port */
-	if (IO_Read(0x378)!=0xff) real_writew(0x40,0x08,0x378);
-	/* Test for serial port */
-	Bitu index=0;
-	if (IO_Read(0x3fa)!=0xff) real_writew(0x40,(index++)*2,0x3f8);
-	if (IO_Read(0x2fa)!=0xff) real_writew(0x40,(index++)*2,0x2f8);
-	/* Setup equipment list */
-	Bitu config=0x4400;						//1 Floppy, 2 serial and 1 parrallel
+		/* INT 12 Memory Size default at 640 kb */
+		callback[2].Install(&INT12_Handler,CB_IRET,"Int 12 Memory");
+		callback[2].Set_RealVec(0x12);
+		mem_writew(BIOS_MEMORY_SIZE,640);
+		
+		/* INT 13 Bios Disk Support */
+		BIOS_SetupDisks();
+
+		callback[3].Install(&INT14_Handler,CB_IRET,"Int 14 COM-port");
+		callback[3].Set_RealVec(0x14);
+
+		/* INT 15 Misc Calls */
+		callback[4].Install(&INT15_Handler,CB_IRET,"Int 15 Bios");
+		callback[4].Set_RealVec(0x15);
+
+		/* INT 16 Keyboard handled in another file */
+		BIOS_SetupKeyboard();
+
+		/* INT 17 Printer Routines */
+		callback[5].Install(&INT17_Handler,CB_IRET,"Int 17 Printer");
+		callback[5].Set_RealVec(0x17);
+
+		/* INT 1A TIME and some other functions */
+		callback[6].Install(&INT1A_Handler,CB_IRET_STI,"Int 1a Time");
+		callback[6].Set_RealVec(0x1A);
+
+		/* INT 1C System Timer tick called from INT 8 */
+		callback[7].Install(&INT1C_Handler,CB_IRET,"Int 1c Timer tick");
+		callback[7].Set_RealVec(0x1C);
+		
+		/* IRQ 8 RTC Handler */
+		callback[8].Install(&INT70_Handler,CB_IRET,"Int 70 RTC");
+		callback[8].Set_RealVec(0x70);
+
+		/* Some defeault CPU error interrupt handlers */
+		callback[9].Install(&INT1_Single_Step,CB_IRET,"Int 1 Single step");
+		callback[9].Set_RealVec(0x1);
+		
+		/* Setup some stuff in 0x40 bios segment */
+		/* Test for parallel port */
+		if (IO_Read(0x378)!=0xff) real_writew(0x40,0x08,0x378);
+		/* Test for serial port */
+		Bitu index=0;
+		if (IO_Read(0x3fa)!=0xff) real_writew(0x40,(index++)*2,0x3f8);
+		if (IO_Read(0x2fa)!=0xff) real_writew(0x40,(index++)*2,0x2f8);
+		/* Setup equipment list */
+		//1 Floppy, 2 serial and 1 parrallel
+		Bitu config=0x4400;
 #if (C_FPU)
-	config|=0x2;					//FPU
+		//FPU
+		config|=0x2;
 #endif
-	switch (machine) {
-	case MCH_HERC:
-		config|=0x30;						//Startup monochrome
-		break;
-	case MCH_CGA:	case MCH_TANDY:
-		config|=0x20;				//Startup 80x25 color
-		break;
-	default:
-		config|=0;							//EGA VGA
-		break;
+		switch (machine) {
+		case MCH_HERC:
+			//Startup monochrome
+			config|=0x30;
+			break;
+		case MCH_CGA:	
+		case MCH_TANDY:
+			//Startup 80x25 color
+			config|=0x20;
+			break;
+		default:
+			//EGA VGA
+			config|=0;
+			break;
+		}
+		// PS2 mouse
+		config |= 0x04;
+		mem_writew(BIOS_CONFIGURATION,config);
+		/* Setup extended memory size */
+		IO_Write(0x70,0x30);
+		size_extended=IO_Read(0x71);
+		IO_Write(0x70,0x31);
+		size_extended|=(IO_Read(0x71) << 8);		
 	}
-	config |= 0x04;					// PS2 mouse
-	mem_writew(BIOS_CONFIGURATION,config);
-	/* Setup extended memory size */
-	IO_Write(0x70,0x30);
-	size_extended=IO_Read(0x71);
-	IO_Write(0x70,0x31);
-	size_extended|=(IO_Read(0x71) << 8);
+};
+
+static BIOS* test;
+
+void BIOS_Destroy(Section* sec){
+	delete test;
 }
 
-
+void BIOS_Init(Section* sec) {
+	test = new BIOS(sec);
+	sec->AddDestroyFunction(&BIOS_Destroy,false);
+}
diff --git a/src/ints/ems.cpp b/src/ints/ems.cpp
index 4790310e..7025eba6 100644
--- a/src/ints/ems.cpp
+++ b/src/ints/ems.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: ems.cpp,v 1.38 2005-02-10 10:21:11 qbix79 Exp $ */
+/* $Id: ems.cpp,v 1.39 2005-03-25 11:59:24 qbix79 Exp $ */
 
 #include <string.h>
 #include <stdlib.h>
@@ -93,7 +93,7 @@ struct EMM_Handle {
 
 static EMM_Handle emm_handles[EMM_MAX_HANDLES];
 static EMM_Mapping emm_mappings[EMM_MAX_PHYS];
-static Bitu call_int67,call_vdma;
+
 
 struct MoveRegion {
 	Bit32u bytes;
@@ -609,40 +609,84 @@ static Bitu INT4B_Handler() {
 	return CBRET_NONE;
 }
 
-void EMS_Init(Section* sec) {
+
+class EMS: public Module_base {
+private:
+	/* location in protected unfreeable memory where the ems name and callback are
+	 * stored  32 bytes.*/
+	static Bit16u emsnameseg;
+	RealPt old4b_pointer,old67_pointer;
+	CALLBACK_HandlerObject call_vdma,int67;
+
+public:
+	EMS(Section* configuration):Module_base(configuration){
+
 	/* Virtual DMA interrupt callback */
-	call_vdma=CALLBACK_Allocate();
-	CALLBACK_Setup(call_vdma,&INT4B_Handler,CB_IRET,"Int 4b vdma");
-	RealSetVec(0x4b,CALLBACK_RealPointer(call_vdma));
+		call_vdma.Install(&INT4B_Handler,CB_IRET,"Int 4b vdma");
+		call_vdma.Set_RealVec(0x4b);
+		
+		Section_prop * section=static_cast<Section_prop *>(configuration);
+		if (!section->Get_bool("ems")) return;
+		BIOS_ZeroExtendedSize(true);
+		int67.Install(&INT67_Handler,CB_IRET,"Int 67 ems");
+		Bit16u call_int67=int67.Get_callback();
 
-	Section_prop * section=static_cast<Section_prop *>(sec);
-	if (!section->Get_bool("ems")) return;
-	BIOS_ZeroExtendedSize();
-	call_int67=CALLBACK_Allocate();	
-	CALLBACK_Setup(call_int67,&INT67_Handler,CB_IRET,"Int 67 ems");
-/* Register the ems device */
-	DOS_Device * newdev = new device_EMM();
-	DOS_AddDevice(newdev);
+	/* Register the ems device */
+		//TODO MAYBE put it in the class.
+		DOS_Device * newdev = new device_EMM();
+		DOS_AddDevice(newdev);
+	
+	/* Add a little hack so it appears that there is an actual ems device installed */
+		char * emsname="EMMXXXX0";
+		if(!emsnameseg) emsnameseg=DOS_GetMemory(2);	//We have 32 bytes
+		MEM_BlockWrite(PhysMake(emsnameseg,0xa),emsname,strlen(emsname)+1);
+	/* Copy the callback piece into the beginning, and set the interrupt vector to it*/
+		char buf[16];
+		MEM_BlockRead(PhysMake(CB_SEG,call_int67<<4),buf,0xa);
+		MEM_BlockWrite(PhysMake(emsnameseg,0),buf,0xa);
+		RealSetVec(0x67,RealMake(emsnameseg,0),old67_pointer);
+	/* Clear handle and page tables */
+		Bitu i;
+		for (i=0;i<EMM_MAX_HANDLES;i++) {
+			emm_handles[i].mem=0;
+			emm_handles[i].pages=NULL_HANDLE;
+			memset(&emm_handles[i].name,0,8);
+		}
+		for (i=0;i<EMM_MAX_PHYS;i++) {
+			emm_mappings[i].page=NULL_PAGE;
+			emm_mappings[i].handle=NULL_HANDLE;
+		}
+	}
+	
+	~EMS() {
+		Section_prop * section=static_cast<Section_prop *>(m_configuration);
+		if (!section->Get_bool("ems")) return;
+		/* Undo Biosclearing */
+		BIOS_ZeroExtendedSize(false);
+ 
+		/* Remove ems device */
+		device_EMM newdev;
+		DOS_DelDevice(&newdev);
 
-/* Add a little hack so it appears that there is an actual ems device installed */
-	char * emsname="EMMXXXX0";
-	Bit16u seg=DOS_GetMemory(2);	//We have 32 bytes
-	MEM_BlockWrite(PhysMake(seg,0xa),emsname,strlen(emsname)+1);
-/* Copy the callback piece into the beginning, and set the interrupt vector to it*/
-	char buf[16];
-	MEM_BlockRead(PhysMake(CB_SEG,call_int67<<4),buf,0xa);
-	MEM_BlockWrite(PhysMake(seg,0),buf,0xa);
-	RealSetVec(0x67,RealMake(seg,0));
-/* Clear handle and page tables */
-	Bitu i;
-	for (i=0;i<EMM_MAX_HANDLES;i++) {
-		emm_handles[i].mem=0;
-		emm_handles[i].pages=NULL_HANDLE;
-		memset(&emm_handles[i].name,0,8);
-	}
-	for (i=0;i<EMM_MAX_PHYS;i++) {
-		emm_mappings[i].page=NULL_PAGE;
-		emm_mappings[i].handle=NULL_HANDLE;
+		/* Remove the emsname and callback hack */
+		char buf[32]= { 0 };
+		MEM_BlockWrite(PhysMake(emsnameseg,0),buf,32);
+		RealSetVec(0x67,old67_pointer);
+		/* Clear handle and page tables */
+		//TODO
 	}
+};
+		
+static EMS* test;
+
+void EMS_ShutDown(Section* sec) {
+	delete test;	
 }
 
+void EMS_Init(Section* sec) {
+	test = new EMS(sec);
+	sec->AddDestroyFunction(&EMS_ShutDown,true);
+}
+
+//Initialize static members
+Bit16u EMS::emsnameseg = 0;
diff --git a/src/ints/xms.cpp b/src/ints/xms.cpp
index 589670c7..3b2f683e 100644
--- a/src/ints/xms.cpp
+++ b/src/ints/xms.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: xms.cpp,v 1.34 2005-02-10 10:21:11 qbix79 Exp $ */
+/* $Id: xms.cpp,v 1.35 2005-03-25 11:59:24 qbix79 Exp $ */
 
 #include <stdlib.h>
 #include <string.h>
@@ -101,7 +101,6 @@ Bitu XMS_GetEnabledA20(void)
 	return (IO_Read(0x92)&2)>0;
 };
 
-static Bit16u call_xms;
 static RealPt xms_callback;
 
 static XMS_Block xms_handles[XMS_HANDLES];
@@ -341,36 +340,63 @@ Bitu XMS_Handler(void) {
 //	LOG(LOG_MISC,LOG_ERROR)("XMS: CALL Result: %02X",reg_bl);
 	return CBRET_NONE;
 }
-
-void XMS_Init(Section* sec) {
-	
-	Section_prop * section=static_cast<Section_prop *>(sec);
-	if (!section->Get_bool("xms")) return;
-	Bitu i;
-	BIOS_ZeroExtendedSize();
-	DOS_AddMultiplexHandler(multiplex_xms);
-	call_xms=CALLBACK_Allocate();
-	CALLBACK_Setup(call_xms,&XMS_Handler,CB_RETF, "XMS Handler");
-	xms_callback=CALLBACK_RealPointer(call_xms);
-   
-	/* Overide the callback with one that can be hooked */
-	phys_writeb(CB_BASE+(call_xms<<4)+0,(Bit8u)0xeb);       //jump near
-	phys_writeb(CB_BASE+(call_xms<<4)+1,(Bit8u)0x03);       //offset
-	phys_writeb(CB_BASE+(call_xms<<4)+2,(Bit8u)0x90);       //NOP
-	phys_writeb(CB_BASE+(call_xms<<4)+3,(Bit8u)0x90);       //NOP
-	phys_writeb(CB_BASE+(call_xms<<4)+4,(Bit8u)0x90);       //NOP
-	phys_writeb(CB_BASE+(call_xms<<4)+5,(Bit8u)0xFE);       //GRP 4
-	phys_writeb(CB_BASE+(call_xms<<4)+6,(Bit8u)0x38);       //Extra Callback instruction
-	phys_writew(CB_BASE+(call_xms<<4)+7,call_xms);		//The immediate word          
-	phys_writeb(CB_BASE+(call_xms<<4)+9,(Bit8u)0xCB);       //A RETF Instruction
-   
-	for (i=0;i<XMS_HANDLES;i++) {
-		xms_handles[i].free=true;
-		xms_handles[i].mem=-1;
-		xms_handles[i].size=0;
-		xms_handles[i].locked=0;
+class XMS: public Module_base {
+private:
+	CALLBACK_HandlerObject callbackhandler;
+public:
+	XMS(Section* configuration):Module_base(configuration){
+		Section_prop * section=static_cast<Section_prop *>(configuration);
+		if (!section->Get_bool("xms")) return;
+		Bitu i;
+		BIOS_ZeroExtendedSize(true);
+		DOS_AddMultiplexHandler(multiplex_xms);
+		callbackhandler.Install(&XMS_Handler,CB_RETF, "XMS Handler");
+		xms_callback=callbackhandler.Get_RealPointer();
+		Bit16u call_xms=callbackhandler.Get_callback();
+	   
+		/* Override the callback with one that can be hooked */
+		phys_writeb(CB_BASE+(call_xms<<4)+0,(Bit8u)0xeb);       //jump near
+		phys_writeb(CB_BASE+(call_xms<<4)+1,(Bit8u)0x03);       //offset
+		phys_writeb(CB_BASE+(call_xms<<4)+2,(Bit8u)0x90);       //NOP
+		phys_writeb(CB_BASE+(call_xms<<4)+3,(Bit8u)0x90);       //NOP
+		phys_writeb(CB_BASE+(call_xms<<4)+4,(Bit8u)0x90);       //NOP
+		phys_writeb(CB_BASE+(call_xms<<4)+5,(Bit8u)0xFE);       //GRP 4
+		phys_writeb(CB_BASE+(call_xms<<4)+6,(Bit8u)0x38);       //Extra Callback instruction
+		phys_writew(CB_BASE+(call_xms<<4)+7,call_xms);		//The immediate word          
+		phys_writeb(CB_BASE+(call_xms<<4)+9,(Bit8u)0xCB);       //A RETF Instruction
+	   
+		for (i=0;i<XMS_HANDLES;i++) {
+			xms_handles[i].free=true;
+			xms_handles[i].mem=-1;
+			xms_handles[i].size=0;
+			xms_handles[i].locked=0;
+		}
+		/* Disable the 0 handle */
+		xms_handles[0].free	= false;
 	}
-	/* Disable the 0 handle */
-	xms_handles[0].free	= false;
+
+	~XMS(){
+		Section_prop * section = static_cast<Section_prop *>(m_configuration);
+		if (!section->Get_bool("xms")) return;
+		/* Undo biosclearing */
+		BIOS_ZeroExtendedSize(false);
+
+		/* Remove Multiplex */
+		DOS_DelMultiplexHandler(multiplex_xms);
+
+		/* Free used memory while skipping the 0 handle */
+		for (Bitu i = 1;i<XMS_HANDLES;i++) 
+			if(!xms_handles[i].free) XMS_FreeMemory(i);
+	}
+
+};
+static XMS* test;
+
+void XMS_ShutDown(Section* sec) {
+	delete test;	
 }
 
+void XMS_Init(Section* sec) {
+	test = new XMS(sec);
+	sec->AddDestroyFunction(&XMS_ShutDown,true);
+}