diff --git a/Makefile.adam b/Makefile.adam
index 0b0fc52a..7c7fb2dc 100644
--- a/Makefile.adam
+++ b/Makefile.adam
@@ -14,7 +14,7 @@ ADDL_LIB2 := smartkeys.lib
 CC=zcc
 AS=zcc
 
-SRCS := $(shell find $(SRC_DIRS) -name *.cpp -or -name *.c -or -name *_adam.asm)
+SRCS := $(wildcard $(SRC_DIRS)/*.c) $(wildcard $(SRC_DIRS)/adam/*.c)
 OBJS := $(SRCS:%=$(BUILD_DIR)/%.o)
 DEPS := $(OBJS:.o=.d)
 
diff --git a/Makefile.coco b/Makefile.coco
index a1e926e3..308942e6 100644
--- a/Makefile.coco
+++ b/Makefile.coco
@@ -22,10 +22,10 @@ FUJINET_LIB_BASENAME := $(notdir $(FUJINET_LIB_PATH))
 FUJINET_LIB_SYMLINK  := libfujinet-$(CURRENT_TARGET)-$(FUJINET_LIB_VERSION).lib.a
 
 LIBS=-L $(FUJINET_LIB_VERSION_DIR) -l$(FUJINET_LIB_BASENAME)
-CFLAGS=-DUSING_FUJINET_LIB -I$(FUJINET_LIB_VERSION_DIR)
+CFLAGS=-DUSING_FUJINET_LIB -I$(FUJINET_LIB_VERSION_DIR) -Wno-assign-in-condition
 LIMITFLAGS=--org=0E00 --limit=7C00
 
-OBJS = check_wifi.o connect_wifi.o destination_host_slot.o hosts_and_devices.o main.o perform_copy.o select_file.o select_slot.o set_wifi.o show_info.o bar.o die.o input.o io.o mount_and_boot.o screen.o strrchr.o strendswith.o pause.o
+OBJS = check_wifi.o connect_wifi.o destination_host_slot.o hosts_and_devices.o main.o perform_copy.o select_file.o select_slot.o set_wifi.o show_info.o bar.o die.o input.o system.o mount_and_boot.o screen.o strrchr.o strendswith.o pause.o
 $(TARGET_EXEC): $(OBJS)
 	$(CC) $(LIMITFLAGS) -o $@ $^ $(LIBS)
 
diff --git a/Makefile.pmd85 b/Makefile.pmd85
index 5cbae236..5b4d682b 100644
--- a/Makefile.pmd85
+++ b/Makefile.pmd85
@@ -6,7 +6,7 @@ SRC_DIRS ?= ./src
 CC=zcc
 AS=zcc
 
-SRCS := $(shell find $(SRC_DIRS) -name *.cpp -or -name *.c -or -name *_pmd85.asm)
+SRCS := $(wildcard $(SRC_DIRS)/*.c) $(wildcard $(SRC_DIRS)/pmd85/*.c)
 OBJS := $(SRCS:%=$(BUILD_DIR)/%.o)
 DEPS := $(OBJS:.o=.d)
 
diff --git a/src/adam/io.c b/src/adam/fuji_io.c
similarity index 59%
rename from src/adam/io.c
rename to src/adam/fuji_io.c
index 41478bcd..9726c166 100644
--- a/src/adam/io.c
+++ b/src/adam/fuji_io.c
@@ -5,71 +5,77 @@
  * I/O Routines
  */
 
-#include "../io.h"
+#include "../typedefs.h"
 #include <conio.h> // for sleep()
 #include <stdlib.h>
 #include <eos.h>
 #include <string.h>
 
-#define FUJI_DEV 0x0F
-
 char response[1024];
-static DCB *dcb;
+static DCB *dcb = NULL;
 
 extern unsigned char source_path;
 extern unsigned char path;
 
 static void io_command_and_response(void* buf, unsigned short len)
 {
+  if (!dcb)
+    dcb = eos_find_dcb(FUJI_DEV);
+    
   memset(response,0,sizeof(response));
   eos_write_character_device(FUJI_DEV,buf,len);
   eos_read_character_device(FUJI_DEV,response,sizeof(response));
 }
 
+#ifdef UNUSED
 void io_init(void)
 {
   dcb = eos_find_dcb(FUJI_DEV);
 }
+#endif /* UNUSED */
 
+#ifdef UNUSED
 unsigned char io_status(void)
 {
   return dcb->status;
 }
+#endif /* UNUSED */
 
-bool io_error(void)
+bool fuji_error(void)
 {
   return dcb->status == 0x8C;
 }
 
-unsigned char io_get_wifi_status(void)
+bool fuji_get_wifi_status(uint8_t *status)
 {
   unsigned char c=0xFA;
 
   sleep(1);
   io_command_and_response(&c,1);
-
-  return response[0];
+  *status = response[0];
+  return;
 }
 
-NetConfig* io_get_ssid(void)
+bool fuji_get_ssid(NetConfig *net_config)
 {
   unsigned char c=0xFE;
 
   io_command_and_response(&c,1);
-
-  return (NetConfig *)response;
+  memcpy(net_config, response, sizeof(*net_config));
+  return true;
 }
 
-unsigned char io_scan_for_networks(void)
+bool fuji_scan_for_networks(uint8_t *count)
 {
   unsigned char c=0xFD;
 
   io_command_and_response(&c,1);
 
-  return response[0];
+  *count = response[0];
+  return true;
 }
 
-SSIDInfo *io_get_scan_result(uint_fast8_t n)
+bool fuji_get_scan_result(uint8_t n, SSIDInfo *ssid_info)
 {
   unsigned char c[2]={0xFC,0x00};
 
@@ -77,9 +83,10 @@ SSIDInfo *io_get_scan_result(uint_fast8_t n)
 
   io_command_and_response(&c,2);
 
-  return (SSIDInfo *)response;
+  memcpy(ssid_info, response, sizeof(*ssid_info));
 }
 
+#ifdef UNUSED
 AdapterConfig *io_get_adapter_config(void)
 {
   unsigned char c=0xE8;
@@ -88,27 +95,29 @@ AdapterConfig *io_get_adapter_config(void)
 
   return (AdapterConfig *)response;
 }
+#endif /* UNUSED */
 
-AdapterConfigExtended *io_get_adapter_config_extended(void)
+bool fuji_get_adapter_config_extended(AdapterConfigExtended *acx)
 {
   unsigned char c=0xC4;
 
   io_command_and_response(&c,1);
 
-  return (AdapterConfigExtended *)response;
+  memcpy(acx, response, sizeof(*acx));
+  return true;
 }
 
-int io_set_ssid(NetConfig *nc)
+bool fuji_set_ssid(NetConfig *nc)
 {
   unsigned char c[98]={0xFB};
 
   memcpy(&c[1],nc,sizeof(NetConfig));
 
   eos_write_character_device(FUJI_DEV,&c,sizeof(c));
-  return 0;
+  return true;
 }
 
-bool io_get_device_slots(DeviceSlot *d)
+bool fuji_get_device_slots(DeviceSlot *d, size_t size)
 {
   unsigned char c=0xF2;
 
@@ -118,7 +127,7 @@ bool io_get_device_slots(DeviceSlot *d)
   return true;
 }
 
-bool io_get_host_slots(HostSlot *h)
+bool fuji_get_host_slots(HostSlot *h, size_t size)
 {
   unsigned char c=0xF4;
 
@@ -128,16 +137,17 @@ bool io_get_host_slots(HostSlot *h)
   return true;
 }
 
-void io_put_host_slots(HostSlot *h)
+bool fuji_put_host_slots(HostSlot *h, size_t size)
 {
   unsigned char c[257]={0xF3};
 
   memcpy(&c[1],h,256);
 
   eos_write_character_device(FUJI_DEV,&c,sizeof(c));
+  return true;
 }
 
-void io_put_device_slots(DeviceSlot *d)
+bool fuji_put_device_slots(DeviceSlot *d, size_t size)
 {
   unsigned char c[305]={0xF1};
 
@@ -147,17 +157,17 @@ void io_put_device_slots(DeviceSlot *d)
   csleep(10);
 }
 
-uint8_t io_mount_host_slot(unsigned char hs)
+bool fuji_mount_host_slot(uint8_t hs)
 {
   unsigned char c[2]={0xF9,0x00};
 
   c[1] = hs;
 
   eos_write_character_device(FUJI_DEV,&c,sizeof(c));
-  return 0;
+  return true;
 }
 
-void io_open_directory(unsigned char hs, char *p, char *f)
+bool fuji_open_directory2(unsigned char hs, char *p, char *f)
 {
   char c[258];
   char *e;
@@ -178,34 +188,38 @@ void io_open_directory(unsigned char hs, char *p, char *f)
     }
 
   eos_write_character_device(FUJI_DEV,&c,sizeof(c));
+  return true;
 }
 
-char *io_read_directory(unsigned char l, unsigned char a)
+bool fuji_read_directory(unsigned char l, unsigned char a, char *buffer)
 {
   unsigned char c[3]={0xF6,0x00,0x00};
   c[1]=l;
   c[2]=a;
   io_command_and_response(&c,3);
-  return response;
+  memcpy(buffer, response, l);
+  return true;
 }
 
-void io_close_directory(void)
+bool fuji_close_directory(void)
 {
   unsigned char c=0xF5;
 
   eos_write_character_device(FUJI_DEV,&c,sizeof(c));
+  return true;
 }
 
-void io_set_directory_position(DirectoryPosition pos)
+bool fuji_set_directory_position(DirectoryPosition pos)
 {
   unsigned char c[3]={0xE4,0x00,0x00};
 
   memcpy(&c[1],&pos,sizeof(DirectoryPosition));
 
   eos_write_character_device(FUJI_DEV,&c,sizeof(c));
+  return true;
 }
 
-void io_set_device_filename(unsigned char ds, char* e)
+bool fuji_set_device_filename(uint8_t mode, uint8_t hs, uint8_t ds, char *e)
 {
   char c[258]={0xE2,0x00};
 
@@ -214,34 +228,21 @@ void io_set_device_filename(unsigned char ds, char* e)
   strcpy(&c[2],e);
 
   eos_write_character_device(FUJI_DEV,&c,sizeof(c));
+  return true;
 }
 
-char *io_get_device_filename(unsigned char ds)
+bool fuji_get_device_filename(uint8_t ds, char *buffer)
 {
   char c[2]={0xDA,0x00};
 
   c[1] = ds;
 
   io_command_and_response(&c,2);
-
-  return response;
-}
-
-void io_create_new(unsigned char selected_host_slot,unsigned char selected_device_slot,unsigned long selected_size,char *path)
-{
-  char nd[263]={0xE7,0x00,0x00,0x00,0x00,0x00,0x00};
-  char *c = &nd[3];
-  unsigned long *l = (unsigned long *)c;
-
-  nd[1]=selected_host_slot;
-  nd[2]=selected_device_slot;
-  *l=selected_size;
-  strcpy(&nd[7],path);
-
-  eos_write_character_device(FUJI_DEV,&nd,sizeof(nd));
+  strcpy(buffer, response);
+  return true;
 }
 
-bool io_mount_disk_image(unsigned char ds, unsigned char mode)
+bool fuji_mount_disk_image(uint8_t ds, uint8_t mode)
 {
   char c[3]={0xF8,0x00,0x00};
   c[1]=ds;
@@ -251,67 +252,25 @@ bool io_mount_disk_image(unsigned char ds, unsigned char mode)
   return true;
 }
 
-void io_set_boot_config(unsigned char toggle)
+bool fuji_set_boot_config(unsigned char toggle)
 {
   char c[2]={0xD9,0x00};
   c[1]=toggle;
 
   eos_write_character_device(FUJI_DEV,&c,sizeof(c));
+  return true;
 }
 
-void io_umount_disk_image(unsigned char ds)
+bool fuji_unmount_disk_image(uint8_t ds)
 {
   char c[2]={0xE9,0x00};
   c[1]=ds;
 
   eos_write_character_device(FUJI_DEV,&c,sizeof(c));
+  return true;
 }
 
-void io_boot(void)
-{
-  eos_init();
-}
-
-void io_build_directory(unsigned char ds, unsigned long numBlocks, char *v)
-{
-  unsigned int db = 1; // 1 directory block by default
-  unsigned int nb = (unsigned short)numBlocks;
-  DCB *dcb = NULL;
-  unsigned char s=0;
-  
-  // End volume label
-  v[strlen(v)]=0x03;
-
-  // Adjust device slot to EOS device #
-  ds += 4;
-
-  memset(response,0,sizeof(response));
-  
-  for (unsigned long i=0;i<db;i++)
-    {
-      eos_write_block(ds,i+1,&response[0]);
-    }
-    
-  memset(response,0,sizeof(response));
-  response[0]=0xC3;
-  response[1]=0xE7;
-  response[2]=0xFC;
-
-  eos_write_block(ds,0UL,&response[0]);
-
-  if (numBlocks>719)
-    db=6;
-  else if (numBlocks>319)
-    db=3;
-  else if (numBlocks>160)
-    db=2;
-  else
-    db=1;
-
-  eos_initialize_directory(ds,db,nb,v);
-  
-}
-
+#ifdef UNUSED
 bool io_get_device_enabled_status(unsigned char d)
 {
   struct
@@ -328,8 +287,9 @@ bool io_get_device_enabled_status(unsigned char d)
 
   return response[0];
 }
