diff --git a/containers/docker/Dockerfile b/containers/docker/Dockerfile
index cd921b412d7f5bf796f14fa952a54fa5990249b5..436d0e1266c431456c5ee2b61810c1495a54c0c8 100644
--- a/containers/docker/Dockerfile
+++ b/containers/docker/Dockerfile
@@ -57,19 +57,19 @@ ADD doc /root/np-tmcode/doc
 ADD build /root/np-tmcode/build
 ADD test_data /root/np-tmcode/test_data
 #RUN cd np-tmcode/src && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_MAGMA=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make wipe && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_MAGMA=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make -j && mv ../build/cluster/np_cluster ../build/cluster/np_cluster_magma_mpi
-RUN cd np-tmcode/build && CXX=mpicxx FC=gfortran ./configure --enable-openmp --with-lapack --with-magma --enable-refinement --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_magma_mpi && mv sphere/np_sphere sphere/np_sphere_magma_mpi && mv inclusion/np_inclusion inclusion/np_inclusion_magma_mpi && mv trapping/np_trapping trapping/np_trapping_magma_mpi
+RUN cd np-tmcode/build && CXX=mpicxx FC=gfortran ./configure --enable-openmp --with-lapack --with-magma --enable-refinement --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_magma_mpi && mv inclusion/np_inclusion inclusion/np_inclusion_magma_mpi 
 #RUN cd np-tmcode/src && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_MAGMA=1 USE_OPENMP=1 CXX=g++ FC=gfortran make wipe && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_MAGMA=1 USE_OPENMP=1 CXX=g++ FC=gfortran make -j && mv ../build/cluster/np_cluster ../build/cluster/np_cluster_magma_serial
-RUN cd np-tmcode/build && CXX=g++ FC=gfortran ./configure --enable-openmp --with-lapack --with-magma --enable-refinement --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_magma_serial && mv sphere/np_sphere sphere/np_sphere_magma_serial && mv inclusion/np_inclusion inclusion/np_inclusion_magma_serial && mv trapping/np_trapping trapping/np_trapping_magma_serial
-RUN cd np-tmcode/build && CXX=mpicxx FC=gfortran ./configure --enable-openmp --with-lapack --without-magma --enable-refinement --with-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_cublas_mpi && mv sphere/np_sphere sphere/np_sphere_cublas_mpi && mv inclusion/np_inclusion inclusion/np_inclusion_cublas_mpi && mv trapping/np_trapping trapping/np_trapping_cublas_mpi
-RUN cd np-tmcode/build && CXX=g++ FC=gfortran ./configure --enable-openmp --with-lapack --without-magma --enable-refinement --with-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_cublas_serial && mv sphere/np_sphere sphere/np_sphere_cublas_serial && mv inclusion/np_inclusion inclusion/np_inclusion_cublas_serial && mv trapping/np_trapping trapping/np_trapping_cublas_serial
+RUN cd np-tmcode/build && CXX=g++ FC=gfortran ./configure --enable-openmp --with-lapack --with-magma --enable-refinement --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_magma_serial && mv inclusion/np_inclusion inclusion/np_inclusion_magma_serial 
+RUN cd np-tmcode/build && CXX=mpicxx FC=gfortran ./configure --enable-openmp --with-lapack --without-magma --enable-refinement --with-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_cublas_mpi && mv inclusion/np_inclusion inclusion/np_inclusion_cublas_mpi 
+RUN cd np-tmcode/build && CXX=g++ FC=gfortran ./configure --enable-openmp --with-lapack --without-magma --enable-refinement --with-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_cublas_serial && mv inclusion/np_inclusion inclusion/np_inclusion_cublas_serial 
 #RUN cd np-tmcode/src && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make wipe && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make -j && mv ../build/cluster/np_cluster ../build/cluster/np_cluster_lapack_mpi && cd ../build/cluster && ln -s np_cluster_lapack_mpi np_cluster
