diff --git a/src/machine/m_at_4gpv31.c b/src/machine/m_at_4gpv31.c
index 34c20aba8..d53fa46fe 100644
--- a/src/machine/m_at_4gpv31.c
+++ b/src/machine/m_at_4gpv31.c
@@ -1,6 +1,24 @@
-/* Emulation for C&T 82C206 ("NEAT") chipset. */
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Emulation for C&T 82C206/82c597 based 4GLX3 board.
+ *
+ * NOTE:	The NEAT 82c206 code should be moved into a 82c206 module,
+ *		so it can be re-used by other boards.
+ *
+ * Version:	@(#)m_4gpv31.c	1.0.1	2017/12/04
+ *
+ * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
+ *		Copyright 2017 Fred N. van Kempen.
+ */
 #include <stdio.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
 #include "../86box.h"
@@ -8,34 +26,70 @@
 #include "machine.h"
 
 
-static uint8_t neat_regs[256];
-static int neat_index;
-static int neat_emspage[4];
+typedef struct {
+    uint8_t	regs[256];
+    int		indx;
+
+    int		emspg[4];
+} neat_t;
+
+
+#if NOT_USED
+static void
+neat_wrems(uint32_t addr, uint8_t val, void *priv)
+{
+    neat_t *dev = (neat_t *)priv;
+
+    ram[(dev->emspg[(addr >> 14) & 3] << 14) + (addr & 0x3fff)] = val;
+}
+
+
+static uint8_t
+neat_rdems(uint32_t addr, void *priv)
+{
+    neat_t *dev = (neat_t *)priv;
+
+    return(ram[(dev->emspg[(addr >> 14) & 3] << 14) + (addr & 0x3fff)]);
+}
+#endif
 
 
 static void
 neat_write(uint16_t port, uint8_t val, void *priv)
 {
+    neat_t *dev = (neat_t *)priv;
+
+    pclog("NEAT: write(%04x, %02x)\n", port, val);
+
     switch (port) {
 	case 0x22:
-		neat_index = val;
+		dev->indx = val;
 		break;
 
 	case 0x23:
-		neat_regs[neat_index] = val;
-		switch (neat_index) {
-			case 0x6E: /*EMS page extension*/
-				neat_emspage[3] = (neat_emspage[3] & 0x7F) | (( val       & 3) << 7);
-				neat_emspage[2] = (neat_emspage[2] & 0x7F) | (((val >> 2) & 3) << 7);
-				neat_emspage[1] = (neat_emspage[1] & 0x7F) | (((val >> 4) & 3) << 7);
-				neat_emspage[0] = (neat_emspage[0] & 0x7F) | (((val >> 6) & 3) << 7);
+		dev->regs[dev->indx] = val;
+		switch (dev->indx) {
+			case 0x6e:	/* EMS page extension */
+				dev->emspg[3] = (dev->emspg[3] & 0x7F) | (( val       & 3) << 7);
+				dev->emspg[2] = (dev->emspg[2] & 0x7F) | (((val >> 2) & 3) << 7);
+				dev->emspg[1] = (dev->emspg[1] & 0x7F) | (((val >> 4) & 3) << 7);
+				dev->emspg[0] = (dev->emspg[0] & 0x7F) | (((val >> 6) & 3) << 7);
 				break;
 		}
 		break;
 
-	case 0x0208: case 0x0209: case 0x4208: case 0x4209:
-	case 0x8208: case 0x8209: case 0xC208: case 0xC209:
-		neat_emspage[port >> 14] = (neat_emspage[port >> 14] & 0x180) | (val & 0x7F);		
+	case 0x0208:
+	case 0x0209:
+
+	case 0x4208:
+	case 0x4209:
+
+	case 0x8208:
+	case 0x8209:
+
+	case 0xc208:
+	case 0xc209:
+		dev->emspg[port >> 14] = (dev->emspg[port >> 14] & 0x180) | (val & 0x7F);		
 		break;
     }
 }
@@ -44,58 +98,50 @@ neat_write(uint16_t port, uint8_t val, void *priv)
 static uint8_t
 neat_read(uint16_t port, void *priv)
 {
+    neat_t *dev = (neat_t *)priv;
     uint8_t ret = 0xff;
 
     switch (port) {
 	case 0x22:
-		ret = neat_index;
+		ret = dev->indx;
 		break;
 
 	case 0x23:
-		ret = neat_regs[neat_index];
+		ret = dev->regs[dev->indx];
 		break;
     }
 
+    pclog("NEAT: read(%04x) = %02x\n", port, ret);
+
     return(ret);
 }
 
 
-#if NOT_USED
-static void
-neat_writeems(uint32_t addr, uint8_t val)
-{
-    ram[(neat_emspage[(addr >> 14) & 3] << 14) + (addr & 0x3FFF)] = val;
-}
-
-
-static uint8_t
-neat_readems(uint32_t addr)
-{
-    return ram[(neat_emspage[(addr >> 14) & 3] << 14) + (addr & 0x3FFF)];
-}
-#endif
-
-
 static void
 neat_init(void)
 {
+    neat_t *dev;
+
+    dev = (neat_t *)malloc(sizeof(neat_t));
+    memset(dev, 0x00, sizeof(neat_t));
+
     io_sethandler(0x0022, 2,
-		  neat_read,NULL,NULL, neat_write,NULL,NULL, NULL);
+		  neat_read,NULL,NULL, neat_write,NULL,NULL, dev);
     io_sethandler(0x0208, 2,
-		  neat_read,NULL,NULL, neat_write,NULL,NULL, NULL);
+		  neat_read,NULL,NULL, neat_write,NULL,NULL, dev);
     io_sethandler(0x4208, 2,
-		  neat_read,NULL,NULL, neat_write,NULL,NULL, NULL);
+		  neat_read,NULL,NULL, neat_write,NULL,NULL, dev);
     io_sethandler(0x8208, 2,
-		  neat_read,NULL,NULL, neat_write,NULL,NULL, NULL);
+		  neat_read,NULL,NULL, neat_write,NULL,NULL, dev);
     io_sethandler(0xc208, 2,
-		  neat_read,NULL,NULL, neat_write,NULL,NULL, NULL);
+		  neat_read,NULL,NULL, neat_write,NULL,NULL, dev);
 }
 
 
 void
 machine_at_4gpv31_init(machine_t *model)
 {
-	machine_at_init(model);
+    machine_at_ide_init(model);
 
-	neat_init();
+    neat_init();
 }