+#endif /* UNUSED */
 
-void io_enable_device(unsigned char d)
+bool fuji_enable_device(uint8_t d)
 {
   struct
   {
@@ -341,9 +301,10 @@ void io_enable_device(unsigned char d)
   ed.dev = d;
 
   eos_write_character_device(FUJI_DEV,ed,sizeof(ed));
+  return true;
 }
 
-void io_disable_device(unsigned char d)
+bool fuji_disable_device(uint8_t d)
 {
   struct
   {
@@ -355,38 +316,44 @@ void io_disable_device(unsigned char d)
   dd.dev = d;
 
   eos_write_character_device(FUJI_DEV,dd,sizeof(dd));
+  return true;
 }
 
+#ifdef UNUSED
 void io_update_devices_enabled(bool *e)
 {
   char i;
 
   for (i=0;i<4;i++)
     {
-      e[i]=io_get_device_enabled_status(io_device_slot_to_device(i));
+      e[i]=io_get_device_enabled_status(fuji_device_slot_to_device(i));
     }
 }
+#endif /* UNUSED */
 
-void io_copy_file(unsigned char source_slot, unsigned char destination_slot)
+bool fuji_copy_file(uint8_t source_slot, uint8_t destination_slot, char *copy_spec)
 {
   char cf[259]={0xD8,0x00,0x00};
   DCB *dcb = NULL;
   
   cf[1]=source_slot;
   cf[2]=destination_slot;
-  strcpy(&cf[3],copySpec);
+  strcpy(&cf[3],copy_spec);
 
   eos_write_character_device(FUJI_DEV,cf,sizeof(cf));
 
   while (eos_request_device_status(FUJI_DEV,dcb) != 0x80);
+  return true;
 }
 
+#ifdef UNUSED
 unsigned char io_device_slot_to_device(unsigned char ds)
 {
   return ds+4;
 }
+#endif /* UNUSED */
 
-bool io_get_wifi_enabled(void)
+bool fuji_get_wifi_enabled(void)
 {
 	return true;
 }
diff --git a/src/adam/input.c b/src/adam/input.c
index 741130ba..5e3673a7 100644
--- a/src/adam/input.c
+++ b/src/adam/input.c
@@ -12,7 +12,6 @@
 #include "../hosts_and_devices.h"
 #include "../select_file.h"
 #include "../select_slot.h"
-#include "../io.h"
 
 #include <video/tms99x8.h>
 #include <eos.h>
@@ -570,11 +569,11 @@ SISubState input_show_info(void)
       state=HOSTS_AND_DEVICES;
       return SI_DONE;
     case KEY_SMART_IV:
-      k=io_get_device_enabled_status(2);
+      k=fuji_get_device_enabled_status(2);
       if (k==true)
-	io_disable_device(2);
+	fuji_disable_device(2);
       else
-	io_enable_device(2);
+	fuji_enable_device(2);
       k=0;
       return SI_DONE;
     case KEY_SMART_V:
diff --git a/src/adam/screen.c b/src/adam/screen.c
index 60045729..f42a679e 100644
--- a/src/adam/screen.c
+++ b/src/adam/screen.c
@@ -593,5 +593,10 @@ void screen_perform_copy(char *sh, char *p, char *dh, char *dp)
   vdp_blank();
 }
 
+void screen_end(void)
+{
+  return;
+}
+
 #endif /* BUILD_ADAM */
 
diff --git a/src/adam/system.c b/src/adam/system.c
new file mode 100644
index 00000000..a1bddbea
--- /dev/null
+++ b/src/adam/system.c
@@ -0,0 +1,64 @@
+#include "../system.h"
+#include "../globals.h"
+#include <eos.h>
+#include <string.h>
+
+void system_boot(void)
+{
+  eos_init();
+}
+
+void system_create_new(unsigned char selected_host_slot,unsigned char selected_device_slot,unsigned long selected_size,char *path)
+{
+  char nd[263]={0xE7,0x00,0x00,0x00,0x00,0x00,0x00};
+  char *c = &nd[3];
+  unsigned long *l = (unsigned long *)c;
+
+  nd[1]=selected_host_slot;
+  nd[2]=selected_device_slot;
+  *l=selected_size;
+  strcpy(&nd[7],path);
+
+  eos_write_character_device(FUJI_DEV,&nd,sizeof(nd));
+}
+
+void system_build_directory(unsigned char ds, unsigned long numBlocks, char *v)
+{
+  unsigned int db = 1; // 1 directory block by default
+  unsigned int nb = (unsigned short)numBlocks;
+  DCB *dcb = NULL;
+  unsigned char s=0;
+  
+  // End volume label
+  v[strlen(v)]=0x03;
+
+  // Adjust device slot to EOS device #
+  ds += 4;
+
+  memset(response,0,sizeof(response));
+  
+  for (unsigned long i=0;i<db;i++)
+    {
+      eos_write_block(ds,i+1,&response[0]);
+    }
+    
+  memset(response,0,sizeof(response));
+  response[0]=0xC3;
+  response[1]=0xE7;
+  response[2]=0xFC;
+
+  eos_write_block(ds,0UL,&response[0]);
+
+  if (numBlocks>719)
+    db=6;
+  else if (numBlocks>319)
+    db=3;
+  else if (numBlocks>160)
+    db=2;
+  else
+    db=1;
+
+  eos_initialize_directory(ds,db,nb,v);
+  
+}
+
diff --git a/src/apple2/input.c b/src/apple2/input.c
index 25312fde..61de4c70 100644
--- a/src/apple2/input.c
+++ b/src/apple2/input.c
@@ -48,12 +48,6 @@
 
 #define UNUSED(x) (void)(x);
 
-extern unsigned char copy_host_slot;
-extern bool copy_mode;
-extern bool long_entry_displayed;
-
-extern unsigned char io_create_type;
-
 /**
  * Get input from keyboard/joystick
  * @return keycode (or synthesized keycode if joystick)
@@ -294,17 +288,17 @@ unsigned char input_select_file_new_type(void)
     {
     case 'P':
     case 'p':
-      io_create_type=0;
+      system_create_type=0;
       return 1;
     case '2':
-      io_create_type=1;
+      system_create_type=1;
       return 2;
     case 'D':
     case 'd':
-      io_create_type=2;
+      system_create_type=2;
       return 3;
     default:
-      io_create_type=0;
+      system_create_type=0;
       return 0;
     }
 }
@@ -313,7 +307,7 @@ unsigned long input_select_file_new_size(unsigned char t)
 {
   UNUSED(t); // Type not used.
 
-  if (io_create_type==2) // DO files are always 140K
+  if (system_create_type==2) // DO files are always 140K
       return 280;
   
   switch (cgetc())
diff --git a/src/apple2/io.c b/src/apple2/io.c
deleted file mode 100644
index a0895a31..00000000
--- a/src/apple2/io.c
+++ /dev/null
@@ -1,358 +0,0 @@
-#ifdef BUILD_APPLE2
-/**
- * FujiNet CONFIG for #Apple2
- *
- * I/O Routines
- */
-
-#include "../io.h"
-#include <stdint.h>
-#ifdef __ORCAC__
-#include <coniogs.h>
-#include <apple2gs.h>
-#include <texttool.h>
-#else
-#include <conio.h>
-#include <apple2.h>
-#include <peekpoke.h> // For the insanity in io_boot()
-#endif
-#include <stdlib.h>
-#include "../globals.h"
-
-#include "fujinet-fuji.h"
-
-#define FUJICMD_RESET 0xFF
-#define FUJICMD_GET_SSID 0xFE
-#define FUJICMD_SCAN_NETWORKS 0xFD
-#define FUJICMD_GET_SCAN_RESULT 0xFC
-#define FUJICMD_SET_SSID 0xFB
-#define FUJICMD_GET_WIFISTATUS 0xFA
-#define FUJICMD_MOUNT_HOST 0xF9
-#define FUJICMD_MOUNT_IMAGE 0xF8
-#define FUJICMD_OPEN_DIRECTORY 0xF7
-#define FUJICMD_READ_DIR_ENTRY 0xF6
-#define FUJICMD_CLOSE_DIRECTORY 0xF5
-#define FUJICMD_READ_HOST_SLOTS 0xF4
-#define FUJICMD_WRITE_HOST_SLOTS 0xF3
-#define FUJICMD_READ_DEVICE_SLOTS 0xF2
-#define FUJICMD_WRITE_DEVICE_SLOTS 0xF1
-#define FUJICMD_UNMOUNT_IMAGE 0xE9
-#define FUJICMD_GET_ADAPTERCONFIG 0xE8
-#define FUJICMD_NEW_DISK 0xE7
-#define FUJICMD_UNMOUNT_HOST 0xE6
-#define FUJICMD_GET_DIRECTORY_POSITION 0xE5
-#define FUJICMD_SET_DIRECTORY_POSITION 0xE4
-//#define FUJICMD_SET_HSIO_INDEX 0xE3
-#define FUJICMD_SET_DEVICE_FULLPATH 0xE2
-#define FUJICMD_SET_HOST_PREFIX 0xE1
-#define FUJICMD_GET_HOST_PREFIX 0xE0
-//#define FUJICMD_SET_SIO_EXTERNAL_CLOCK 0xDF
-#define FUJICMD_WRITE_APPKEY 0xDE
-#define FUJICMD_READ_APPKEY 0xDD
-#define FUJICMD_OPEN_APPKEY 0xDC
-#define FUJICMD_CLOSE_APPKEY 0xDB
-#define FUJICMD_GET_DEVICE_FULLPATH 0xDA
-#define FUJICMD_CONFIG_BOOT 0xD9
-#define FUJICMD_COPY_FILE 0xD8
-#define FUJICMD_MOUNT_ALL 0xD7
-#define FUJICMD_SET_BOOT_MODE 0xD6
-#define FUJICMD_ENABLE_DEVICE 0xD5
-#define FUJICMD_DISABLE_DEVICE 0xD4
-#define FUJICMD_DEVICE_STATUS 0xD1
-#define FUJICMD_GET_ADAPTERCONFIG_EXTENDED 0xC4
-#define FUJICMD_STATUS 0x53
-
-#define UNUSED(x) (void)(x);
-
-#include <string.h>
-#include "sp.h"
-
-static NetConfig nc;
-static AdapterConfigExtended adapterConfig;
-static SSIDInfo ssidInfo;
-NewDisk newDisk;
-
-// variable to hold various responses that we just need to return a char*.
-char response[256];
-
-unsigned char io_create_type;
-
-void io_init(void)
-{
-}
-
-uint8_t io_status(void)
-{
-  return io_error();
-}
-
-bool io_error(void)
-{
-  return fuji_error();
-}
-
-uint8_t io_get_wifi_status(void)
-{
-  unsigned char status = 0;
-  unsigned long l = 0;
-  for (l=0;l<4096;l++);
-  fuji_get_wifi_status(&status);
-  return status;
-}
-
-NetConfig* io_get_ssid(void)
-{
-  fuji_get_ssid(&nc);
-  return &nc;
-}
-
-uint8_t io_scan_for_networks(void)
-{
-  uint8_t count;
-  fuji_scan_for_networks(&count);
-  return count;
-}
-
-SSIDInfo *io_get_scan_result(uint8_t n)
-{
-  fuji_get_scan_result(n, &ssidInfo);
-  return &ssidInfo;
-}
-
-AdapterConfigExtended *io_get_adapter_config_extended(void)
-{
-  fuji_get_adapter_config_extended(&adapterConfig);
-  return &adapterConfig;
-}
-
-int io_set_ssid(NetConfig *nc)
-{
-  fuji_set_ssid(nc);
-  return 0; // ??? TODO, should this reflect the results?
-}
-
-const char *io_get_device_filename(uint8_t slot)
-{
-  fuji_get_device_filename(slot, &response[0]);
-  return &response[0];
-}
-
-void io_create_new(uint8_t selected_host_slot,uint8_t selected_device_slot,unsigned long selected_size,char *path)
-{
-  newDisk.createType = io_create_type;
-  newDisk.deviceSlot = selected_device_slot;
-  newDisk.hostSlot = selected_host_slot;
-  newDisk.numBlocks = selected_size;
-  strcpy(&newDisk.filename[0], path);
-  fuji_create_new(&newDisk);
-}
-
-bool io_get_device_slots(DeviceSlot *d)
-{
-  return fuji_get_device_slots(d, 6);
-}
-
-bool io_get_host_slots(HostSlot *h)
-{
-  return fuji_get_host_slots(h, 8);
-}
-
-void io_put_host_slots(HostSlot *h)
-{
-  fuji_put_host_slots(h, 8);
-}
-
-void io_put_device_slots(DeviceSlot *d)
-{
-  fuji_put_device_slots(d, 6);
-}
-
-uint8_t io_mount_host_slot(uint8_t hs)
-{
-  fuji_mount_host_slot(hs);
-  return 0;
-}
-
-void io_open_directory(uint8_t hs, char *p, char *f)
-{
-  char *_p = p;
-  if (f[0] != 0x00)
-  {
-    // We have a filter, create a directory+filter string
-    memset(response, 0, 256);
-    strcpy(response, p);
-    strcpy(&response[strlen(response) + 1], f);
-    _p = &response[0];
-  }
-  fuji_open_directory(hs, _p);
-}
-
-const char *io_read_directory(uint8_t maxlen, uint8_t a)
-{
-  memset(&response[0], 0, maxlen);
-  fuji_read_directory(maxlen, a, &response[0]);
-  
-  return &response[0];
-}
-
-void io_close_directory(void)
-{
-  fuji_close_directory();
-}
-
-void io_set_directory_position(DirectoryPosition pos)
-{
-  fuji_set_directory_position(pos);
-}
-
-void io_set_device_filename(uint8_t ds, uint8_t hs, uint8_t mode, char* e)
-{
-  fuji_set_device_filename(mode, hs, ds, e);
-}
-
-bool io_mount_disk_image(uint8_t ds, uint8_t mode)
-{
-  return fuji_mount_disk_image(ds, mode);
-}
-
-void io_copy_file(unsigned char source_slot, unsigned char destination_slot)
-{
-  fuji_copy_file(source_slot, destination_slot, &copySpec[0]);
-}
-
-void io_set_boot_config(uint8_t toggle)
-{
-  #ifndef __ORCAC__
-  fuji_set_boot_config(toggle);
-  #endif
-}
-
-void io_set_boot_mode(uint8_t mode)
-{
-  fuji_set_boot_mode(mode);
-}
-
-void io_umount_disk_image(uint8_t ds)
-{
-  fuji_unmount_disk_image(ds);
-}
-
-void io_update_devices_enabled(bool *e)
-{
-  char i;
-
-  for (i=0;i<6;i++)
-    {
-      e[i]=io_get_device_enabled_status(io_device_slot_to_device(i));
-    }
-}
-
-void io_enable_device(unsigned char d)
-{
-  fuji_enable_device(d);
-}
-
-void io_disable_device(unsigned char d)
-{
-  fuji_disable_device(d);
-}
-
-// The enabled status area needs visiting. this requires a LOT of status codes to send to FN, as there's no payload to specify which device.
-// And in FN it always returns true anyway, so this functionality is pretty broken at the moment.
-bool io_get_device_enabled_status(unsigned char)
-{
-  return true;
-}
-
-unsigned char io_device_slot_to_device(unsigned char ds)
-{
-  return ds;
-}
-
-void io_boot(void)
-{
-  #ifdef __ORCAC__
-  sp_done();
-	#ifndef BUILD_A2CDA
-  WriteChar(0x8c);  // Clear screen
-  WriteChar(0x92);  // Set 80 col
-  WriteChar(0x86);  // Cursor on
-  TextShutDown();
-  exit(0);
-	#endif
-
-  #else
-  char ostype;
-  int i;
-
-  ostype = get_ostype() & 0xF0;
-  //clrscr();
-  cprintf("\r\nRESTARTING...");
-
-  // Wait for fujinet disk ii states to be ready
-  for (i = 0; i < 2000; i++)
-  {
-    if (i % 250 == 0)
-    {
-      cprintf(".");
-    }
-  }
-
-  if (ostype == APPLE_IIIEM)
-  {
-    asm("STA $C082");  // disable language card (Titan3+2)
-    asm("LDA #$77");   // enable A3 primary rom
-    asm("STA $FFDF");
-    asm("JMP $F4EE");  // jmp to A3 reset entry
-  }
-  else  // Massive brute force hack that takes advantage of MMU quirk. Thank you xot.
-  {
-    POKE(0xC00E,0); // CLRALTCHAR
-
-    // Make the simulated 6502 RESET result in a cold start.
-    // INC $03F4
-    POKE(0x100,0xEE);
-    POKE(0x101,0xF4);
-    POKE(0x102,0x03);
-
-    // Make sure to not get disturbed.
-    // SEI
-    POKE(0x103,0x78);
-
-    // Disable Language Card (which is enabled for all cc65 programs).
-    // LDA $C082
-    POKE(0x104,0xAD);
-    POKE(0x105,0x82);
-    POKE(0x106,0xC0);
-
-    // Simulate a 6502 RESET, additionally do it from the stack page to make the MMU
-    // see the 6502 memory access pattern which is characteristic for a 6502 RESET.
-    // JMP ($FFFC)
-    POKE(0x107,0x6C);
-    POKE(0x108,0xFC);
-    POKE(0x109,0xFF);
-
-    asm("JMP $0100");
-  }
-  #endif /* __ORCAC__ */
-}
-
-bool io_get_wifi_enabled(void)
-{
-    return true;
-}
-
-void io_list_devs(void)
-{
-    sp_list_devs();
-    state = HOSTS_AND_DEVICES;
-}
-
-FNStatus io_get_fuji_status(void)
-{
-  FNStatus status;
-  fuji_status(&status);
-  return status;
-}
-
-#endif /* BUILD_APPLE2 */
diff --git a/src/apple2/mount_and_boot.c b/src/apple2/mount_and_boot.c
index 837bcf27..28791b35 100644
--- a/src/apple2/mount_and_boot.c
+++ b/src/apple2/mount_and_boot.c
@@ -1,10 +1,10 @@
 #ifdef BUILD_APPLE2
 
 #include "mount_and_boot.h"
-#include "../io.h"
 #include "../globals.h"
 #include "../screen.h"
 #include "../die.h"
+#include "../system.h"
 #ifdef __ORCAC__
 #include <coniogs.h>
 #else
@@ -15,8 +15,8 @@ void mount_and_boot_lobby(void)
 {
     if (screen_mount_and_boot_lobby())
     {
-        io_set_boot_mode(2);
-        io_boot();
+        fuji_set_boot_mode(2);
+        system_boot();
     }
     else
     {
diff --git a/src/apple2/screen.c b/src/apple2/screen.c
index 16904a34..ccbe5d82 100644
--- a/src/apple2/screen.c
+++ b/src/apple2/screen.c
@@ -776,4 +776,10 @@ bool screen_mount_and_boot_lobby(void)
     return false;
   }
 }
+
+void screen_end(void)
+{
+  return;
+}
+
 #endif /* BUILD_APPLE2 */
diff --git a/src/apple2/system.c b/src/apple2/system.c
new file mode 100644
index 00000000..b4fabc87
--- /dev/null
+++ b/src/apple2/system.c
@@ -0,0 +1,98 @@
+#include "../system.h"
+#include "sp.h"
+#include "../globals.h"
+#include <conio.h>
+#include <apple2.h>
+#include <peekpoke.h> // For the insanity in io_boot()
+#include <string.h>
+
+static NewDisk newDisk;
+uint8_t system_create_type;
+char response[256];
+
+void system_boot(void)
+{
+#ifdef __ORCAC__
+  sp_done();
+#ifndef BUILD_A2CDA
+  WriteChar(0x8c);  // Clear screen
+  WriteChar(0x92);  // Set 80 col
+  WriteChar(0x86);  // Cursor on
+  TextShutDown();
+  exit(0);
+#endif /* BUILD_A2CDA */
+
+#else /* ! __ORCAC__ */
+  char ostype;
+  int i;
+
+  ostype = get_ostype() & 0xF0;
+  //clrscr();
+  cprintf("\r\nRESTARTING...");
+
+  // Wait for fujinet disk ii states to be ready
+  for (i = 0; i < 2000; i++)
+    {
+      if (i % 250 == 0)
+        {
+          cprintf(".");
+        }
+    }
+
+  if (ostype == APPLE_IIIEM)
+    {
+      asm("STA $C082");  // disable language card (Titan3+2)
+      asm("LDA #$77");   // enable A3 primary rom
+      asm("STA $FFDF");
+      asm("JMP $F4EE");  // jmp to A3 reset entry
+    }
+  else  // Massive brute force hack that takes advantage of MMU quirk. Thank you xot.
+    {
+      POKE(0xC00E,0); // CLRALTCHAR
+
+      // Make the simulated 6502 RESET result in a cold start.
+      // INC $03F4
+      POKE(0x100,0xEE);
+      POKE(0x101,0xF4);
+      POKE(0x102,0x03);
+
+      // Make sure to not get disturbed.
+      // SEI
+      POKE(0x103,0x78);
+
+      // Disable Language Card (which is enabled for all cc65 programs).
+      // LDA $C082
+      POKE(0x104,0xAD);
+      POKE(0x105,0x82);
+      POKE(0x106,0xC0);
+
+      // Simulate a 6502 RESET, additionally do it from the stack page to make the MMU
+      // see the 6502 memory access pattern which is characteristic for a 6502 RESET.
+      // JMP ($FFFC)
+      POKE(0x107,0x6C);
+      POKE(0x108,0xFC);
+      POKE(0x109,0xFF);
+
+      asm("JMP $0100");
+    }
+#endif /* __ORCAC__ */
+}
+
+void system_create_new(uint8_t selected_host_slot, uint8_t selected_device_slot,
+                       unsigned long selected_size, const char *path)
+{
+  newDisk.createType = system_create_type;
+  newDisk.deviceSlot = selected_device_slot;
+  newDisk.hostSlot = selected_host_slot;
+  newDisk.numBlocks = selected_size;
+  strcpy(&newDisk.filename[0], path);
+  fuji_create_new(&newDisk);
+  return;
+}
+
+void system_list_devs(void)
+{
+    sp_list_devs();
+    state = HOSTS_AND_DEVICES;
+}
+
diff --git a/src/atari/atari_die.h b/src/atari/atari_die.h
index fc7f896d..2b143318 100644
--- a/src/atari/atari_die.h
+++ b/src/atari/atari_die.h
@@ -1,9 +1,8 @@
-#ifdef BUILD_ATARI
-
 #ifndef ATARI_DIE_H
 #define ATARI_DIE_H
 
+#include "../die.h"
+
 void wait_a_moment(void);
 
 #endif /* ATARI_DIE_H */
-#endif
\ No newline at end of file
diff --git a/src/atari/die.c b/src/atari/die.c
index f0f1e8e6..46a6e8c8 100644
--- a/src/atari/die.c
+++ b/src/atari/die.c
@@ -7,8 +7,8 @@
 
 #include <atari.h>
 #include <conio.h>
-#include "../io.h"
 #include "../die.h"
+#include "../system.h"
 
 /**
  * Stop, wait for keypress, then coldstart
diff --git a/src/atari/input.c b/src/atari/input.c
index 27583289..4209539a 100644
--- a/src/atari/input.c
+++ b/src/atari/input.c
@@ -11,7 +11,6 @@
 #include <string.h>
 #include <peekpoke.h>
 #include "../input.h"
-#include "../io.h"
 #include "atari_screen.h"
 #include "../globals.h"
 #include "mount_and_boot.h"
@@ -19,6 +18,7 @@
 #include "../select_file.h"
 #include "../set_wifi.h"
 #include "../constants.h"
+#include "../system.h"
 
 unsigned char selected_network;
 extern bool copy_mode;
diff --git a/src/atari/io.c b/src/atari/io.c-no
similarity index 100%
rename from src/atari/io.c
rename to src/atari/io.c-no
diff --git a/src/atari/mount_and_boot.c b/src/atari/mount_and_boot.c
index c17eead8..d03a92fd 100644
--- a/src/atari/mount_and_boot.c
+++ b/src/atari/mount_and_boot.c
@@ -1,11 +1,11 @@
 #ifdef BUILD_ATARI
 
 #include "mount_and_boot.h"
-#include "../io.h"
+#include "atari_die.h"
 #include "../globals.h"
 #include "../screen.h"
-#include "../die.h"
-#include "atari_die.h"
+#include "../system.h"
+#include "../constants.h"
 #include <conio.h>
 
 void mount_and_boot_lobby(void)
@@ -15,7 +15,7 @@ void mount_and_boot_lobby(void)
     screen_clear();
     screen_puts(3, 0, "Booting Lobby");
 
-    io_set_boot_mode(2);
+    fuji_set_boot_mode(2);
     cold_start();
 }
 
@@ -24,13 +24,13 @@ void mount_and_boot(void)
     screen_mount_and_boot();
     set_active_screen(SCREEN_MOUNT_AND_BOOT);
 
-    if (!io_get_device_slots(&deviceSlots[0]))
+    if (!fuji_get_device_slots(deviceSlots, NUM_DEVICE_SLOTS))
     {
         screen_error("ERROR READING DEVICE SLOTS");
         die();
     }
 
-    if (!io_get_host_slots(&hostSlots[0]))
+    if (!fuji_get_host_slots(hostSlots, NUM_HOST_SLOTS))
     {
         screen_error("ERROR READING HOST SLOTS");
         die();
@@ -41,7 +41,7 @@ void mount_and_boot(void)
 
     screen_puts(0, 3, "Mounting all Host and Device Slots");
 
-    if (!io_mount_all())
+    if (!fuji_mount_all())
     {
         screen_error("ERROR MOUNTING ALL");
         wait_a_moment();
@@ -50,7 +50,7 @@ void mount_and_boot(void)
     else
     {
         screen_puts(9, 22, "SUCCESSFUL! BOOTING");
-        io_set_boot_config(0);
+        fuji_set_boot_config(0);
         cold_start();
     }
 
diff --git a/src/atari/screen.c b/src/atari/screen.c
index 18751f78..32120dec 100644
--- a/src/atari/screen.c
+++ b/src/atari/screen.c
@@ -16,7 +16,6 @@
 #include <conio.h>
 #include <stdint.h>
 #include <peekpoke.h>
-#include "../io.h"
 #include "../globals.h"
 #include "../input.h"
 #include "../constants.h"
@@ -572,7 +571,7 @@ void screen_hosts_and_devices_device_slots(uint8_t y, DeviceSlot *, const bool *
 
   // Get full filename for device slot 8
   if (deviceSlots[7].file[0] != 0x00)
-    io_get_filename_for_device_slot(7, fn);
+    fuji_get_device_filename(7, fn);
 
   // Display device slots
   for (slotNum = 0; slotNum < NUM_DEVICE_SLOTS; slotNum++)
@@ -650,6 +649,15 @@ void screen_hosts_and_devices_long_filename(const char *)
 
 void screen_init(void)
 {
+  OS.noclik = 0xFF;
+  OS.shflok = 0;
+  OS.color0 = 0x9f;
+  OS.color1 = 0x0f;
+  OS.color2 = 0x90;
+  OS.color4 = 0x90;
+  OS.coldst = 1;
+  OS.sdmctl = 0; // Turn off screen
+
   memcpy((void *)DISPLAY_LIST, &config_dlist, sizeof(config_dlist)); // copy display list to $0600
   OS.sdlst = (void *)DISPLAY_LIST;                                   // and use it.
   video_ptr = (unsigned char *)(DISPLAY_MEMORY);                     // assign the value of DISPLAY_MEMORY to video_ptr
@@ -764,6 +772,11 @@ void screen_dlist_hosts_and_devices(void)
   POKE(DISPLAY_LIST + 0x1c, DL_CHR40x8x1);
 }
 
+void screen_end(void)
+{
+  return;
+}
+
 #ifdef DEBUG
 // Debugging function to show line #'s, used to test if the Y coordinate calculations are working.
 void show_line_nums(void)
diff --git a/src/atari/system.c b/src/atari/system.c
new file mode 100644
index 00000000..6933442f
--- /dev/null
+++ b/src/atari/system.c
@@ -0,0 +1,60 @@
+#include "../system.h"
+#include "../typedefs.h"
+#include "../globals.h"
+#include <string.h>
+
+static NewDisk newDisk;
+unsigned char wifiEnabled=true;
+char response[256];
+
+void system_boot(void)
+{
+  return;
+}
+
+void system_create_new(uint8_t selected_host_slot, uint8_t selected_device_slot,
+                       uint32_t selected_size, const char *path)
+{
+  switch (selected_size)
+  {
+  case 90:
+    newDisk.numSectors = 720;
+    newDisk.sectorSize = 128;
+    break;
+  case 130:
+    newDisk.numSectors = 1040;
+    newDisk.sectorSize = 128;
+    break;
+  case 180:
+    newDisk.numSectors = 720;
+    newDisk.sectorSize = 256;
+    break;
+  case 360:
+    newDisk.numSectors = 1440;
+    newDisk.sectorSize = 256;
+    break;
+  case 720:
+    newDisk.numSectors = 2880;
+    newDisk.sectorSize = 256;
+    break;
+  case 1440:
+    newDisk.numSectors = 5760;
+    newDisk.sectorSize = 256;
+    break;
+  case 999:
+    newDisk.numSectors = custom_numSectors;
+    newDisk.sectorSize = custom_sectorSize;
+    break;
+  default:
+    return;
+  }
+
+  newDisk.hostSlot = selected_host_slot;
+  newDisk.deviceSlot = selected_device_slot;
+  deviceSlots[selected_device_slot].mode = mode;
+  strcpy(newDisk.filename, path);
+
+  deviceSlots[selected_device_slot].mode = mode;
+  fuji_create_new(&newDisk);
+
+}
diff --git a/src/c64/input.c b/src/c64/input.c
index 9d2615bf..726cb9e6 100644
--- a/src/c64/input.c
+++ b/src/c64/input.c
@@ -25,12 +25,6 @@
 
 #define UNUSED(x) (void)(x);
 
-extern unsigned char copy_host_slot;
-extern bool copy_mode;
-extern bool long_entry_displayed;
-
-extern unsigned char io_create_type;
-
 /**
  * Get input from keyboard/joystick
  * @return keycode (or synthesized keycode if joystick)
@@ -199,13 +193,13 @@ unsigned char input_select_file_new_type(void)
 	{
 	case 'P':
 	case 'p':
-		io_create_type = 0;
+		system_create_type = 0;
 		return 1;
 	case '2':
-		io_create_type = 1;
+		system_create_type = 1;
 		return 2;
 	default:
-		io_create_type = 0;
+		system_create_type = 0;
 		return 0;
 	}
 }
diff --git a/src/c64/io.c b/src/c64/io.c
deleted file mode 100644
index 348a0a63..00000000
--- a/src/c64/io.c
+++ /dev/null
@@ -1,210 +0,0 @@
-#ifdef BUILD_C64
-/**
- * FujiNet CONFIG for #C64
- *
- * I/O Routines
- */
-#include <c64.h>
-#include <cbm.h>
-#include <peekpoke.h> // For the insanity in io_boot()
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "../globals.h"
-#include "../io.h"
-
-#define UNUSED(x) (void)(x);
-
-static NetConfig nc;
-static AdapterConfigExtended adapterConfig;
-static SSIDInfo ssidInfo;
-unsigned char wifiEnabled = true;
-
-char response[256];
-
-unsigned char io_create_type;
-
-void io_init(void) {}
-
-uint8_t io_status(void)
-{
-	return 0;
-}
-
-bool io_error(void)
-{
-	return fuji_error();
-}
-
-uint8_t io_get_wifi_status(void)
-{
-	uint8_t status;
-	fuji_get_wifi_status(&status);
-	return status;
-}
-
-NetConfig *io_get_ssid(void)
-{
-	fuji_get_ssid(&nc);
-	return &nc;
-}
-
-uint8_t io_scan_for_networks(void)
-{
-	uint8_t count;
-	fuji_scan_for_networks(&count);
-	return count;
-}
-
-SSIDInfo *io_get_scan_result(uint8_t n)
-{
-	fuji_get_scan_result(n, &ssidInfo);
-	return &ssidInfo;
-}
-
-AdapterConfigExtended *io_get_adapter_config_extended(void)
-{
-	fuji_get_adapter_config_extended(&adapterConfig);
-	return &adapterConfig;
-}
-
-int io_set_ssid(NetConfig *nc)
-{
-	bool is_err;
-
-	fuji_set_ssid(nc);
-	is_err = fuji_error();
-	io_get_wifi_status();
-	return is_err;
-}
-
-const char *io_get_device_filename(uint8_t slot)
-{
-	fuji_get_device_filename(slot, &response[0]);
-	return (char *) &response[0];
-}
-
-void io_create_new(uint8_t, uint8_t, unsigned long, char *)
-{
-	// TODO implement
-}
-
-bool io_get_device_slots(DeviceSlot *d)
-{
-	return fuji_get_device_slots(d, 8);
-}
-
-bool io_get_host_slots(HostSlot *h)
-{
-	return fuji_get_host_slots(h, 8);
-}
-
-void io_put_host_slots(HostSlot *h)
-{
-	fuji_put_host_slots(h, 8);
-}
-
-void io_put_device_slots(DeviceSlot *d)
-{
-	fuji_put_device_slots(d, 8);
-}
-
-uint8_t io_mount_host_slot(uint8_t hs)
-{
-	if (hostSlots[hs][0] == 0)
-		return 2;
-	fuji_mount_host_slot(hs);
-	return 0;
-}
-
-void io_open_directory(uint8_t hs, char *p, char *f)
-{
-	fuji_open_directory2(hs, p, f);
-}
-
-const char *io_read_directory(uint8_t maxlen, uint8_t a)
-{
-	memset(response, 0, maxlen);
-	fuji_read_directory(maxlen, a, &response[0]);
-	return (char *) &response[0];
-}
-
-void io_close_directory(void)
-{
-	fuji_close_directory();
-}
-
-void io_set_directory_position(DirectoryPosition pos)
-{
-	fuji_set_directory_position(pos);
-}
-
-void io_set_device_filename(unsigned char ds, unsigned char hs, unsigned char mode, char *e)
-{
-	fuji_set_device_filename(mode, hs, ds, e);
-}
-
-void io_copy_file(unsigned char source_slot, unsigned char destination_slot)
-{
-	// incrementing is handled in function, we keep everything 0 based
-	fuji_copy_file(source_slot, destination_slot, &copySpec[0]);
-}
-
-void io_set_boot_config(uint8_t toggle)
-{
-	fuji_set_boot_config(toggle);
-}
-
-void io_set_boot_mode(unsigned char mode)
-{
-	fuji_set_boot_mode(mode);
-}
-
-uint8_t io_mount_disk_image(uint8_t ds, uint8_t mode)
-{
-	return fuji_mount_disk_image(ds, mode);
-}
-
-void io_umount_disk_image(uint8_t ds)
-{
-	fuji_unmount_disk_image(ds);
-}
-
-void io_update_devices_enabled(bool *) {}
-
-void io_enable_device(unsigned char) {}
-
-void io_disable_device(unsigned char) {}
-
-bool io_get_device_enabled_status(unsigned char)
-{
-	return false;
-}
-
-unsigned char io_device_slot_to_device(unsigned char ds)
-{
-	return ds;
-}
-
-void io_boot(void) {}
-
-bool io_get_wifi_enabled(void)
-{
-	wifiEnabled = fuji_get_wifi_enabled();
-	return wifiEnabled == 1;
-}
-
-void io_get_filename_for_device_slot(unsigned char slot, const char *filename)
-{
-	fuji_get_device_filename(slot, (char *) filename);
-}
-
-bool io_mount_all(void)
-{
-	return fuji_mount_all();
-	// return OS.dcb.dstats; // 1 = successful, anything else = error.
-}
-
-#endif /* BUILD_C64 */
diff --git a/src/c64/screen.c b/src/c64/screen.c
index fef514de..119b99aa 100644
--- a/src/c64/screen.c
+++ b/src/c64/screen.c
@@ -522,4 +522,10 @@ void screen_hosts_and_devices_host_slot_empty(unsigned char hs)
 	gotoxy(2, 2 + hs);
 	cprintf("Empty");
 }
