diff --git a/sys/apis/crypto.lua b/sys/apis/crypto.lua
index fc1075b..94970e0 100644
--- a/sys/apis/crypto.lua
+++ b/sys/apis/crypto.lua
@@ -1,150 +1,177 @@
--- https://github.com/PixelToast/ComputerCraft/blob/master/apis/enc
+-- Chacha20 cipher in ComputerCraft
+-- By Anavrins
 
-local Crypto = { }
+local sha2 = require("sha2")
+local util = require("util")
 
-local function serialize(t) 
-	local sType = type(t)
-	if sType == "table" then
-		local lstcnt=0
-		for k,v in pairs(t) do
-			lstcnt = lstcnt + 1
-		end
-		local result = "{"
-		local aset=1
-		for k,v in pairs(t) do
-			if k==aset then
-				result = result..serialize(v)..","
-				aset=aset+1
-			else
-				result = result..("["..serialize(k).."]="..serialize(v)..",")
+local Crypto = {}
+local ROUNDS = 20 -- Adjust this for speed tradeoff
+
+local bxor = bit32.bxor
+local band = bit32.band
+local blshift = bit32.lshift
+local brshift = bit32.arshift
+
+local mod = 2^32
+local tau = {("expand 16-byte k"):byte(1,-1)}
+local sigma = {("expand 32-byte k"):byte(1,-1)}
+
+local function rotl(n, b)
+	local s = n/(2^(32-b))
+	local f = s%1
+	return (s-f) + f*mod
+end
+
+local function quarterRound(s, a, b, c, d)
+	s[a] = (s[a]+s[b])%mod; s[d] = rotl(bxor(s[d], s[a]), 16)
+	s[c] = (s[c]+s[d])%mod; s[b] = rotl(bxor(s[b], s[c]), 12)
+	s[a] = (s[a]+s[b])%mod; s[d] = rotl(bxor(s[d], s[a]), 8)
+	s[c] = (s[c]+s[d])%mod; s[b] = rotl(bxor(s[b], s[c]), 7)
+	return s
+end
+
+local function hashBlock(state, rnd)
+	local s = {unpack(state)}
+	for i = 1, rnd do
+		local r = i%2==1
+		s = r and quarterRound(s, 1, 5,  9, 13) or quarterRound(s, 1, 6, 11, 16)
+		s = r and quarterRound(s, 2, 6, 10, 14) or quarterRound(s, 2, 7, 12, 13)
+		s = r and quarterRound(s, 3, 7, 11, 15) or quarterRound(s, 3, 8,  9, 14)
+		s = r and quarterRound(s, 4, 8, 12, 16) or quarterRound(s, 4, 5, 10, 15)
+	end
+	for i = 1, 16 do s[i] = (s[i]+state[i])%mod end
+	return s
+end
+
+local function LE_toInt(bs, i)
+	return (bs[i+1] or 0)+
+	blshift((bs[i+2] or 0), 8)+
+	blshift((bs[i+3] or 0), 16)+
+	blshift((bs[i+4] or 0), 24)
+end
+
+local function initState(key, nonce, counter)
+	local isKey256 = #key == 32
+	local const = isKey256 and sigma or tau
+	local state = {}
+
+	state[ 1] = LE_toInt(const, 0)
+	state[ 2] = LE_toInt(const, 4)
+	state[ 3] = LE_toInt(const, 8)
+	state[ 4] = LE_toInt(const, 12)
+
+	state[ 5] = LE_toInt(key, 0)
+	state[ 6] = LE_toInt(key, 4)
+	state[ 7] = LE_toInt(key, 8)
+	state[ 8] = LE_toInt(key, 12)
+	state[ 9] = LE_toInt(key, isKey256 and 16 or 0)
+	state[10] = LE_toInt(key, isKey256 and 20 or 4)
+	state[11] = LE_toInt(key, isKey256 and 24 or 8)
+	state[12] = LE_toInt(key, isKey256 and 28 or 12)
+
+	state[13] = counter
+	state[14] = LE_toInt(nonce, 0)
+	state[15] = LE_toInt(nonce, 4)
+	state[16] = LE_toInt(nonce, 8)
+
+	return state
+end
+
+local function serialize(state)
+	local r = {}
+	for i = 1, 16 do
+		r[#r+1] = band(state[i], 0xFF)
+		r[#r+1] = band(brshift(state[i], 8), 0xFF)
+		r[#r+1] = band(brshift(state[i], 16), 0xFF)
+		r[#r+1] = band(brshift(state[i], 24), 0xFF)
+	end
+	return r
+end
+
+local mt = {
+	__tostring = function(a) return string.char(unpack(a)) end,
+	__index = {
+		toHex = function(self, s) return ("%02x"):rep(#self):format(unpack(self)) end,
+		isEqual = function(self, t)
+			if type(t) ~= "table" then return false end
+			if #self ~= #t then return false end
+			local ret = 0
+			for i = 1, #self do
+				ret = bit32.bor(ret, bxor(self[i], t[i]))
 			end
+			return ret == 0
 		end
-		result = result.."}"
-		return result
-	elseif sType == "string" then
-		return string.format("%q",t)
-	elseif sType == "number" or sType == "boolean" or sType == "nil" then
-		return tostring(t)
-	elseif sType == "function" then
-		local status,data=pcall(string.dump,t)
-		if status then
-			data2=""
-			for char in string.gmatch(data,".") do
-				data2=data2..zfill(string.byte(char))
-			end
-			return 'f("'..data2..'")'
-		else
-			error("Invalid function: "..data)
+	}
+}
+
+function crypt(data, key, nonce, cntr, round)
+	assert(type(key) == "table", "ChaCha20: Invalid key format ("..type(key).."), must be table")
+	assert(type(nonce) == "table", "ChaCha20: Invalid nonce format ("..type(nonce).."), must be table")
+	assert(#key == 16 or #key == 32, "ChaCha20: Invalid key length ("..#key.."), must be 16 or 32")
+	assert(#nonce == 12, "ChaCha20: Invalid nonce length ("..#nonce.."), must be 12")
+
+	local data = type(data) == "table" and {unpack(data)} or {tostring(data):byte(1,-1)}
+	cntr = tonumber(cntr) or 1
+	round = tonumber(round) or 20
+
+	local out = {}
+	local state = initState(key, nonce, cntr)
+	local blockAmt = math.floor(#data/64)
+	for i = 0, blockAmt do
+		local ks = serialize(hashBlock(state, round))
+		state[13] = (state[13]+1) % mod
+
+		local block = {}
+		for j = 1, 64 do
+			block[j] = data[((i)*64)+j]
 		end
-	else
-		error("Could not serialize type "..sType..".")
-	end
-end
-
-local function unserialize( s )
-	local func, e = loadstring( "return "..s, "serialize" )
-	if not func then
-		return s,e
-	else
-		setfenv( func, {
-			f=function(S)
-				return loadstring(splitnum(S))
-			end,
-		})
-		return func()
-	end
-end
-
-local function splitnum(S)
-	local Out=""
-	for l1=1,#S,2 do
-		local l2=(#S-l1)+1
-		local function sure(N,n)
-			if (l2-n)<1 then N="0" end
-			return N
+		for j = 1, #block do
+			out[#out+1] = bxor(block[j], ks[j])
 		end
-		local CNum=tonumber("0x"..sure(string.sub(S,l2-1,l2-1),1) .. sure(string.sub(S,l2,l2),0))
-		Out=string.char(CNum)..Out
-	end
-	return Out
-end
 
-local function zfill(N)
-	N=string.format("%X",N)
-	Zs=""
-	if #N==1 then
-		Zs="0"
-	end
-	return Zs..N
-end
-
-local function wrap(N)
-	return N-(math.floor(N/256)*256)
-end
-
-local function checksum(S)
-	local sum=0
-	for char in string.gmatch(S,".") do
-		math.randomseed(string.byte(char)+sum)
-		sum=sum+math.random(0,9999)
-	end
-	math.randomseed(sum)
-	return sum
-end
-
-local function genkey(len,psw)
-	checksum(psw)
-	local key={}
-	local tKeys={}
-	for l1=1,len do
-		local num=math.random(1,len)
-		while tKeys[num] do
-			num=math.random(1,len)
+		if i % 1000 == 0 then
+			os.queueEvent("")
+			os.pullEvent("")
 		end
-		tKeys[num]=true
-		key[l1]={num,math.random(0,255)}
 	end
-	return key
+	return setmetatable(out, mt)
 end
 
-function Crypto.encrypt(data,psw)
-	data=serialize(data)
-	local chs=checksum(data)
-	local key=genkey(#data,psw)
-	local out={}
-	local cnt=1
-	for char in string.gmatch(data,".") do
-		table.insert(out,key[cnt][1],zfill(wrap(string.byte(char)+key[cnt][2])),chars)
-		cnt=cnt+1
-	end
-	return string.sub(serialize({chs,table.concat(out)}),2,-3)
+local function genNonce(len)
+    local nonce = {}
+    for i = 1, len do
+        nonce[i] = math.random(0, 0xFF)
+    end
+    return setmetatable(nonce, mt)
 end
 
-function Crypto.decrypt(data,psw)
-	local oData=data
-	data=unserialize("{"..data.."}")
-	if type(data)~="table" then
-		return oData
-	end
-	local chs=data[1]
-	data=data[2]
-	local key=genkey((#data)/2,psw)
-	local sKey={}
-	for k,v in pairs(key) do
-		sKey[v[1]]={k,v[2]}
-	end
-	local str=splitnum(data)
-	local cnt=1
-	local out={}
-	for char in string.gmatch(str,".") do
-		table.insert(out,sKey[cnt][1],string.char(wrap(string.byte(char)-sKey[cnt][2])))
-		cnt=cnt+1
-	end
-	out=table.concat(out)
-	if checksum(out or "")==chs then
-		return unserialize(out)
-	end
-	return oData,out,chs
+local function serialize(data)
+    if type(data) == "table" then
+        return textutils.serialise(data)
+    end
+    return data
+end
+
+local function unserialize(data)
+    local undata = textutils.unserialise(tostring(data))
+    if type(undata) == "table" then return undata end
+    return data
+end
+
+function Crypto.encrypt(data, key)
+	local data = serialize(data)
+	local nonce = genNonce(12)
+	local key = sha2.digest(key)
+	local ctx = crypt(data, key, nonce, 1, ROUNDS)
+	return {nonce:toHex(), ctx:toHex()}
+end
+
+function Crypto.decrypt(data, key)
+    local nonce = util.hexToByteArray(data[1])
+    local data = util.hexToByteArray(data[2])
+    local key = sha2.digest(key)
+    local ptx = crypt(data, key, nonce, 1, ROUNDS)
+    return unserialize(ptx)
 end
 
 return Crypto
diff --git a/sys/apis/util.lua b/sys/apis/util.lua
index f1f5a8d..128e46b 100644
--- a/sys/apis/util.lua
+++ b/sys/apis/util.lua
@@ -10,6 +10,15 @@ local _sformat  = string.format
 local _srep     = string.rep
 local _ssub     = string.sub
 
+function Util.hexToByteArray(str)
+    local r = {}
+    str = tostring(str)
+    for b in str:gmatch("%x%x?") do
+        r[#r+1] = tonumber(b, 16)
+    end
+    return r
+end
+
 function Util.tryTimed(timeout, f, ...)
 	local c = os.clock()
 	repeat