diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1377554
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.swp
diff --git a/Dockerfile b/Dockerfile
index efe2bdd..198bade 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM nvidia/cuda:8.0-cudnn5-devel-ubuntu16.04
 MAINTAINER Bradlee Speice
 
-LABEL Description="Jupyter server setup for ECBM E4040 Neural Networks" Version="0.2"
+LABEL Description="Jupyter server setup for ECBM E4040 Neural Networks" Version="0.3"
 
 # Update our cache first
 RUN apt-get update && \
@@ -13,16 +13,28 @@ RUN apt-get update && \
     apt-get install -y  \
         python3 libpython3-dev \
         python-pandas python-matplotlib python-sklearn \
+        python3-pandas python3-matplotlib python3-sklearn \
         texlive-latex-extra texlive-fonts-recommended texlive-generic-recommended pandoc
 
    
 # And the python-specific tools
 RUN pip install theano jupyter
 
+# And the python3-specific tools
+RUN pip3 install theano jupyter
+
 # And the startup script
 COPY . /
 
 # Set up Theano for the GPU
 ENV THEANO_FLAGS='floatX=float32,device=gpu'
 
+# Set up an unprivileged user to run as
+RUN useradd jupyter -s /bin/false && \
+    mkdir /home/jupyter && \
+    chown jupyter:jupyter /home/jupyter && \
+    passwd jupyter -l
+
+ENTRYPOINT ["/sbin/runuser", "-u", "jupyter", "/usr/local/bin/start_jupyter"]
+
 EXPOSE 8888