-RUN cd np-tmcode/build && CXX=mpicxx FC=gfortran ./configure --enable-openmp --with-lapack --without-magma --enable-refinement --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_lapack_mpi && mv sphere/np_sphere sphere/np_sphere_lapack_mpi && mv inclusion/np_inclusion inclusion/np_inclusion_lapack_mpi && mv trapping/np_trapping trapping/np_trapping_lapack_mpi && cd cluster && ln -s np_cluster_lapack_mpi np_cluster && cd ../sphere && ln -s np_sphere_lapack_mpi np_sphere && cd ../inclusion && ln -s np_inclusion_lapack_mpi np_inclusion && cd ../trapping && ln -s np_trapping_lapack_mpi np_trapping   
+RUN cd np-tmcode/build && CXX=mpicxx FC=gfortran ./configure --enable-openmp --with-lapack --without-magma --enable-refinement --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_lapack_mpi && mv inclusion/np_inclusion inclusion/np_inclusion_lapack_mpi && mv trapping/np_trapping trapping/np_trapping_lapack_mpi && cd cluster && ln -s np_cluster_lapack_mpi np_cluster && cd ../inclusion && ln -s np_inclusion_lapack_mpi np_inclusion 
 #RUN cd np-tmcode/src && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_OPENMP=1 CXX=g++ FC=gfortran make wipe && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_OPENMP=1 CXX=g++ FC=gfortran make -j && mv ../build/cluster/np_cluster ../build/cluster/np_cluster_lapack_serial
-RUN cd np-tmcode/build && CXX=g++ FC=gfortran ./configure --enable-openmp --with-lapack --without-magma --enable-refinement --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_lapack_serial && mv sphere/np_sphere sphere/np_sphere_lapack_serial && mv inclusion/np_inclusion inclusion/np_inclusion_lapack_serial && mv trapping/np_trapping trapping/np_trapping_lapack_serial
+RUN cd np-tmcode/build && CXX=g++ FC=gfortran ./configure --enable-openmp --with-lapack --without-magma --enable-refinement --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_lapack_serial && mv inclusion/np_inclusion inclusion/np_inclusion_lapack_serial 
 #RUN cd np-tmcode/src && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make wipe && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make -j && mv ../build/cluster/np_cluster ../build/cluster/np_cluster_legacy_mpi
-RUN cd np-tmcode/build && CXX=mpicxx FC=gfortran ./configure --enable-openmp --without-lapack --without-magma --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_legacy_mpi && mv sphere/np_sphere sphere/np_sphere_legacy_mpi && mv inclusion/np_inclusion inclusion/np_inclusion_legacy_mpi && mv trapping/np_trapping trapping/np_trapping_legacy_mpi
+RUN cd np-tmcode/build && CXX=mpicxx FC=gfortran ./configure --enable-openmp --without-lapack --without-magma --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_legacy_mpi && mv sphere/np_sphere sphere/np_sphere_legacy_mpi && mv inclusion/np_inclusion inclusion/np_inclusion_legacy_mpi && cd sphere && ln -s np_sphere_legacy_mpi np_sphere
 #RUN cd np-tmcode/src && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_OPENMP=1 CXX=g++ FC=gfortran make wipe && BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_OPENMP=1 CXX=g++ FC=gfortran make -j && mv ../build/cluster/np_cluster ../build/cluster/np_cluster_legacy_serial
-RUN cd np-tmcode/build && CXX=g++ FC=gfortran ./configure --disable-openmp --without-lapack --without-magma --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_legacy_serial && mv sphere/np_sphere sphere/np_sphere_legacy_serial && mv inclusion/np_inclusion inclusion/np_inclusion_legacy_serial && mv trapping/np_trapping trapping/np_trapping_legacy_serial
+RUN cd np-tmcode/build && CXX=g++ FC=gfortran ./configure --disable-openmp --without-lapack --without-magma --without-cublas && make clean && make -j && mv cluster/np_cluster cluster/np_cluster_legacy_serial && mv sphere/np_sphere sphere/np_sphere_legacy_serial && mv inclusion/np_inclusion inclusion/np_inclusion_legacy_serial 
 RUN cd np-tmcode/doc/src && doxygen config.dox && cd ../build/latex && make -j
 
 
diff --git a/containers/singularity/np-tmcode-run.def b/containers/singularity/np-tmcode-run.def
index a9f336788acc5126a7b0a68d1ecfd1961e9e970e..52947a7678f6a9fb60c9beaaf867c277aa3847b3 100644
--- a/containers/singularity/np-tmcode-run.def
+++ b/containers/singularity/np-tmcode-run.def
@@ -34,8 +34,8 @@ Stage: np-tmcode-run-dev
 	make -j
 	mv cluster/np_cluster cluster/np_cluster_magma_mpi
 	mv inclusion/np_inclusion inclusion/np_inclusion_magma_mpi