+
+void screen_end(void)
+{
+  return;
+}
+
 #endif /* BUILD_C64 */
diff --git a/src/c64/system.c b/src/c64/system.c
new file mode 100644
index 00000000..7d448639
--- /dev/null
+++ b/src/c64/system.c
@@ -0,0 +1,15 @@
+#include "../system.h"
+
+char response[256];
+unsigned char system_create_type;
+
+void system_boot(void)
+{
+  return;
+}
+
+void system_create_new(uint8_t, uint8_t, uint32_t, const char *)
+{
+	// TODO implement
+}
+
diff --git a/src/check_wifi.c b/src/check_wifi.c
index 19a3f34d..23939433 100644
--- a/src/check_wifi.c
+++ b/src/check_wifi.c
@@ -3,28 +3,33 @@
  */
 
 #include "check_wifi.h"
-#include "io.h"
 #include "globals.h"
 
+extern NetConfig nc;
+
 void check_wifi(void)
 {
+  unsigned char status;
   // Before checking actual connectivity, there's a command to check if wifi is completely disabled, check that first. If it's
   // disabled, don't go to the set/connect wifi screens.
   //
-  if ( !io_get_wifi_enabled() )
+  if ( !fuji_get_wifi_enabled() )
   {
     state=HOSTS_AND_DEVICES;
+#ifdef COLOR_SETTING_FAILED
+    bar_set_color(COLOR_SETTING_FAILED);
+#endif
   }
-  else if (io_get_wifi_status() == 3)
-  {
-	  state = HOSTS_AND_DEVICES;
-  }
-  else if (io_get_ssid()->ssid[0] == 0x00)
-  {
-	  state = SET_WIFI;
-  }
-  else
-  {
-	  state = CONNECT_WIFI;
+  else {
+    fuji_get_wifi_status(&status);
+    if (status == 3)
+      state = HOSTS_AND_DEVICES;
+    else {
+      fuji_get_ssid(&nc);
+      if (nc.ssid[0] == 0x00)
+        state = SET_WIFI;
+      else
+        state = CONNECT_WIFI;
+    }
   }
 }
diff --git a/src/coco/input.c b/src/coco/input.c
index 697de710..d3ae6f07 100644
--- a/src/coco/input.c
+++ b/src/coco/input.c
@@ -7,7 +7,6 @@
 #include <cmoc.h>
 #include <coco.h>
 #include "../input.h"
-#include "../io.h"
 #include "../screen.h"
 #include "../globals.h"
 #include "mount_and_boot.h"
diff --git a/src/coco/io.c b/src/coco/io.c
deleted file mode 100644
index 98f0bcb3..00000000
--- a/src/coco/io.c
+++ /dev/null
@@ -1,272 +0,0 @@
-#ifdef _CMOC_VERSION_
-/**
- * FujiNet Drivewire calls
- */
-
-#include <cmoc.h>
-#include <coco.h>
-#include <fujinet-fuji.h>
-#include "../io.h"
-#include "../globals.h"
-#include "../screen.h"
-#include "../pause.h"
-#include "../constants.h"
-
-#define OP_FUJI 0xE2
-#define CMD_READY 0x00
-#define CMD_RESPONSE 0x01
-
-extern NetConfig nc;
-static AdapterConfigExtended adapterConfigExt;
-static SSIDInfo ssidInfo;
-NewDisk newDisk;
-unsigned char wifiEnabled=true;
-char response[256];
-int _dirpos=0;
-byte orig_casflag;
-
-bool io_error(void)
-{
-    return fuji_error();
-}
-
-unsigned char io_status(void)
-{
-  return (unsigned char) io_error();
-}
-
-void io_init(void)
-{
-	// There's no partnering exit function for screen_init, so we'll set up
-	//   how casing is being handled here.  We default to lowercase.
-    // Set casing to lowercase.
-
-	asm {
-		lda $011A
-		sta orig_casflag
-		clr $011A
-	}
-}
-
-bool io_get_wifi_enabled(void)
-{
-    return fuji_get_wifi_enabled();
-}
-
-unsigned char io_get_wifi_status(void)
-{
-    unsigned char status;
-    fuji_get_wifi_status(&status);
-    return status;
-}
-
-NetConfig *io_get_ssid(void)
-{
-    memset(&nc, 0, sizeof(NetConfig));
-    fuji_get_ssid(&nc);
-    return &nc;
-}
-
-unsigned char io_scan_for_networks(void)
-{
-    unsigned char r=-1;
-
-    fuji_scan_for_networks(&r);
-  
-    if (r > 11)
-    {
-        r=11;
-    }
-  
-  return r;
-}
-
-SSIDInfo *io_get_scan_result(int n)
-{
-    memset(&ssidInfo, 0, sizeof(SSIDInfo));
-    fuji_get_scan_result((unsigned char) n, &ssidInfo);
-    return &ssidInfo;
-}
-
-AdapterConfigExtended *io_get_adapter_config_extended(void)
-{
-    fuji_get_adapter_config_extended(&adapterConfigExt);
-
-    return &adapterConfigExt;
-}
-
-int io_set_ssid(NetConfig *nc)
-{
-    fuji_set_ssid(nc);
-    return false;
-}
-
-bool io_get_device_slots(DeviceSlot *d)
-{
-    fuji_get_device_slots(d, NUM_DEVICE_SLOTS);
-    return 0;
-}
-
-bool io_get_host_slots(HostSlot *h)
-{
-    fuji_get_host_slots(h, NUM_HOST_SLOTS);
-    return 0;
-}
-
-void io_put_host_slots(HostSlot *h)
-{
-    fuji_put_host_slots(h, NUM_HOST_SLOTS);
-}
-
-void io_put_device_slots(DeviceSlot *d)
-{
-    fuji_put_device_slots(d, NUM_DEVICE_SLOTS);
-}
-
-bool io_mount_host_slot(unsigned char hs)
-{
-    fuji_mount_host_slot(hs);
-    return 0;
-}
-
-void io_open_directory(unsigned char hs, char *p, char *f)
-{
-	char *_p = p;
-	if (f[0] != 0x00)
-	{
-		// We have a filter, create a directory+filter string
-		memset(response, 0, 256);
-		strcpy((char *) response, p);
-		strcpy((char *) &response[strlen((char *) response) + 1], f);
-		_p = (char *) &response;
-	}
-	fuji_open_directory(hs, _p);
-}
-
-const char *io_read_directory(unsigned char maxlen, unsigned char a)
-{
-    memset(response,0,sizeof(response));
-    fuji_read_directory(maxlen, a, (char *) &response[0]);
-    
-    return (const char *)response;
-}
-
-void io_close_directory(void)
-{
-    fuji_close_directory();
-}
-
-void io_set_directory_position(DirectoryPosition pos)
-{
-    fuji_set_directory_position(pos);
-}
-
-void io_set_device_filename(unsigned char ds, char* e)
-{
-    char fn[256];
-    strcpy(fn,e);
-    
-    fuji_set_device_filename(mode, selected_host_slot, ds, fn);
-}
-
-const char *io_get_device_filename(unsigned char slot)
-{
-    memset(response,0,sizeof(response));
-    fuji_get_device_filename(slot, (char *) &response[0]);
-    return (const char *)response;
-}
-
-void io_set_boot_config(unsigned char toggle)
-{
-}
-
-void io_set_boot_mode(unsigned char mode)
-{
-}
-
-
-bool io_mount_disk_image(unsigned char ds, unsigned char mode)
-{
-    fuji_mount_disk_image(ds, mode);
-    return 0;
-}
-
-void io_umount_disk_image(unsigned char ds)
-{
-    fuji_unmount_disk_image(ds);
-}
-
-void io_boot(void)
-{
-	// Restore the original casing flag.
-	asm {
-		lda orig_casflag
-		sta $011A
-	}
-    pause(180); // Pause for 3 seconds to let the user see the mounted disks.
-    coldStart();
-	exit(0);
-}
-
-void io_create_new(unsigned char selected_host_slot, unsigned char selected_device_slot, unsigned long selected_size, char *path)
-{
-    memset(&newDisk, 0, sizeof(newDisk));
-    newDisk.numDisks = (byte)selected_size;
-    newDisk.hostSlot = selected_host_slot;
-    newDisk.deviceSlot = selected_device_slot;
-    strcpy(newDisk.filename, path);
-
-    fuji_create_new(&newDisk);
-}
-
-void io_build_directory(unsigned char ds, unsigned long numBlocks, char *v)
-{
-}
-
-bool io_get_device_enabled_status(unsigned char d)
-{
-  return false;
-}
-
-void io_update_devices_enabled(bool *e)
-{
-}
-
-void io_enable_device(unsigned char d)
-{
-}
-
-void io_disable_device(unsigned char d)
-{
-}
-
-/**
- * NOTE: On the Fuji, command 0xD8 (copy file) expects the slots to be 1-8, not 0-7 like most things.
- * That's why we add one, since config is tracking the slots as 0-7
- */
-void io_copy_file(unsigned char source_slot, unsigned char destination_slot)
-{
-    fuji_copy_file(source_slot+1, destination_slot+1, &copySpec[0]);
-}
-
-unsigned char io_device_slot_to_device(unsigned char ds)
-{
-  return 0;
-}
-
-/**
- * Get filename for device slot
- */
-void io_get_filename_for_device_slot(unsigned char slot, const char *filename)
-{
-}
-
-/**
- * Mount all hosts and devices
- */
-unsigned char io_mount_all(void)
-{
-  return 1;
-}
-
-#endif /* _CMOC_VERSION_ */
diff --git a/src/coco/mount_and_boot.c b/src/coco/mount_and_boot.c
index ee553d30..0212e0ab 100644
--- a/src/coco/mount_and_boot.c
+++ b/src/coco/mount_and_boot.c
@@ -1,7 +1,7 @@
 #ifdef _CMOC_VERSION_
 
 #include "mount_and_boot.h"
-#include "../io.h"
+#include "../typedefs.h"
 
 void mount_and_boot_lobby(void)
 {
@@ -9,8 +9,7 @@ void mount_and_boot_lobby(void)
 
 void mount_and_boot(void)
 {
-  
-  io_mount_all();
+  fuji_mount_all();
   exit(1);
 }
 
diff --git a/src/coco/screen.c b/src/coco/screen.c
index 6af15142..f9153637 100644
--- a/src/coco/screen.c
+++ b/src/coco/screen.c
@@ -12,7 +12,6 @@
 #include <cmoc.h>
 #include <coco.h>
 #include "coco_screen.h"
-#include "../io.h"
 #include "../globals.h"
 #include "../input.h"
 #include "../constants.h"
@@ -23,12 +22,9 @@
 unsigned char *video_ptr;  // a pointer to the memory address containing the screen contents
 unsigned char *cursor_ptr; // a pointer to the current cursor position on the screen
 char _visibleEntries;
-extern bool copy_mode;
 char text_empty[] = "Empty";
 char fn[256];
-extern HDSubState hd_subState;
-extern DeviceSlot deviceSlots[NUM_DEVICE_SLOTS];
-extern HostSlot hostSlots[8];
+static byte orig_casflag;
 
 char uppercase_tmp[32]; // temp space for strupr(s) output.
                         // so original strings doesn't get changed.
@@ -519,6 +515,12 @@ void screen_hosts_and_devices_long_filename(const char *f)
 
 void screen_init(void)
 {
+  asm {
+    lda $011A
+      sta orig_casflag
+      clr $011A
+      }
+
   // Make sure the screen is in 32 column mode
   width(32);
 }
@@ -569,4 +571,14 @@ void screen_connect_wifi(NetConfig *nc)
   screen_add_shadow(9,BLUE); // change to CYAN
 }
 
+void screen_end(void)
+{
+  // Restore the original casing flag.
+  asm {
+    lda orig_casflag
+      sta $011A
+      }
+  return;
+}
+
 #endif
diff --git a/src/coco/system.c b/src/coco/system.c
new file mode 100644
index 00000000..b4722c09
--- /dev/null
+++ b/src/coco/system.c
@@ -0,0 +1,26 @@
+#include "../system.h"
+#include "../pause.h"
+
+static NewDisk newDisk;
+char response[256];
+
+void system_boot(void)
+{
+  pause(180); // Pause for 3 seconds to let the user see the mounted disks.
+  coldStart();
+  exit(0);
+}
+
+void system_create_new(uint8_t selected_host_slot, uint8_t selected_device_slot,
+                       uint32_t selected_size, const char *path)
+{
+  memset(&newDisk, 0, sizeof(newDisk));
+  newDisk.numDisks = (byte)selected_size;
+  newDisk.hostSlot = selected_host_slot;
+  newDisk.deviceSlot = selected_device_slot;
+  strcpy(newDisk.filename, path);
+
+  fuji_create_new(&newDisk);
+  return;
+}
+
diff --git a/src/connect_wifi.c b/src/connect_wifi.c
index 39f8489d..589039ab 100644
--- a/src/connect_wifi.c
+++ b/src/connect_wifi.c
@@ -8,7 +8,6 @@
 #include "compat.h"
 #include "screen.h"
 #include "input.h"
-#include "io.h"
 
 void connect_wifi(void)
 {
@@ -16,7 +15,7 @@ void connect_wifi(void)
 	NetConfig nc;
 	unsigned char s;
 
-	memcpy(&nc, io_get_ssid(), sizeof(NetConfig));
+        fuji_get_ssid(&nc);
 
 	state = SET_WIFI;
 
@@ -36,7 +35,7 @@ void connect_wifi(void)
 		}
 #endif /* _CMOC_VERSION_ */
 		
-		s = io_get_wifi_status();
+		fuji_get_wifi_status(&s);
 
 		switch (s)
 		{
diff --git a/src/destination_host_slot.c b/src/destination_host_slot.c
index af2550b2..cce83236 100644
--- a/src/destination_host_slot.c
+++ b/src/destination_host_slot.c
@@ -7,7 +7,6 @@
 #include "typedefs.h"
 #include "screen.h"
 #include "input.h"
-#include "io.h"
 #include "globals.h"
 
 DHSubState dh_subState;
@@ -26,7 +25,7 @@ void destination_host_slot_init()
 
 void destination_host_slot_display()
 {
-  io_get_host_slots(&hostSlots[0]);
+  fuji_get_host_slots(&hostSlots[0], NUM_HOST_SLOTS);
   screen_hosts_and_devices_host_slots(&hostSlots[0]);
   dh_subState=DH_CHOOSE;
 }
diff --git a/src/fuji_compat.c b/src/fuji_compat.c
new file mode 100644
index 00000000..eaca07ce
--- /dev/null
+++ b/src/fuji_compat.c
@@ -0,0 +1,21 @@
+#if defined(BUILD_APPLE2) || defined(BUILD_ATARI)
+#include "typedefs.h"
+#include "globals.h"
+#include <string.h>
+
+#warning "FIXME - this should be part of fujinet-lib"
+
+bool fuji_open_directory2(uint8_t hs, char *p, char *f)
+{
+  char *_p = p;
+  if (f[0] != 0x00)
+  {
+    // We have a filter, create a directory+filter string
+    memset(response, 0, 256);
+    strcpy(response, p);
+    strcpy(&response[strlen(response) + 1], f);
+    _p = &response[0];
+  }
+  return fuji_open_directory(hs, _p);
+}
+#endif /* BUILD_APPLE2 || BUILD_ATARI */
diff --git a/src/fuji_compat.h b/src/fuji_compat.h
index 02ab4a1e..2ed28fbb 100644
--- a/src/fuji_compat.h
+++ b/src/fuji_compat.h
@@ -10,6 +10,38 @@
 #else
 // Source the types in fujinet-fuji.h for platforms that are not yet using fujinet-lib
 #include "fuji_typedefs_io.h"
+
+extern bool fuji_get_scan_result(uint8_t n, SSIDInfo *ssid_info);
+extern bool fuji_get_adapter_config_extended(AdapterConfigExtended *ac);
+extern bool fuji_scan_for_networks(uint8_t *count);
+extern bool fuji_error(void);
+extern bool fuji_set_ssid(NetConfig *nc);
+extern bool fuji_close_directory(void);
+extern bool fuji_mount_host_slot(uint8_t hs);
+extern bool fuji_open_directory2(uint8_t hs, char *path, char *filter);
+extern bool fuji_set_directory_position(uint16_t pos);
+extern bool fuji_read_directory(uint8_t maxlen, uint8_t aux2, char *buffer);
+extern bool fuji_put_host_slots(HostSlot *h, size_t size);
+extern bool fuji_set_boot_config(uint8_t toggle);
+extern bool fuji_get_wifi_enabled(void);
+extern bool fuji_get_wifi_status(uint8_t *status);
+extern bool fuji_get_ssid(NetConfig *net_config);
+extern bool fuji_get_device_filename(uint8_t ds, char *buffer);
+extern bool fuji_unmount_disk_image(uint8_t ds);
+extern bool fuji_put_device_slots(DeviceSlot *d, size_t size);
+extern bool fuji_get_device_slots(DeviceSlot *d, size_t size);
+extern bool fuji_set_device_filename(uint8_t mode, uint8_t hs, uint8_t ds, char *buffer);
+extern bool fuji_disable_device(uint8_t d);
+extern bool fuji_enable_device(uint8_t d);
+extern bool fuji_mount_disk_image(uint8_t ds, uint8_t mode);
+extern bool fuji_get_host_slots(HostSlot *h, size_t size);
+extern bool fuji_copy_file(uint8_t src_slot, uint8_t dst_slot, char *copy_spec);
+extern bool fuji_create_new(NewDisk *new_disk);
+
+#ifdef BUILD_ADAM
+#define FUJI_DEV 0x0F
+#endif /* BUILD_ADAM */
+
 #endif
 
 #define MODE_READ 1
@@ -30,5 +62,22 @@ typedef enum _entry_types
 
 typedef unsigned short DirectoryPosition;
 
+//#warning "FIXME - needs to be implemented in fujinet-lib and firmware."
+
+// Other than Adam, all implementations are hard coded to return true or false.
+#define fuji_get_device_enabled_status(ds) true
+// Just calls the above for count devices
+#define fuji_update_devices_enabled(de, count)
+
+#define fuji_device_slot_to_device(ds) (ds + FUJI_SLOT_TO_DEV_OFFSET)
+#define fuji_open_directory_filter(hs, path, filter) fuji_open_directory2(hs, path, filter)
+//#define fuji_mount_all() (void)
+
+#if defined(BUILD_ADAM) || defined(BUILD_RC2014)
+#define FUJI_SLOT_TO_DEV_OFFSET 4
+#else /* !BUILD_ADAM && !BUILD_RC2014 */
+#define FUJI_SLOT_TO_DEV_OFFSET 4
+#endif /* BUILD_ADAM || BUILD_RC2014 */
+
 #endif /* FUJI_TYPEDEFS_H */
 
diff --git a/src/globals.h b/src/globals.h
index 068d5101..93040cf6 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -40,5 +40,14 @@ extern unsigned short custom_sectorSize;
 
 extern bool deviceEnabled[];
 extern bool mounting;
+extern AdapterConfigExtended adapterConfigExt;
+
+extern bool copy_mode;
+extern HDSubState hd_subState;
+
+extern uint8_t copy_host_slot;
+extern bool copy_mode;
+extern bool long_entry_displayed;
+extern uint8_t system_create_type;
 
 #endif /* GLOBALS_H */
diff --git a/src/hosts_and_devices.c b/src/hosts_and_devices.c
index 602f2b04..24884679 100644
--- a/src/hosts_and_devices.c
+++ b/src/hosts_and_devices.c
@@ -9,7 +9,6 @@
 #include "compat.h"
 #include "input.h"
 #include "constants.h"
-#include "io.h"
 #include "globals.h"
 
 HDSubState hd_subState=HD_HOSTS;
@@ -62,13 +61,13 @@ void hosts_and_devices_edit_host_slot(uint_fast8_t i)
     }
   } 
 
