diff --git a/j/Java/Java-1.8.0_144.eb b/j/Java/Java-1.8.0_144.eb
new file mode 100644
index 00000000..3aea9502
--- /dev/null
+++ b/j/Java/Java-1.8.0_144.eb
@@ -0,0 +1,15 @@
+name = 'Java'
+version = "1.8.0_144"
+
+homepage = 'http://java.com/'
+description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
+ Java applications on desktops and servers."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
+(vp, vs) = version.split('_')
+altver = '%su%s' % (vp.split('.')[1], vs)
+sources = ['jdk-%s-linux-x64.tar.gz' % altver]
+
+moduleclass = 'lang'
diff --git a/j/Java/Java-1.9.0+181.eb b/j/Java/Java-1.9.0+181.eb
new file mode 100644
index 00000000..75a17606
--- /dev/null
+++ b/j/Java/Java-1.9.0+181.eb
@@ -0,0 +1,13 @@
+name = 'Java'
+version = "1.9.0+181"
+
+homepage = 'http://java.com/'
+description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
+ Java applications on desktops and servers."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
+sources = ['jdk-9_linux-x64_bin.tar.gz']
+
+moduleclass = 'lang'
diff --git a/l/Lmod/Lmod-7.7.7.eb b/l/Lmod/Lmod-7.7.7.eb
new file mode 100644
index 00000000..a51a9bc2
--- /dev/null
+++ b/l/Lmod/Lmod-7.7.7.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = "Lmod"
+version = "7.7.7"
+
+homepage = "http://sourceforge.net/projects/lmod/"
+description = """Lmod is a Lua based module system. Modules allow for dynamic modification
+ of a user's environment under Unix systems. See www.tacc.utexas.edu/tacc-projects/lmod
+ for a complete description. Lmod is a new implementation that easily handles the MODULEPATH
+ Hierarchical problem. It is drop-in replacement for TCL/C modules and reads TCL modulefiles directly."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['%(version)s.tar.gz']
+source_urls = [
+    'https://github.com/TACC/Lmod/archive',
+    'http://sourceforge.net/projects/lmod/files/',
+    'http://sourceforge.net/projects/lmod/files/Testing'
+]
+
+dependencies = [("Lua", "5.1.4-8")]
+
+sanity_check_paths = {
+    'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"],
+    'dirs': []
+}
+
+moduleclass = "tools"
diff --git a/l/Lua/Lua-5.3.4.eb b/l/Lua/Lua-5.3.4.eb
new file mode 100644
index 00000000..0dc5c3f8
--- /dev/null
+++ b/l/Lua/Lua-5.3.4.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = "Lua"
+version = "5.3.4"
+
+homepage = "http://www.lua.org/"
+description = """Lua is a powerful, fast, lightweight, embeddable scripting language.
+ Lua combines simple procedural syntax with powerful data description constructs based
+ on associative arrays and extensible semantics. Lua is dynamically typed,
+ runs by interpreting bytecode for a register-based virtual machine,
+ and has automatic memory management with incremental garbage collection,
+ making it ideal for configuration, scripting, and rapid prototyping."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['lua-%s.tar.gz' % version.replace('-', '.')]
+source_urls = ['http://sourceforge.net/projects/lmod/files/']
+
+builddependencies = [
+    ('ncurses', '6.0'),
+    ('libreadline', '7.0')
+]
+
+skipsteps = ['configure']
+
+prebuildopts = 'sed -i "s|INSTALL_TOP= \/usr\/local|INSTALL_TOP= %(installdir)s|" Makefile && '
+
+buildopts = ' posix'
+
+sanity_check_paths = {
+    'files': ["bin/lua"],
+    'dirs': []
+}
+
+moduleclass = "lang"
diff --git a/s/Singularity/Singularity-2.3.2.eb b/s/Singularity/Singularity-2.3.2.eb
new file mode 100644
index 00000000..dc546f66
--- /dev/null
+++ b/s/Singularity/Singularity-2.3.2.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = 'Singularity'
+version = '2.3.2'
+
+homepage = 'http://gmkurtzer.github.io/singularity'
+description = """Singularity is a container platform focused on supporting \"Mobility of Compute\""""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['https://github.com/gmkurtzer/singularity/archive/']
+sources = ['%(version)s.tar.gz']
+
+builddependencies = [('Autotools', '20150215')]
+
+preconfigopts = './autogen.sh && '
+
+modextravars = {'SINGULARITY_OVERLAYFS_ENABLED': '1'}
+
+moduleclass = 'tools'