-	mv sphere/np_sphere sphere/np_sphere_magma_mpi
-	mv trapping/np_trapping trapping/np_trapping_magma_mpi
+	#mv sphere/np_sphere sphere/np_sphere_magma_mpi
+	#mv trapping/np_trapping trapping/np_trapping_magma_mpi
 	# with magma, ilp64, no mpi, openmp
 	#BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_MAGMA=1 USE_OPENMP=1 CXX=g++ FC=gfortran make wipe
 	CXX=g++ FC=gfortran ./configure --disable-shared --enable-ilp64 --enable-openmp --with-lapack --with-magma --enable-refinement --without-cublas
@@ -43,8 +43,8 @@ Stage: np-tmcode-run-dev
 	make -j
 	mv cluster/np_cluster cluster/np_cluster_magma_serial
 	mv inclusion/np_inclusion inclusion/np_inclusion_magma_serial
-	mv sphere/np_sphere sphere/np_sphere_magma_serial
-	mv trapping/np_trapping trapping/np_trapping_magma_serial
+	#mv sphere/np_sphere sphere/np_sphere_magma_serial
+	#mv trapping/np_trapping trapping/np_trapping_magma_serial
 	# with cublas, ilp64, mpi, openmp
 	#BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_MAGMA=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make wipe
 	CXX=mpicxx FC=gfortran ./configure  --disable-shared --enable-refinement --enable-openmp --with-lapack --without-magma --with-cublas
@@ -52,8 +52,8 @@ Stage: np-tmcode-run-dev
 	make -j
 	mv cluster/np_cluster cluster/np_cluster_cublas_mpi
 	mv inclusion/np_inclusion inclusion/np_inclusion_cublas_mpi
-	mv sphere/np_sphere sphere/np_sphere_cublas_mpi
-	mv trapping/np_trapping trapping/np_trapping_cublas_mpi
+	#mv sphere/np_sphere sphere/np_sphere_cublas_mpi
+	#mv trapping/np_trapping trapping/np_trapping_cublas_mpi
 	# with cublas, ilp64, no mpi, openmp
 	#BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_MAGMA=1 USE_OPENMP=1 CXX=g++ FC=gfortran make wipe
 	CXX=g++ FC=gfortran ./configure --disable-shared --enable-ilp64 --enable-openmp --with-lapack --without-magma --enable-refinement --with-cublas
@@ -61,8 +61,8 @@ Stage: np-tmcode-run-dev
 	make -j
 	mv cluster/np_cluster cluster/np_cluster_cublas_serial
 	mv inclusion/np_inclusion inclusion/np_inclusion_cublas_serial
-	mv sphere/np_sphere sphere/np_sphere_cublas_serial
-	mv trapping/np_trapping trapping/np_trapping_cublas_serial
+	#mv sphere/np_sphere sphere/np_sphere_cublas_serial
+	#mv trapping/np_trapping trapping/np_trapping_cublas_serial
 	# with lapack, ilp64, mpi, openmp
 	#BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make wipe
 	CXX=mpicxx FC=gfortran ./configure --disable-shared --enable-ilp64 --enable-openmp --with-lapack --without-magma --enable-refinement --without-cublas
@@ -70,8 +70,8 @@ Stage: np-tmcode-run-dev
 	make -j
 	mv cluster/np_cluster cluster/np_cluster_lapack_mpi
 	mv inclusion/np_inclusion inclusion/np_inclusion_lapack_mpi
-	mv sphere/np_sphere sphere/np_sphere_lapack_mpi
-	mv trapping/np_trapping trapping/np_trapping_lapack_mpi
+	#mv sphere/np_sphere sphere/np_sphere_lapack_mpi
+	#mv trapping/np_trapping trapping/np_trapping_lapack_mpi
 	# with lapack, ilp64, no mpi, openmp
 	#BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_LAPACK=1 USE_OPENMP=1 CXX=g++ FC=gfortran make wipe
 	CXX=g++ FC=gfortran ./configure --enable-ilp64 --enable-openmp --with-lapack --without-magma --disable-shared --enable-refinement --without-cublas