-  io_put_host_slots(&hostSlots[0]);
+  fuji_put_host_slots(&hostSlots[0], NUM_HOST_SLOTS);
   screen_hosts_and_devices_hosts();
 }
 
 void hosts_and_devices_hosts(void)
 {
-  io_update_devices_enabled(&deviceEnabled[0]);
+  fuji_update_devices_enabled(deviceEnabled, NUM_DEVICE_SLOTS);
  
   if (!quick_boot)
   	screen_hosts_and_devices_hosts();
@@ -79,19 +78,18 @@ void hosts_and_devices_hosts(void)
 
 void hosts_and_devices_long_filename(void)
 {
-  const char *f = io_get_device_filename(selected_device_slot);
-
-  screen_hosts_and_devices_long_filename(f);
+  fuji_get_device_filename(selected_device_slot, response);
+  screen_hosts_and_devices_long_filename(response);
 }
 
 void hosts_and_devices_eject(unsigned char ds)
 {
-  io_umount_disk_image(ds);
+  fuji_unmount_disk_image(ds);
   memset(deviceSlots[ds].file, 0, FILE_MAXLEN);
   deviceSlots[ds].hostSlot = 0xFF;
   deviceSlots[ds].mode = 0;
-  io_put_device_slots(&deviceSlots[0]);
-  io_get_device_slots(&deviceSlots[0]);
+  fuji_put_device_slots(deviceSlots, NUM_DEVICE_SLOTS);
+  fuji_get_device_slots(deviceSlots, NUM_DEVICE_SLOTS);
   screen_hosts_and_devices_eject(ds);
   hosts_and_devices_long_filename();
 }
@@ -113,7 +111,7 @@ void hosts_and_devices_devices(void)
 {
   char k = 0;
 
-  io_update_devices_enabled(&deviceEnabled[0]);
+  fuji_update_devices_enabled(deviceEnabled, NUM_DEVICE_SLOTS);
   screen_hosts_and_devices_devices();
   hosts_and_devices_long_filename();
 
@@ -135,28 +133,23 @@ void hosts_and_devices_devices_set_mode(unsigned char m)
   // Stow device slot temporarily
   memcpy(&temp_deviceSlot, &deviceSlots[selected_device_slot], sizeof(DeviceSlot));
   temp_deviceSlot.mode = m;
-  memcpy(temp_filename, io_get_device_filename(selected_device_slot), sizeof(temp_filename));
+  fuji_get_device_filename(selected_device_slot, temp_filename);
 
   // unmount disk image
-  io_umount_disk_image(selected_device_slot);
+  fuji_unmount_disk_image(selected_device_slot);
 
   // copy device slot back in.
   memcpy(&deviceSlots[selected_device_slot], &temp_deviceSlot, sizeof(DeviceSlot));
-#if defined(BUILD_ATARI) || defined(BUILD_APPLE2) || defined(__CBM__)
-  io_set_device_filename(selected_device_slot, selected_host_slot, m, temp_filename);
-#else
-  // i promise to implement in all cases.
-  io_set_device_filename(selected_device_slot, temp_filename);
-#endif
+  fuji_set_device_filename(selected_device_slot, selected_host_slot, m, temp_filename);
 
-  io_put_device_slots(&deviceSlots[0]);
+  fuji_put_device_slots(deviceSlots, NUM_DEVICE_SLOTS);
 
   // Make sure host slot is mounted or it will fail mounting disk
-  io_mount_host_slot(deviceSlots[selected_device_slot].hostSlot);
+  fuji_mount_host_slot(deviceSlots[selected_device_slot].hostSlot);
 
   // Remount
 #if defined(BUILD_ATARI)
-  mnt = io_mount_disk_image(selected_device_slot, m);
+  mnt = fuji_mount_disk_image(selected_device_slot, m);
 
   // Check for error
   if (!mnt)
@@ -171,12 +164,12 @@ void hosts_and_devices_devices_set_mode(unsigned char m)
     // likely failed on setting write mode, make it read only
     temp_deviceSlot.mode = MODE_READ;
     memcpy(&deviceSlots[selected_device_slot], &temp_deviceSlot, sizeof(DeviceSlot));
-    io_put_device_slots(&deviceSlots[0]);
+    fuji_put_device_slots(deviceSlots, NUM_DEVICE_SLOTS);
     screen_error(""); // clear the error msg
   }
-  screen_hosts_and_devices_device_slots(DEVICES_START_Y, &deviceSlots[0], &deviceEnabled[0]); // redraw the disks
+  screen_hosts_and_devices_device_slots(DEVICES_START_Y, deviceSlots, deviceEnabled); // redraw the disks
 #elif defined(BUILD_APPLE2)
-  mnt = io_mount_disk_image(selected_device_slot, m);
+  mnt = fuji_mount_disk_image(selected_device_slot, m);
 
   // Check for error
   if (!mnt)
@@ -189,34 +182,34 @@ void hosts_and_devices_devices_set_mode(unsigned char m)
     // likely failed on setting write mode, make it read only
     temp_deviceSlot.mode = MODE_READ;
     memcpy(&deviceSlots[selected_device_slot], &temp_deviceSlot, sizeof(DeviceSlot));
-    io_put_device_slots(&deviceSlots[0]);
+    fuji_put_device_slots(deviceSlots, NUM_DEVICE_SLOTS);
   }
