diff --git a/BizHawk.Emulation/BizHawk.Emulation.csproj b/BizHawk.Emulation/BizHawk.Emulation.csproj
index 9aad3c0aeb..509ed439fd 100644
--- a/BizHawk.Emulation/BizHawk.Emulation.csproj
+++ b/BizHawk.Emulation/BizHawk.Emulation.csproj
@@ -84,6 +84,8 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Consoles\Calculator\TI83.cs" />
+    <Compile Include="Consoles\Coleco\ColecoVision.Core.cs" />
+    <Compile Include="Consoles\Coleco\ColecoVision.cs" />
     <Compile Include="Consoles\Nintendo\NES\APU.cs" />
     <Compile Include="Consoles\Nintendo\NES\BoardSystem.cs" />
     <Compile Include="Consoles\Nintendo\NES\Boards\AVE-NINA.cs" />
diff --git a/BizHawk.Emulation/Consoles/Coleco/ColecoVision.Core.cs b/BizHawk.Emulation/Consoles/Coleco/ColecoVision.Core.cs
new file mode 100644
index 0000000000..641144b958
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Coleco/ColecoVision.Core.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BizHawk.Emulation.CPUs.Z80;
+using BizHawk.Emulation.Sound;
+
+namespace BizHawk.Emulation.Consoles.Coleco
+{
+	public partial class ColecoVision : IEmulator
+	{
+		public byte[] rom;
+		public Z80A cpu;
+
+		public byte ReadMemory(ushort addr)
+		{
+			return 0xFF;
+		}
+
+		public void WriteMemory(ushort addr, byte value)
+		{
+			return;
+		}
+
+		public void HardReset()
+		{
+
+		}
+
+		public void FrameAdvance(bool render)
+		{
+
+		}
+	}
+}
diff --git a/BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs b/BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs
new file mode 100644
index 0000000000..52bf830f59
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.IO;
+
+namespace BizHawk.Emulation.Consoles.Coleco
+{
+	public partial class ColecoVision : IEmulator, IVideoProvider, ISoundProvider
+	{
+		public string SystemId { get { return "Coleco"; } }
+		public int[] frameBuffer = new int[256 * 192];
+		public CoreInputComm CoreInputComm { get; set; }
+		public CoreOutputComm CoreOutputComm { get; private set; }
+		public IVideoProvider VideoProvider { get { return this; } }
+		public ISoundProvider SoundProvider { get { return this; } }
+		public byte[] ram = new byte[1024];
+
+		public ColecoVision(GameInfo game, byte[] rom)
+		{
+			var domains = new List<MemoryDomain>(1);
+			domains.Add(new MemoryDomain("Main RAM", 128, Endian.Little, addr => ram[1023], (addr, value) => ram[addr & 1023] = value));
+			memoryDomains = domains.AsReadOnly();
+			CoreOutputComm = new CoreOutputComm();
+			CoreInputComm = new CoreInputComm();
+			this.rom = rom;
+			HardReset();
+		}
+
+		public void ResetFrameCounter() { _frame = 0; }
+
+		public static readonly ControllerDefinition ColecoVisionControllerDefinition = new ControllerDefinition
+		{
+			Name = "ColecoVision Basic Controller",
+			BoolButtons = 
+			{
+				"P1 Up", "P1 Down", "P1 Left", "P1 Right",
+				"P1 B1", "P1 B2", "P1 B3", "P1 B4",
+				"P1 Key1", "P1 Key2", "P1 Key3", "P1 Key4", "P1 Key5",
+				"P1 Key6", "P1 Key7", "P1 Key8", "P1 Key9" //adelikat: TODO: this was based on a picture, is this the right buttons?, semantics?, can there be multiple controllers?
+			}
+		};
+
+		void SyncState(Serializer ser)
+		{
+			//cpu.SyncState(ser); //TODO: z80 does not have this, do it the SMS way?
+			ser.Sync("ram", ref ram, false);
+			ser.Sync("Lag", ref _lagcount);
+			ser.Sync("Frame", ref _frame);
+		}
+
+		public ControllerDefinition ControllerDefinition { get { return ColecoVisionControllerDefinition; } }
+		public IController Controller { get; set; }
+
+		public int Frame { get { return _frame; } set { _frame = value; } }
+		public int LagCount { get { return _lagcount; } set { _lagcount = value; } }
+		public bool IsLagFrame { get { return _islag; } }
+		private bool _islag = true;
+		private int _lagcount = 0;
+		private int _frame = 0;
+
+		public byte[] SaveRam { get { return new byte[0]; } }
+		public bool DeterministicEmulation { get; set; }
+		public bool SaveRamModified { get; set; }
+		public void SaveStateText(TextWriter writer) { SyncState(Serializer.CreateTextWriter(writer)); }
+		public void LoadStateText(TextReader reader) { SyncState(Serializer.CreateTextReader(reader)); }
+		public void SaveStateBinary(BinaryWriter bw) { SyncState(Serializer.CreateBinaryWriter(bw)); }
+		public void LoadStateBinary(BinaryReader br) { SyncState(Serializer.CreateBinaryReader(br)); }
+
+		public byte[] SaveStateBinary()
+		{
+			MemoryStream ms = new MemoryStream();
+			BinaryWriter bw = new BinaryWriter(ms);
+			SaveStateBinary(bw);
+			bw.Flush();
+			return ms.ToArray();
+		}
+
+		public int[] GetVideoBuffer() { return frameBuffer; }
+		public int BufferWidth { get { return 320; } }
+		public int BufferHeight { get { return 262; } }
+		public int BackgroundColor { get { return 0; } }
+		public void GetSamples(short[] samples)
+		{
+		}
+
+		public void DiscardSamples() { }
+		public int MaxVolume { get; set; }
+		private IList<MemoryDomain> memoryDomains;
+		public IList<MemoryDomain> MemoryDomains { get { return memoryDomains; } }
+		public MemoryDomain MainMemory { get { return memoryDomains[0]; } }
+		public void Dispose() { }
+	}
+}