@@ -79,8 +79,8 @@ Stage: np-tmcode-run-dev
 	make -j
 	mv cluster/np_cluster cluster/np_cluster_lapack_serial
 	mv inclusion/np_inclusion inclusion/np_inclusion_lapack_serial
-	mv sphere/np_sphere sphere/np_sphere_lapack_serial
-	mv trapping/np_trapping trapping/np_trapping_lapack_serial
+	#mv sphere/np_sphere sphere/np_sphere_lapack_serial
+	#mv trapping/np_trapping trapping/np_trapping_lapack_serial
 	# with lucin, ilp64, mpi, openmp
 	#BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_OPENMP=1 USE_MPI=1 CXX=mpicxx FC=gfortran make wipe
 	CXX=mpicxx FC=gfortran ./configure --enable-ilp64 --enable-openmp --without-lapack --without-magma --disable-shared --without-cublas
@@ -89,7 +89,7 @@ Stage: np-tmcode-run-dev
 	mv cluster/np_cluster cluster/np_cluster_legacy_mpi
 	mv inclusion/np_inclusion inclusion/np_inclusion_legacy_mpi
 	mv sphere/np_sphere sphere/np_sphere_legacy_mpi
-	mv trapping/np_trapping trapping/np_trapping_legacy_mpi
+	#mv trapping/np_trapping trapping/np_trapping_legacy_mpi
 	# with lucin, ilp64, no mpi, openmp
 	#BUILDDIR=../../build BUILDDIR_NPTM=../../build/libnptm LIBNPTM=../../build/libnptm/libnptm.a USE_ILP64=1 USE_OPENMP=1 CXX=g++ FC=gfortran make wipe
 	CXX=g++ FC=gfortran ./configure --enable-ilp64 --enable-openmp --without-lapack --without-magma --disable-shared --without-cublas
@@ -98,7 +98,7 @@ Stage: np-tmcode-run-dev
 	mv cluster/np_cluster cluster/np_cluster_legacy_serial
 	mv inclusion/np_inclusion inclusion/np_inclusion_legacy_serial
 	mv sphere/np_sphere sphere/np_sphere_legacy_serial
-	mv trapping/np_trapping trapping/np_trapping_legacy_serial
+	#mv trapping/np_trapping trapping/np_trapping_legacy_serial
 	#cd ../doc/src
 	#doxygen config.dox
 	#cd ../build/latex
@@ -109,9 +109,9 @@ Stage: np-tmcode-run-dev
 	cd ../inclusion
 	ln -s np_inclusion_lapack_mpi np_inclusion
 	cd ../sphere
-	ln -s np_sphere_lapack_mpi np_sphere
-	cd ../trapping
-	ln -s np_trapping_lapack_mpi np_trapping
+	ln -s np_sphere_legacy_mpi np_sphere
+	# cd ../trapping
+	# ln -s np_trapping_lapack_mpi np_trapping
 
 
 Bootstrap: docker