-  screen_hosts_and_devices_device_slots(11, &deviceSlots[0], &deviceEnabled[0]); // redraw the disks
+  screen_hosts_and_devices_device_slots(11, deviceSlots, deviceEnabled); // redraw the disks
   //screen_hosts_and_devices_devices_selected(selected_device_slot); // Breaks disk order on screen??
   selected_device_slot = 0; // Go back to drive 0 instead
   hosts_and_devices_devices();
 #elif defined(_CMOC_VERSION_)
-    io_mount_disk_image(selected_device_slot, m);
-    screen_hosts_and_devices_device_slots(1,&deviceSlots[0],&deviceEnabled[0]);
+    fuji_mount_disk_image(selected_device_slot, m);
+    screen_hosts_and_devices_device_slots(1,deviceSlots,deviceEnabled);
     bar_jump(selected_device_slot);
 #else
-    io_mount_disk_image(selected_device_slot, m);
+    fuji_mount_disk_image(selected_device_slot, m);
 #endif
 }
 
 void hosts_and_devices_devices_enable_toggle(unsigned char ds)
 {
-  bool s = io_get_device_enabled_status(io_device_slot_to_device(ds));
+  bool s = fuji_get_device_enabled_status(io_device_slot_to_device(ds));
 
   if (s == true)
-    io_disable_device(io_device_slot_to_device(ds));
+    fuji_disable_device(fuji_device_slot_to_device(ds));
   else
-    io_enable_device(io_device_slot_to_device(ds));
+    fuji_enable_device(fuji_device_slot_to_device(ds));
 
-  deviceEnabled[ds] = io_get_device_enabled_status(io_device_slot_to_device(ds));
+  deviceEnabled[ds] = fuji_get_device_enabled_status(io_device_slot_to_device(ds));
 
-  io_update_devices_enabled(&deviceEnabled[0]);
-  screen_hosts_and_devices_device_slots(11, &deviceSlots[0], &deviceEnabled[0]);
+  fuji_update_devices_enabled(deviceEnabled, NUM_DEVICE_SLOTS);
+  screen_hosts_and_devices_device_slots(11, deviceSlots, deviceEnabled);
   bar_update();
 }
 
