diff --git a/packages/haskell/9.0.1/build.sh b/packages/haskell/9.0.1/build.sh
new file mode 100755
index 0000000..50d63c2
--- /dev/null
+++ b/packages/haskell/9.0.1/build.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+PREFIX=$(realpath $(dirname $0))
+
+mkdir -p build
+
+cd build
+
+# Platform specific because a true source compile would require GHC to be installed already on the latest
+curl -L "https://downloads.haskell.org/~ghc/9.0.1/ghc-9.0.1-x86_64-deb10-linux.tar.xz" -o ghc.tar.xz
+tar xf ghc.tar.xz --strip-components=1
+rm ghc.tar.xz
+
+./configure --prefix="$PREFIX"
+make install -j$(nproc)
+
+cd ../
+
+rm -rf build
diff --git a/packages/haskell/9.0.1/compile b/packages/haskell/9.0.1/compile
new file mode 100644
index 0000000..2dd42e9
--- /dev/null
+++ b/packages/haskell/9.0.1/compile
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+# Compile haskell file(s)
+ghc -dynamic -v0 -o out "$@"
+chmod +x out
diff --git a/packages/haskell/9.0.1/environment b/packages/haskell/9.0.1/environment
new file mode 100644
index 0000000..bd0ff98
--- /dev/null
+++ b/packages/haskell/9.0.1/environment
@@ -0,0 +1 @@
+export PATH=$PWD/bin:$PATH
\ No newline at end of file
diff --git a/packages/haskell/9.0.1/metadata.json b/packages/haskell/9.0.1/metadata.json
new file mode 100644
index 0000000..c6fae6d
--- /dev/null
+++ b/packages/haskell/9.0.1/metadata.json
@@ -0,0 +1,6 @@
+{
+    "language": "haskell",
+    "version": "9.0.1",
+    "author": "Dan Vargas <danvargas46@gmail.com>",
+    "aliases": ["haskell", "hs"]
+}
\ No newline at end of file
diff --git a/packages/haskell/9.0.1/run b/packages/haskell/9.0.1/run
new file mode 100644
index 0000000..6955ba9
--- /dev/null
+++ b/packages/haskell/9.0.1/run
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+shift # Filename is only used to compile
+./out "$@"
diff --git a/packages/haskell/9.0.1/test.hs b/packages/haskell/9.0.1/test.hs
new file mode 100644
index 0000000..a8dd75a
--- /dev/null
+++ b/packages/haskell/9.0.1/test.hs
@@ -0,0 +1 @@
+main = putStrLn "OK"
\ No newline at end of file
diff --git a/packages/lisp/2.1.2/build.sh b/packages/lisp/2.1.2/build.sh
new file mode 100755
index 0000000..37f1f8a
--- /dev/null
+++ b/packages/lisp/2.1.2/build.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Put instructions to build your package in here
+PREFIX=$(realpath $(dirname $0))
+
+mkdir -p build
+
+cd build
+
+# Prebuilt binary install since source compile requires lisp to be installed already
+curl -L "http://prdownloads.sourceforge.net/sbcl/sbcl-2.1.2-x86-64-linux-binary.tar.bz2" -o sbcl.tar.bz2
+tar xf sbcl.tar.bz2 --strip-components=1
+rm sbcl.tar.bz2
+
+INSTALL_ROOT=$PREFIX sh install.sh
+
+cd ../
+
+rm -rf build
diff --git a/packages/lisp/2.1.2/environment b/packages/lisp/2.1.2/environment
new file mode 100644
index 0000000..780b668
--- /dev/null
+++ b/packages/lisp/2.1.2/environment
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# Put 'export' statements here for environment variables
+export PATH=$PWD/bin:$PATH
diff --git a/packages/lisp/2.1.2/metadata.json b/packages/lisp/2.1.2/metadata.json
new file mode 100644
index 0000000..fd35513
--- /dev/null
+++ b/packages/lisp/2.1.2/metadata.json
@@ -0,0 +1,6 @@
+{
+  "language": "lisp",
+  "version": "2.1.2",
+  "aliases": ["lisp","cl","sbcl","commonlisp"],
+  "author": "Dan Vargas <danvargas46@gmail.com>"
+}
diff --git a/packages/lisp/2.1.2/run b/packages/lisp/2.1.2/run
new file mode 100644
index 0000000..74a5cf3
--- /dev/null
+++ b/packages/lisp/2.1.2/run
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# Put instructions to run the runtime
+sbcl --script "$@"
diff --git a/packages/lisp/2.1.2/test.cl b/packages/lisp/2.1.2/test.cl
new file mode 100644
index 0000000..1de92b7
--- /dev/null
+++ b/packages/lisp/2.1.2/test.cl
@@ -0,0 +1 @@
+(write-line "OK")
\ No newline at end of file
diff --git a/packages/nim/1.4.4/build.sh b/packages/nim/1.4.4/build.sh
new file mode 100755
index 0000000..1bb0bee
--- /dev/null
+++ b/packages/nim/1.4.4/build.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+PREFIX=$(realpath $(dirname $0))
+
+mkdir -p build
+
+cd build
+
+# Prebuilt binary - source *can* be built, but it requires gcc
+curl -L "https://nim-lang.org/download/nim-1.4.4-linux_x64.tar.xz" -o nim.tar.xz
+tar xf nim.tar.xz --strip-components=1
+rm nim.tar.xz
+
+./install.sh "$PREFIX"
+
+cd ../
+
+rm -rf build
diff --git a/packages/nim/1.4.4/compile b/packages/nim/1.4.4/compile
new file mode 100644
index 0000000..91dc0ba
--- /dev/null
+++ b/packages/nim/1.4.4/compile
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+# Compile nim file(s)
+nim --hints:off --out:out --nimcache:./ c "$@"
+chmod +x out
diff --git a/packages/nim/1.4.4/environment b/packages/nim/1.4.4/environment
new file mode 100644
index 0000000..872a1f3
--- /dev/null
+++ b/packages/nim/1.4.4/environment
@@ -0,0 +1 @@
+export PATH=$PWD/nim/bin:$PATH
\ No newline at end of file
diff --git a/packages/nim/1.4.4/metadata.json b/packages/nim/1.4.4/metadata.json
new file mode 100644
index 0000000..6f88382
--- /dev/null
+++ b/packages/nim/1.4.4/metadata.json
@@ -0,0 +1,6 @@
+{
+    "language": "nim",
+    "version": "1.4.4",
+    "author": "Dan Vargas <danvargas46@gmail.com>",
+    "aliases": ["nim"]
+}
\ No newline at end of file
diff --git a/packages/nim/1.4.4/run b/packages/nim/1.4.4/run
new file mode 100644
index 0000000..6955ba9
--- /dev/null
+++ b/packages/nim/1.4.4/run
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+shift # Filename is only used to compile
+./out "$@"
diff --git a/packages/nim/1.4.4/test.nim b/packages/nim/1.4.4/test.nim
new file mode 100644
index 0000000..6c57628
--- /dev/null
+++ b/packages/nim/1.4.4/test.nim
@@ -0,0 +1 @@
+echo("OK")
\ No newline at end of file
diff --git a/packages/osabie/1.0.1/run b/packages/osabie/1.0.1/run
index 2f99ab0..fde91e3 100644
--- a/packages/osabie/1.0.1/run
+++ b/packages/osabie/1.0.1/run
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-# Put instructions to run the runtime
-osabie "$@"
\ No newline at end of file
+# osabie only takes filename and stdin
+osabie "$1"
\ No newline at end of file
diff --git a/packages/paradoc/0.6.0/build.sh b/packages/paradoc/0.6.0/build.sh
new file mode 100755
index 0000000..d3801b9
--- /dev/null
+++ b/packages/paradoc/0.6.0/build.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source ../../python/3.9.1/build.sh
+
+git clone -q https://github.com/betaveros/paradoc.git paradoc
diff --git a/packages/paradoc/0.6.0/environment b/packages/paradoc/0.6.0/environment
new file mode 100644
index 0000000..4ca7a04
--- /dev/null
+++ b/packages/paradoc/0.6.0/environment
@@ -0,0 +1,2 @@
+export PYTHONPATH=$PYTHONPATH:$PWD/paradoc
+export PATH=$PWD/bin:$PATH
\ No newline at end of file
diff --git a/packages/paradoc/0.6.0/metadata.json b/packages/paradoc/0.6.0/metadata.json
new file mode 100644
index 0000000..8037f2a
--- /dev/null
+++ b/packages/paradoc/0.6.0/metadata.json
@@ -0,0 +1,6 @@
+{
+    "language": "paradoc",
+    "version": "0.6.0",
+    "author": "Dan Vargas <danvargas46@gmail.com>",
+    "aliases": ["paradoc"]
+}
\ No newline at end of file
diff --git a/packages/paradoc/0.6.0/run b/packages/paradoc/0.6.0/run
new file mode 100644
index 0000000..718ee98
--- /dev/null
+++ b/packages/paradoc/0.6.0/run
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Paradoc only takes filename and stdin
+python3 -m paradoc "$1"
diff --git a/packages/paradoc/0.6.0/test.paradoc b/packages/paradoc/0.6.0/test.paradoc
new file mode 100644
index 0000000..45021e7
--- /dev/null
+++ b/packages/paradoc/0.6.0/test.paradoc
@@ -0,0 +1 @@
+"OK"
\ No newline at end of file
diff --git a/packages/rust/1.50.0/run b/packages/rust/1.50.0/run
index f66526f..d377dd9 100644
--- a/packages/rust/1.50.0/run
+++ b/packages/rust/1.50.0/run
@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 
+shift
 ./binary "$@"