diff --git a/containers/singularity/scripts/clu b/containers/singularity/scripts/clu
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/clu
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/edfb_clu b/containers/singularity/scripts/edfb_clu
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/edfb_clu
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/edfb_inclu b/containers/singularity/scripts/edfb_inclu
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/edfb_inclu
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/edfb_sph b/containers/singularity/scripts/edfb_sph
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/edfb_sph
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/frfme b/containers/singularity/scripts/frfme
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/frfme
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/inclu b/containers/singularity/scripts/inclu
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/inclu
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/lffft b/containers/singularity/scripts/lffft
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/lffft
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/model_maker.py b/containers/singularity/scripts/model_maker.py
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/model_maker.py
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_cluster b/containers/singularity/scripts/np_cluster
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_cluster
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_cluster_cublas_mpi b/containers/singularity/scripts/np_cluster_cublas_mpi
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_cluster_cublas_mpi
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_cluster_cublas_serial b/containers/singularity/scripts/np_cluster_cublas_serial
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_cluster_cublas_serial
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_cluster_lapack_mpi b/containers/singularity/scripts/np_cluster_lapack_mpi
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_cluster_lapack_mpi
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_cluster_lapack_serial b/containers/singularity/scripts/np_cluster_lapack_serial
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_cluster_lapack_serial
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_cluster_legacy_mpi b/containers/singularity/scripts/np_cluster_legacy_mpi
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_cluster_legacy_mpi
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_cluster_legacy_serial b/containers/singularity/scripts/np_cluster_legacy_serial
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_cluster_legacy_serial
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_cluster_magma_mpi b/containers/singularity/scripts/np_cluster_magma_mpi
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_cluster_magma_mpi
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_cluster_magma_serial b/containers/singularity/scripts/np_cluster_magma_serial
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_cluster_magma_serial
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_inclusion b/containers/singularity/scripts/np_inclusion
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_inclusion
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_inclusion_cublas_mpi b/containers/singularity/scripts/np_inclusion_cublas_mpi
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_inclusion_cublas_mpi
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_inclusion_cublas_serial b/containers/singularity/scripts/np_inclusion_cublas_serial
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_inclusion_cublas_serial
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_inclusion_lapack_mpi b/containers/singularity/scripts/np_inclusion_lapack_mpi
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_inclusion_lapack_mpi
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_inclusion_lapack_serial b/containers/singularity/scripts/np_inclusion_lapack_serial
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_inclusion_lapack_serial
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_inclusion_legacy_mpi b/containers/singularity/scripts/np_inclusion_legacy_mpi
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_inclusion_legacy_mpi
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_inclusion_legacy_serial b/containers/singularity/scripts/np_inclusion_legacy_serial
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_inclusion_legacy_serial
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_inclusion_magma_mpi b/containers/singularity/scripts/np_inclusion_magma_mpi
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_inclusion_magma_mpi
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_inclusion_magma_serial b/containers/singularity/scripts/np_inclusion_magma_serial
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_inclusion_magma_serial
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_sphere b/containers/singularity/scripts/np_sphere
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_sphere
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_sphere_legacy_mpi b/containers/singularity/scripts/np_sphere_legacy_mpi
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_sphere_legacy_mpi
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_sphere_legacy_serial b/containers/singularity/scripts/np_sphere_legacy_serial
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_sphere_legacy_serial
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/np_trapping b/containers/singularity/scripts/np_trapping
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/np_trapping
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/pycompare.py b/containers/singularity/scripts/pycompare.py
new file mode 120000
index 0000000000000000000000000000000000000000..881714892c3c4e25f0ed33c2b9feab04f7aa5ea6
--- /dev/null
+++ b/containers/singularity/scripts/pycompare.py
@@ -0,0 +1 @@
+np_cluster
\ No newline at end of file
diff --git a/containers/singularity/scripts/pydynrange.py b/containers/singularity/scripts/pydynrange.py
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/pydynrange.py
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/pytiming.py b/containers/singularity/scripts/pytiming.py
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/pytiming.py
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/singwrapper b/containers/singularity/scripts/singwrapper
new file mode 100755
index 0000000000000000000000000000000000000000..9f8556706e9cf1c28f8e00126d084410837faa7c
--- /dev/null
+++ b/containers/singularity/scripts/singwrapper
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# This script runs np_tmcode and connected programs in a singularity container,
+# to overcome idiotic library version compatibility issues
+
+#set -x
+
+APPLICATION=`basename $0`
+SCRIPTDIR=`dirname $0`
+INSTDIR="${SCRIPTDIR}/.."
+SIFFILE="${SIFFILE:-${INSTDIR}/np-tmcode-run.sif}"
+
+exec singularity run $SIFFILE $APPLICATION $@
+
diff --git a/containers/singularity/scripts/sph b/containers/singularity/scripts/sph
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/sph
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/test_ParticleDescriptor b/containers/singularity/scripts/test_ParticleDescriptor
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/test_ParticleDescriptor
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/test_TEDF b/containers/singularity/scripts/test_TEDF
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/test_TEDF
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/test_TTMS b/containers/singularity/scripts/test_TTMS
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/test_TTMS
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/test_cluster_outputs b/containers/singularity/scripts/test_cluster_outputs
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/test_cluster_outputs
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/test_inclusion_outputs b/containers/singularity/scripts/test_inclusion_outputs
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/test_inclusion_outputs
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file
diff --git a/containers/singularity/scripts/test_sphere_outputs b/containers/singularity/scripts/test_sphere_outputs
new file mode 120000
index 0000000000000000000000000000000000000000..38e204a2377e42c3f91e87ae8d81c4111847de30
--- /dev/null
+++ b/containers/singularity/scripts/test_sphere_outputs
@@ -0,0 +1 @@
+singwrapper
\ No newline at end of file