@@ -262,8 +255,8 @@ void hosts_and_devices_done(void)
       textcolor(LIST_VBAR_COLOR); cprintf("%c:", s);
       textcolor(TEXT_COLOR); cprintf("%s", deviceSlots[i].file);
 #endif
-      io_mount_host_slot(deviceSlots[i].hostSlot);
-      io_mount_disk_image(i, deviceSlots[i].mode);
+      fuji_mount_host_slot(deviceSlots[i].hostSlot);
+      fuji_mount_disk_image(i, deviceSlots[i].mode);
     }
   }
 
@@ -278,19 +271,19 @@ void hosts_and_devices(void)
     hd_subState = HD_HOSTS;
 
 #ifdef BUILD_PMD85
-    io_get_host_slots(&hostSlots[0]);
-    io_get_device_slots(&deviceSlots[0]);
-    io_update_devices_enabled(&deviceEnabled[0]);
-    screen_hosts_and_devices(&hostSlots[0], &deviceSlots[0], &deviceEnabled[0]);
+    fuji_get_host_slots(hostSlots, NUM_HOST_SLOTS);
+    fuji_get_device_slots(deviceSlots, NUM_DEVICE_SLOTS);
+    fuji_update_devices_enabled(deviceEnabled, NUM_DEVICE_SLOTS);
+    screen_hosts_and_devices(hostSlots, deviceSlots, deviceEnabled);
 #endif
 
   while (state == HOSTS_AND_DEVICES)
   {
 #ifndef BUILD_PMD85
-    io_get_host_slots(&hostSlots[0]);
-    io_get_device_slots(&deviceSlots[0]);
-    io_update_devices_enabled(&deviceEnabled[0]);
-    screen_hosts_and_devices(&hostSlots[0], &deviceSlots[0], &deviceEnabled[0]);
+    fuji_get_host_slots(&hostSlots[0], NUM_HOST_SLOTS);
+    fuji_get_device_slots(deviceSlots, NUM_DEVICE_SLOTS);
+    fuji_update_devices_enabled(deviceEnabled, NUM_DEVICE_SLOTS);
+    screen_hosts_and_devices(&hostSlots[0], deviceSlots, deviceEnabled);
 #endif
 
     switch (hd_subState)
diff --git a/src/io.h b/src/io.h
deleted file mode 100644
index 6de1c8c3..00000000
--- a/src/io.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * I/O Routines
- */
-
-#ifndef IO_H
-#define IO_H
-
-#include "typedefs.h"
-
-bool io_error(void);
-uint8_t io_status(void);
-void io_init(void);
-uint8_t io_get_wifi_status(void);
-NetConfig* io_get_ssid(void);
-uint8_t io_scan_for_networks(void);
-SSIDInfo *io_get_scan_result(uint_fast8_t n);
-//AdapterConfig *io_get_adapter_config(void);
-AdapterConfigExtended *io_get_adapter_config_extended(void);
-int io_set_ssid(NetConfig *nc);
-const char *io_get_device_filename(uint8_t ds);
-void io_create_new(uint8_t selected_host_slot,uint8_t selected_device_slot,uint32_t selected_size,char *path);
-bool io_get_device_slots(DeviceSlot *d);
-bool io_get_host_slots(HostSlot *h);
-void io_put_host_slots(HostSlot *h);
-void io_put_device_slots(DeviceSlot *d);
-uint8_t io_mount_host_slot(uint8_t hs);
-void io_open_directory(uint8_t hs, char *p, char *f);
-const char *io_read_directory(uint8_t l, uint8_t a);
-void io_close_directory(void);
-void io_set_directory_position(DirectoryPosition pos);
-bool io_mount_disk_image(uint8_t ds, uint8_t mode);
-void io_copy_file(uint8_t source_slot, uint8_t destination_slot);
-void io_set_boot_config(uint8_t toggle);
-void io_set_boot_mode(uint8_t mode);
-void io_umount_disk_image(uint8_t ds);
-bool io_get_device_enabled_status(uint8_t d);
-void io_update_devices_enabled(bool *e);
-void io_enable_device(uint8_t d);
-void io_disable_device(uint8_t d);
-uint8_t io_device_slot_to_device(uint8_t ds);
-void io_boot(void);
-bool io_get_wifi_enabled(void);
-void io_list_devs(void);
-void io_build_directory(uint8_t ds, uint32_t numBlocks, char *v);
-bool io_mount_all(void);
-
-#if defined(BUILD_ATARI) || defined(BUILD_APPLE2) || defined(__CBM__)
-void io_set_device_filename(uint8_t ds, uint8_t hs, uint8_t mode, char* e);
-#else
-//#warning "Why is io_set_device_filename() different on this platform?"
-void io_set_device_filename(uint8_t ds, char* e);
-#endif
-
-#ifdef BUILD_ATARI
-void rtclr();
-void cold_start();
-void io_get_filename_for_device_slot(unsigned char slot, const char* filename);
-#endif /* BUILD_ATARI */
-
-#endif /* IO_H */
diff --git a/src/main.c b/src/main.c
index 241cf7ba..f2d41883 100644
--- a/src/main.c
+++ b/src/main.c
@@ -12,9 +12,9 @@
 #include "perform_copy.h"
 #include "show_info.h"
 #include "destination_host_slot.h"
-#include "io.h"
 #include "screen.h"
 #include "typedefs.h"
+#include "system.h"
 
 State state=HOSTS_AND_DEVICES;
 bool backToFiles=false;
@@ -22,15 +22,15 @@ bool backFromCopy=false;
 
 void setup(void)
 {
-  io_init();
   screen_init();
 }
 
 void done(void)
 {
   // reboot here
-  io_set_boot_config(0); // disable config
-  io_boot();             // and reboot.
+  fuji_set_boot_config(0); // disable config
+  screen_end();            // restore screen/keyboard state if needed
+  system_boot();           // and reboot.
 }
 
 void run(void)
@@ -68,7 +68,7 @@ void run(void)
 			break;
 		#ifdef BUILD_APPLE2
 		case SHOW_DEVICES:
-			io_list_devs();
+			system_list_devs();
 			break;
 		#endif
 		case DONE:
diff --git a/src/perform_copy.c b/src/perform_copy.c
index 503ddb10..a50b73e5 100644
--- a/src/perform_copy.c
+++ b/src/perform_copy.c
@@ -7,7 +7,6 @@
 #include "compat.h"
 #include "screen.h"
 #include "globals.h"
-#include "io.h"
 
 extern char source_filename[128];
 
@@ -25,7 +24,12 @@ void perform_copy(void)
   
   screen_perform_copy((char *)hostSlots[copy_host_slot],(char *)source_path,(char *)hostSlots[selected_host_slot],(char *)path);
 
-  io_copy_file(copy_host_slot, selected_host_slot);
+  /**
+   * NOTE: On the Fuji, command 0xD8 (copy file) expects the slots to
+   * be 1-8, not 0-7 like most things.  That's why we add one, since
+   * config is tracking the slots as 0-7
+   */
+  fuji_copy_file(copy_host_slot + 1, selected_host_slot + 1, copySpec);
 
   copy_mode = false;
   
diff --git a/src/pmd85/io.c b/src/pmd85/io.c-no
similarity index 100%
rename from src/pmd85/io.c
rename to src/pmd85/io.c-no
diff --git a/src/screen.h b/src/screen.h
index 0eb97da5..7565e189 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -26,6 +26,7 @@ typedef enum
 } _screen;
 
 void screen_init(void);
