diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKTerminal.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKTerminal.java
index d5655406f..493ff0a21 100644
--- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKTerminal.java
+++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKTerminal.java
@@ -4,6 +4,7 @@ import com.hbm.explosion.vanillant.ExplosionVNT;
 import com.hbm.explosion.vanillant.standard.EntityProcessorCrossSmooth;
 import com.hbm.explosion.vanillant.standard.ExplosionEffectWeapon;
 import com.hbm.explosion.vanillant.standard.PlayerProcessorStandard;
+import com.hbm.handler.CompatHandler;
 import com.hbm.interfaces.IControlReceiver;
 import com.hbm.inventory.gui.GUIScreenRBMKTerminal;
 import com.hbm.tileentity.IGUIProvider;
@@ -11,23 +12,35 @@ import com.hbm.tileentity.TileEntityLoadedBase;
 import com.hbm.tileentity.network.RTTYSystem;
 import com.hbm.util.BufferUtil;
 
+import cpw.mods.fml.common.Optional;
 import io.netty.buffer.ByteBuf;
+import li.cil.oc.api.machine.Arguments;
+import li.cil.oc.api.machine.Callback;
+import li.cil.oc.api.machine.Context;
+import li.cil.oc.api.network.SimpleComponent;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
-public class TileEntityRBMKTerminal extends TileEntityLoadedBase implements IGUIProvider, IControlReceiver {
+@Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")})
+public class TileEntityRBMKTerminal extends TileEntityLoadedBase implements IGUIProvider, IControlReceiver, SimpleComponent, CompatHandler.OCComponent {
 	
 	public String[] history = new String[17];
 	public String channel = "";
 	public String repeatCmd = "";
 	public boolean doesRepeat = false;
+	public boolean ocMode = false;
 	
 	@Override
 	public void updateEntity() {
 		if(!worldObj.isRemote) {
 			
+			if(ocMode) {
+				this.networkPackNT(10);
+				return;
+			}
+
 			if(!this.channel.isEmpty() && !this.repeatCmd.isEmpty())
 				RTTYSystem.broadcast(worldObj, this.channel, this.repeatCmd + "");
 			
@@ -38,6 +51,12 @@ public class TileEntityRBMKTerminal extends TileEntityLoadedBase implements IGUI
 	public void eval(String cmd) {
 		if(cmd == null) return;
 		
+		if(ocMode) {
+			push(cmd);
+			this.markChanged();
+			return;
+		}
+
 		push(cmd);
 		if(cmd.isEmpty()) return;
 		
@@ -127,16 +146,23 @@ public class TileEntityRBMKTerminal extends TileEntityLoadedBase implements IGUI
 	public void readFromNBT(NBTTagCompound nbt) {
 		super.readFromNBT(nbt);
 		this.channel = nbt.getString("channel");
+		if(this.channel != null && this.channel.equals(" ")) this.channel = "";
 		this.repeatCmd = nbt.getString("repeatCmd");
-		for(int i = 0; i < history.length; i++) this.history[i] = nbt.getString("history" + i);
+		if(this.repeatCmd != null && this.repeatCmd.equals(" ")) this.repeatCmd = "";
+		this.ocMode = nbt.getBoolean("ocMode");
+		for(int i = 0; i < history.length; i++) {
+			this.history[i] = nbt.getString("history" + i);
+			if(this.history[i] != null && this.history[i].equals(" ")) this.history[i] = "";
+		}
 	}
 
 	@Override
 	public void writeToNBT(NBTTagCompound nbt) {
 		super.writeToNBT(nbt);
-		nbt.setString("channel", channel);
-		nbt.setString("repeatCmd", repeatCmd);
-		for(int i = 0; i < history.length; i++) nbt.setString("history" + i, history[i]);
+		nbt.setString("channel", channel.isEmpty() ? " " : channel);
+		nbt.setString("repeatCmd", repeatCmd.isEmpty() ? " " : repeatCmd);
+		nbt.setBoolean("ocMode", ocMode);
+		for(int i = 0; i < history.length; i++) nbt.setString("history" + i, history[i] == null || history[i].isEmpty() ? " " : history[i]);
 	}
 	
 	@Override
@@ -154,4 +180,73 @@ public class TileEntityRBMKTerminal extends TileEntityLoadedBase implements IGUI
 
 	@Override public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { return null; }
 	@Override public Object provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { return new GUIScreenRBMKTerminal(this); }
+
+	// OpenComputers methods
+	@Override
+	@Optional.Method(modid = "OpenComputers")
+	public String getComponentName() {
+		return "rbmk_terminal";
+	}
+
+	@Callback(direct = true, limit = 2)
+	@Optional.Method(modid = "OpenComputers")
+	public Object[] enableOCMode(Context context, Arguments args) {
+		ocMode = args.checkBoolean(0);
+		if(ocMode) {
+			for(int i = 0; i < history.length; i++) history[i] = "";
+			push("OC MODE ENABLED");
+			push("Terminal ready.");
+		}
+		markDirty();
+		return new Object[] {true};
+	}
+
+	@Callback(direct = true)
+	@Optional.Method(modid = "OpenComputers")
+	public Object[] isOCMode(Context context, Arguments args) {
+		return new Object[] {ocMode};
+	}
+
+	@Callback(direct = true, limit = 2)
+	@Optional.Method(modid = "OpenComputers")
+	public Object[] write(Context context, Arguments args) {
+		if(!ocMode) return new Object[] {false, "OC mode not enabled"};
+		push(args.checkString(0));
+		return new Object[] {true};
+	}
+
+	@Callback(direct = true, limit = 3)
+	@Optional.Method(modid = "OpenComputers")
+	public Object[] writeln(Context context, Arguments args) {
+		if(!ocMode) return new Object[] {false, "OC mode not enabled"};
+		push(args.checkString(0));
+		return new Object[] {true};
+	}
+
+	@Callback(direct = true)
+	@Optional.Method(modid = "OpenComputers")
+	public Object[] readInput(Context context, Arguments args) {
+		if(!ocMode) return new Object[] {"", "OC mode not enabled"};
+		return new Object[] {history[0] != null ? history[0] : ""};
+	}
+
+	@Callback(direct = true)
+	@Optional.Method(modid = "OpenComputers")
+	public Object[] getAllHistory(Context context, Arguments args) {
+		if(!ocMode) return new Object[] {null, "OC mode not enabled"};
+		String[] copy = new String[history.length];
+		for(int i = 0; i < history.length; i++) {
+			copy[i] = history[i] != null ? history[i] : "";
+		}
+		return new Object[] {copy};
+	}
+
+	@Callback(direct = true, limit = 2)
+	@Optional.Method(modid = "OpenComputers")
+	public Object[] clearScreen(Context context, Arguments args) {
+		if(!ocMode) return new Object[] {false, "OC mode not enabled"};
+		for(int i = 0; i < history.length; i++) history[i] = "";
+		markDirty();
+		return new Object[] {true};
+	}
 }