diff --git a/Dockerfile b/Dockerfile
index 305164c..ff0b9e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,15 +3,47 @@ FROM ubuntu:18.04
 ENV DEBIAN_FRONTEND noninteractive
 
 ADD ./setup-mirror /tmp/setup-mirror
-RUN bash /tmp/setup-mirror
+RUN bash /tmp/setup-mirror && rm /tmp/setup-mirror
 
 RUN apt update && apt upgrade -y
 
+# deliberate decision to use distro docker and not latest
+
 RUN apt install -y \
-    vim \
-    command-not-found \
+    apt-file \
+    bash-completion \
     build-essential \
-    python3 \
-    python3-pip \
+    byobu \
+    command-not-found \
+    docker.io \
+    git \
+    golang-go \
+    ntp \
+    ntpdate \
+    openssh-server \
+    python-pip \
     python3-dev \
-    ruby
+    python3-pip \
+    ruby \
+    software-properties-common \
+    vim
+
+RUN apt-file update
+
+
+RUN apt install -y powerline
+RUN apt install -y htop
+RUN apt install -y cryptsetup-bin
+
+########################################################
+#####  python3 stuff
+########################################################
+RUN pip3 install awscli
+RUN pip3 install httpie
+RUN pip3 install pipenv
+
+########################################################
+#####  nvm
+########################################################
+RUN git clone https://github.com/creationix/nvm.git /usr/local/nvm
+ADD ./nvmsetup.sh /etc/profile.d/nvmsetup.sh
diff --git a/Makefile b/Makefile
index 501638f..0b653c6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,16 @@
 REMOTEHOST := root@las2.bounce
+IMAGENAME := sneak/dockerized-workstation
 
 default: remote-build
 
 build:
-	docker build -t sneak/dockerized-workstation .
+	docker build -t $(IMAGENAME) .
 
 upload:
 	rsync -avP --delete ./ $(REMOTEHOST):dockerized-workstation/
 
 remote-build: upload
 	ssh -t $(REMOTEHOST) "cd dockerized-workstation && make build"
+
+tryout:
+	ssh -t $(REMOTEHOST) "docker run -ti $(IMAGENAME)"
diff --git a/nvmsetup.sh b/nvmsetup.sh
new file mode 100644
index 0000000..56134d9
--- /dev/null
+++ b/nvmsetup.sh
@@ -0,0 +1,2 @@
+export NVM_DIR="/usr/local/nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" --no-use # This loads nvm