+void screen_end(void);
 void screen_error(const char *s);
 
 void screen_putlcc(char c);
diff --git a/src/select_file.c b/src/select_file.c
index acd32746..3961ccdb 100644
--- a/src/select_file.c
+++ b/src/select_file.c
@@ -6,13 +6,12 @@
 #include "screen.h"
 #include "constants.h"
 #include "compat.h"
-#include "io.h"
 #include "globals.h"
 #include "input.h"
 
 SFSubState sf_subState;
 char path[224];
-char filter[32] = {0};
+char filter[32] = "";
 char source_path[224];
 char source_filter[32];
 char source_filename[128];
@@ -38,7 +37,7 @@ void select_file_init(void)
     strncpy(source_filter, filter, 32);
   }
 
-  io_close_directory();
+  fuji_close_directory();
   pos = 0;
   memset(entry_size, 0, ENTRIES_PER_PAGE);
 
@@ -66,11 +65,11 @@ unsigned char select_file_display(void)
 {
   char visibleEntries = 0;
   char i;
-  const char *e;
+  //const char *e;
 
-  io_mount_host_slot(selected_host_slot);
+  fuji_mount_host_slot(selected_host_slot);
 
-  if (io_error())
+  if (fuji_error())
   {
     screen_error("  COULD NOT MOUNT HOST SLOT.");
     sf_subState = SF_DONE;
@@ -80,9 +79,9 @@ unsigned char select_file_display(void)
 
   screen_select_file_display(path, filter);
 
-  io_open_directory(selected_host_slot, path, filter);
+  fuji_open_directory2(selected_host_slot, path, filter);
 
-  if (io_error())
+  if (fuji_error())
   {
     screen_error("  COULD NOT OPEN DIRECTORY.");
     sf_subState = SF_DONE;
@@ -91,35 +90,35 @@ unsigned char select_file_display(void)
   }
 
   if (pos > 0)
-    io_set_directory_position(pos);
+    fuji_set_directory_position(pos);
 
   for (i = 0; i < ENTRIES_PER_PAGE; i++)
   {
-    e = io_read_directory(DIR_MAX_LEN, 0);
+    fuji_read_directory(DIR_MAX_LEN, 0, response);
 #ifdef BUILD_ADAM
 #define FUDGE_OFFSET 2
 #else
 #define FUDGE_OFFSET 1
 #endif
-    if (e[FUDGE_OFFSET] == 0x7F) // I am truly ashamed of this, and will fix someday -thom
+    if (response[FUDGE_OFFSET] == 0x7F) // I am truly ashamed of this, and will fix someday -thom
     {
       dir_eof = true;
       break;
     }
     else
     {
-      entry_size[i] = (unsigned char)strlen(e);
+      entry_size[i] = (unsigned char)strlen(response);
       visibleEntries++; // could filter on e[0] to deal with message entries like on FUJINET.PL
-      screen_select_file_display_entry(i, e, 0);
+      screen_select_file_display_entry(i, response, 0);
     }
   }
 
   // Do one more read to check EOF
-  e = io_read_directory(DIR_MAX_LEN, 0);
-  if (e[1] == 0x7F) // was e[2]
+  fuji_read_directory(DIR_MAX_LEN, 0, response);
+  if (response[1] == 0x7F) // was response[2]
     dir_eof = true;
 
-  io_close_directory();
+  fuji_close_directory();
 
   if (pos > 0)
     screen_select_file_prev();
@@ -135,16 +134,16 @@ void select_file_set_source_filename(void)
 {
   char entry[128];
 
-  io_open_directory(selected_host_slot, path, filter);
-  io_set_directory_position(pos);
-  strcpy(entry, io_read_directory(128, 0));
+  fuji_open_directory2(selected_host_slot, path, filter);
+  fuji_set_directory_position(pos);
+  fuji_read_directory(128, 0, entry);
   strcat(path, entry);
   strcpy(source_filename, entry);
 }
 
 void select_display_long_filename(void)
 {
-  const char *e;
+  //const char *e;
 
 #ifdef BUILD_ATARI
   if ((entry_size[bar_get() - FILES_START_Y] > 30) && (entry_timer == 0))
@@ -154,15 +153,15 @@ void select_display_long_filename(void)
   {
     if (long_entry_displayed == false)
     {
-      io_open_directory(selected_host_slot, path, filter);
+      fuji_open_directory2(selected_host_slot, path, filter);
 #ifdef BUILD_ATARI
-      io_set_directory_position(pos + bar_get() - FILES_START_Y);
+      fuji_set_directory_position(pos + bar_get() - FILES_START_Y);
 #else
-      io_set_directory_position(pos + bar_get());
+      fuji_set_directory_position(pos + bar_get());
 #endif
-      e = io_read_directory(64, 0);
-      screen_select_file_display_long_filename(e);
-      io_close_directory();
+      fuji_read_directory(64, 0, response);
+      screen_select_file_display_long_filename(response);
+      fuji_close_directory();
       long_entry_displayed = true;
     }
   }
@@ -213,29 +212,28 @@ void select_file_choose(char visibleEntries)
 
 void select_file_link(void)
 {
-  const char *e;
+  //const char *e;
   char tnfsHostname[128];
   bar_clear(false);
 
-  io_open_directory(selected_host_slot, path, filter);
+  fuji_open_directory2(selected_host_slot, path, filter);
 
-  if (io_error())
+  if (fuji_error())
   {
       sf_subState = SF_DONE;
       state = HOSTS_AND_DEVICES;
       return;
   }
 
-  io_set_directory_position(pos);
+  fuji_set_directory_position(pos);
 
-  e = io_read_directory(128, 0x20);
+  fuji_read_directory(128, 0x20, response);
+  strcpy(tnfsHostname, &response[1]);
 
-  strcpy(tnfsHostname, &e[1]);
-
-  io_close_directory();
+  fuji_close_directory();
 
   strcpy((char *)hostSlots[NUM_HOST_SLOTS-1], tnfsHostname);
-  io_put_host_slots(&hostSlots[0]);
+  fuji_put_host_slots(&hostSlots[0], NUM_HOST_SLOTS);
 
   selected_host_slot = NUM_HOST_SLOTS-1;
   strcpy(selected_host_name, tnfsHostname);
@@ -245,19 +243,19 @@ void select_file_link(void)
 
 void select_file_advance(void)
 {
-  const char *e;
+  //const char *e;
 
   bar_clear(false);
 
-  io_open_directory(selected_host_slot, path, filter);
+  fuji_open_directory2(selected_host_slot, path, filter);
 
-  io_set_directory_position(pos);
+  fuji_set_directory_position(pos);
 
-  e = io_read_directory(128, 1);
+  fuji_read_directory(128, 1, response);
 
-  strcat(path, e); // append directory entry to end of current path
+  strcat(path, response); // append directory entry to end of current path
 
-  io_close_directory(); // have to use "e" before calling another io command, otherwise e gets wiped out
+  fuji_close_directory(); // have to use "e" before calling another io command, otherwise e gets wiped out
 
   pos = 0;
   dir_eof = quick_boot = false;
@@ -292,20 +290,20 @@ void select_file_devance(void)
 
 unsigned select_file_entry_type(void)
 {
-  const char *e;
+  //const char *e;
   unsigned result;
 
-  io_open_directory(selected_host_slot, path, filter);
+  fuji_open_directory2(selected_host_slot, path, filter);
 
-  io_set_directory_position(pos);
+  fuji_set_directory_position(pos);
 
-  e = io_read_directory(128, 0);
+  fuji_read_directory(128, 0, response);
 
-  if (e[0] != '\0' && e[strlen(e)-1] == '/') result = ENTRY_TYPE_FOLDER;
-  else if (e[0] == '+') result = ENTRY_TYPE_LINK;
+  if (response[0] != '\0' && response[strlen(response)-1] == '/') result = ENTRY_TYPE_FOLDER;
+  else if (response[0] == '+') result = ENTRY_TYPE_LINK;
   else result = ENTRY_TYPE_FILE;
 
-  io_close_directory();
+  fuji_close_directory();
 
   return result; // Offset 10 = directory flag.
 }
diff --git a/src/select_slot.c b/src/select_slot.c
index e2111f9b..545bae1b 100644
--- a/src/select_slot.c
+++ b/src/select_slot.c
@@ -7,11 +7,8 @@
 #include "constants.h"
 #include "compat.h"
 #include "screen.h"
-#include "io.h"
 #include "input.h"
-
-extern DeviceSlot deviceSlots[8];
-extern bool quick_boot;
+#include "system.h"
 
 char mode=0;
 
@@ -41,19 +38,20 @@ void select_slot_display()
     }
   else
     {
-      io_open_directory(selected_host_slot,path,filter);
+      fuji_open_directory2(selected_host_slot,path,filter);
 
-      io_set_directory_position(pos);
+      fuji_set_directory_position(pos);
 
-      io_get_device_slots(&deviceSlots[0]);
+      fuji_get_device_slots(&deviceSlots[0], NUM_DEVICE_SLOTS);
 
 #ifdef BUILD_PMD85
-      screen_select_slot(io_read_directory(120,0x80)); // up to 3 lines of 40 chars each
+      fuji_read_directory(120, 0x80, response); // up to 3 lines of 40 chars each
 #else
-      screen_select_slot(io_read_directory(49,0x80));
+      fuji_read_directory(49, 0x80, response);
 #endif
+      screen_select_slot(response);
 
-      io_close_directory();
+      fuji_close_directory();
     }
 
   ss_subState=SS_CHOOSE;
@@ -61,10 +59,10 @@ void select_slot_display()
 
 void select_slot_eject(unsigned char ds)
 {
-  io_umount_disk_image(ds);
+  fuji_unmount_disk_image(ds);
   memset(deviceSlots[ds].file,0,FILE_MAXLEN);
   deviceSlots[ds].hostSlot=0xFF;
-  io_put_device_slots(&deviceSlots[0]);
+  fuji_put_device_slots(&deviceSlots[0], NUM_DEVICE_SLOTS);
   screen_select_slot_eject(ds);
 }
 
@@ -91,28 +89,28 @@ void select_slot_done()
   {
     create=false; // we're done with this until next time.
     screen_select_file_new_creating();
-    io_create_new(selected_host_slot,selected_device_slot,selected_size,path);
+    system_create_new(selected_host_slot,selected_device_slot,selected_size,path);
     memcpy(deviceSlots[selected_device_slot].file,path,DIR_MAX_LEN);
     deviceSlots[selected_device_slot].mode=2;
     deviceSlots[selected_device_slot].hostSlot=selected_host_slot;
 
 #if defined(BUILD_ATARI) || defined(BUILD_APPLE2) || defined(__CBM__)
     // why hardcoded to 2 here?
-    io_set_device_filename(selected_device_slot, selected_host_slot, 2, path);
+    fuji_set_device_filename(2, selected_host_slot, selected_device_slot, path);
 #else
-    io_put_device_slots(&deviceSlots[0]);
-    io_set_device_filename(selected_device_slot, path);
+    fuji_put_device_slots(&deviceSlots[0], NUM_DEVICE_SLOTS);
+    fuji_set_device_filename(mode, selected_host_slot, selected_device_slot, path);
 #endif
 
 #ifdef BUILD_ADAM
     screen_select_slot_build_eos_directory();
     if (input_select_slot_build_eos_directory())
     {
-      io_mount_disk_image(selected_device_slot,2); // R/W
+      fuji_mount_disk_image(selected_device_slot,2); // R/W
       screen_select_slot_build_eos_directory_label();
       input_select_slot_build_eos_directory_label(filename);
       screen_select_slot_build_eos_directory_creating();
-      io_build_directory(selected_device_slot,selected_size,filename);
+      system_build_directory(selected_device_slot,selected_size,filename);
     }
 
     state=HOSTS_AND_DEVICES;
@@ -123,26 +121,24 @@ void select_slot_done()
   {
     strcat(filename,path);
 
-    io_open_directory(selected_host_slot,path,filter);
+    fuji_open_directory2(selected_host_slot,path,filter);
 
-    io_set_directory_position(pos);
+    fuji_set_directory_position(pos);
 
-    strcat(filename,io_read_directory(255-(unsigned char)strlen(path),0));
+    fuji_read_directory(255-(unsigned char)strlen(path), 0, response);
+    strcat(filename, response);
 
-#if defined(BUILD_ATARI) || defined(BUILD_APPLE2) || defined(__CBM__)
-    io_set_device_filename(selected_device_slot, selected_host_slot, mode, filename);
-#else
-    io_set_device_filename(selected_device_slot,filename);
-#endif
+    fuji_set_device_filename(mode, selected_host_slot, selected_device_slot, filename);
 
-    io_set_directory_position(pos);
+    fuji_set_directory_position(pos);
 
-    memcpy(deviceSlots[selected_device_slot].file,io_read_directory(DIR_MAX_LEN,0),DIR_MAX_LEN);
+    fuji_read_directory(DIR_MAX_LEN, 0, response);
+    memcpy(deviceSlots[selected_device_slot].file, response, DIR_MAX_LEN);
     deviceSlots[selected_device_slot].mode=mode;
     deviceSlots[selected_device_slot].hostSlot=selected_host_slot;
 
 #ifndef BUILD_ATARI
-    io_put_device_slots(&deviceSlots[0]);
+    fuji_put_device_slots(&deviceSlots[0], NUM_DEVICE_SLOTS);
 #endif
 
 #ifdef BUILD_APPLE2
@@ -165,7 +161,7 @@ void select_slot_done()
       io_put_device_slots(&deviceSlots[0]);
     }*/
 #endif
-    io_close_directory();
+    fuji_close_directory();
   }
 
   if (!quick_boot)
diff --git a/src/set_wifi.c b/src/set_wifi.c
index 81942165..ffd7661f 100644
--- a/src/set_wifi.c
+++ b/src/set_wifi.c
@@ -4,22 +4,22 @@
 
 #include "set_wifi.h"
 #include "die.h"
-#include "io.h"
 #include "screen.h"
 #include "input.h"
 #include "globals.h"
 #include "compat.h"
+#include "system.h"
 
 WSSubState ws_subState;
-
 NetConfig nc;
-
-unsigned char numNetworks;
+uint8_t numNetworks;
+AdapterConfigExtended adapterConfigExt;
+static SSIDInfo ssidInfo;
 
 void set_wifi_set_ssid(uint_fast8_t i)
 {
-  SSIDInfo *s = io_get_scan_result(i);
-  memcpy(nc.ssid,s->ssid,32);
+  fuji_get_scan_result((uint8_t) i, &ssidInfo);
+  memcpy(nc.ssid, ssidInfo.ssid, 32);
 }
 
 void set_wifi_select(void)
@@ -50,16 +50,16 @@ void set_wifi_scan(void)
 {
   char i;
   unsigned char valid_networks = 0;
-  SSIDInfo *ssid_info;
 
-  screen_set_wifi_extended(io_get_adapter_config_extended());
+  fuji_get_adapter_config_extended(&adapterConfigExt);
+  screen_set_wifi_extended(&adapterConfigExt);
 
-  numNetworks = io_scan_for_networks();
+  fuji_scan_for_networks(&numNetworks);
 
-  if (numNetworks > 16)
-	  numNetworks = 16;
+  if (numNetworks > MAX_WIFI_NETWORKS)
+	  numNetworks = MAX_WIFI_NETWORKS;
 
-  if (io_error())
+  if (fuji_error())
   {
 	  screen_error("COULD NOT WS_SCAN NETWORKS");
 	  die(); // to do retry or something instead
@@ -67,10 +67,10 @@ void set_wifi_scan(void)
 
   for (i = 0; i < numNetworks; i++)
   {
-    ssid_info = io_get_scan_result(i);
-    if (ssid_info != NULL && ssid_info->ssid != NULL & strlen(ssid_info->ssid) != 0)
+    fuji_get_scan_result(i, &ssidInfo);
+    if (strlen(ssidInfo.ssid) != 0)
     {
-      screen_set_wifi_display_ssid(i, ssid_info);
+      screen_set_wifi_display_ssid(i, &ssidInfo);
       valid_networks++;
     }
     else
@@ -89,7 +89,7 @@ void set_wifi_done(void)
 #ifdef _CMOC_VERSION_  
   locate(0,14);
 #endif
-  int result = io_set_ssid(&nc);
+  int result = fuji_set_ssid(&nc);
   // always (good or bad) go to connect_wifi.
   // I had used result to only show this when we have good return, but
   // the connect_wifi shows error messages for us and jumps back to set wifi
diff --git a/src/show_info.c b/src/show_info.c
index fa80b03f..64225be7 100644
--- a/src/show_info.c
+++ b/src/show_info.c
@@ -5,9 +5,9 @@
 #include "show_info.h"
 #include "typedefs.h"
 #include "screen.h"
-#include "io.h"
 #include "input.h"
 #include "constants.h"
+#include "globals.h"
 
 SISubState si_subState;
 
@@ -15,7 +15,8 @@ void show_info(void)
 {
   si_subState=SI_SHOWINFO;
   
-  screen_show_info_extended(io_get_device_enabled_status(PRINTER),io_get_adapter_config_extended());
+  fuji_get_adapter_config_extended(&adapterConfigExt);
+  screen_show_info_extended(fuji_get_device_enabled_status(PRINTER), &adapterConfigExt);
 
   while (si_subState==SI_SHOWINFO)
     si_subState=input_show_info();
diff --git a/src/system.h b/src/system.h
new file mode 100644
index 00000000..71b37914
--- /dev/null
+++ b/src/system.h
@@ -0,0 +1,21 @@
+#include "typedefs.h"
+
+extern void system_boot(void);
+extern void system_create_new(uint8_t selected_host_slot, uint8_t selected_device_slot,
+                              uint32_t selected_size, const char *path);
+extern void system_build_directory(unsigned char ds, unsigned long numBlocks, char *v);
+
+#ifdef _CMOC_VERSION_
+#define MAX_WIFI_NETWORKS 11
+#else /* ! _CMOC_VERSION_ */
+#define MAX_WIFI_NETWORKS 16
+#endif /* _CMOC_VERSION_ */
+
+#ifdef BUILD_APPLE2
+extern void system_list_devs(void);
+#endif /* BUILD_APPLE2 */
+
+#ifdef BUILD_ATARI
+extern void cold_start(void);
+extern void rtclr(void);
+#endif /* BUILD_ATARI */
diff --git a/src/typedefs.h b/src/typedefs.h
index 174ffb28..ab1e2b60 100644
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -7,8 +7,6 @@
 #ifndef TYPEDEFS_H
 #define TYPEDEFS_H
 
-#include "fuji_compat.h"
-
 #ifdef _CMOC_VERSION_
 typedef int uint_fast8_t;
 #else /* ! _CMOC_VERSION_ */
@@ -16,6 +14,8 @@ typedef int uint_fast8_t;
 #include <stdint.h>
 #endif /* _CMOC_VERSION_ */
 
+#include "fuji_compat.h"
+
 typedef enum _ws_subState
   {
    WS_SCAN,