diff --git a/Cargo.lock b/Cargo.lock
index 9911efe..855ef27 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -28,7 +28,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "daisycalc"
-version = "1.1.2"
+version = "1.1.3"
 dependencies = [
  "cfg-if",
  "num",
diff --git a/Cargo.toml b/Cargo.toml
index 04c8119..3dc7b41 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "daisycalc"
-version = "1.1.2"
+version = "1.1.3"
 edition = "2021"
 build = "buildscript/main.rs"
 license = "GPL-3.0-only"
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..60e598b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,18 @@
+release:
+	cargo build --release
+
+test:
+	cargo test
+
+run:
+	cargo run
+
+wasm:
+	wasm-pack build --release --target web --out-dir server/pkg
+
+publish:
+	cargo test
+	cargo publish
+
+docker:
+	docker build ./server -t git.betalupi.com/mark/daisy
diff --git a/README.md b/README.md
index 4f0943f..0c7f9c6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![](./site/misc/readme-banner.png)
+![](./server/site/resources/readme-banner.png)
 
 A high-precision scientific calculator with support for units, derivatives, and more.
 
diff --git a/TODO.md b/TODO.md
index 41380a6..0c7d92a 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,5 +1,4 @@
 ## Version Bump checklist
- - TODO: build and publish script
  - update Cargo.toml
  - run cargo test
  - commit
@@ -7,12 +6,9 @@
  - merge
  - git tag -a v1.0.0 -m "Version 1.0.0" on merge commit
  - cargo publish
- - Update packages
  - Build wasm & push changes
- - Squash merge
  - Update AUR package
 
-
 ## Pre-release
  - Tuple operations
  - we don't need vectors as arguments to operators
@@ -22,25 +18,18 @@
  - Should functions be operators?
  - Binary, hex, octal numbers
 
-
 ## General
  - Better tests (assignment, many expressions in one context)
  - Optional config file
  - Optional history file
- - evaluate straight from command line
  - Package for debian, nix
-
-
-## Internals
  - Non-recursive treeify
  - Faster factorial function. Maybe use gamma instead?
- - Arbitrary precision float (rug doesn't offer arbitrary exponents)
+ - Arbitrary precision floats
 
 ## Math Features
  - Mean, Median, Min
  - Arbitrary base logarithm
- - Derivatives
- - CAS features (trig, roots and powers)
  - Complex numbers
  - acot/acoth functions
  - Sums and products with functional arguments
@@ -50,8 +39,7 @@
  - Fix terminal color detection
  - Live syntax/output (like firefox js terminal)
  - Syntax highlighting
- - fish-style tab completion
- - Numbered expressions, history recall
+ - Numbered history recall
  - Enable/disable unit sets (defaults?)
  - Consistent unit ordering
 
diff --git a/server/.gitignore b/server/.gitignore
new file mode 100644
index 0000000..9f62a81
--- /dev/null
+++ b/server/.gitignore
@@ -0,0 +1,2 @@
+/site/node_modules
+/pkg
\ No newline at end of file
diff --git a/Dockerfile b/server/Dockerfile
similarity index 100%
rename from Dockerfile
rename to server/Dockerfile
diff --git a/default b/server/default
similarity index 100%
rename from default
rename to server/default
diff --git a/docker-compose.yml b/server/docker-compose.yml
similarity index 88%
rename from docker-compose.yml
rename to server/docker-compose.yml
index e52a66d..196f830 100644
--- a/docker-compose.yml
+++ b/server/docker-compose.yml
@@ -7,7 +7,7 @@ networks:
 
 services:
   daisy:
-    build: ./.
+    build: .
     container_name: daisy
     restart: unless-stopped
 
diff --git a/site/index.html b/server/site/index.html
similarity index 94%
rename from site/index.html
rename to server/site/index.html
index 78e2766..9053391 100644
--- a/site/index.html
+++ b/server/site/index.html
@@ -100,6 +100,11 @@
 			<a href="https://aur.archlinux.org/packages/daisy" target="_blank" rel="noopener noreferrer">AUR</a>
 		</div>
 
+		<script>
+			var mobile = (/iphone|ipad|ipod|android|blackberry|mini|windows\sce|palm/i.test(navigator.userAgent.toLowerCase()));
+			if (mobile) { alert("This site may not work on mobile."); }
+		</script>
+
 		<script type="module">
 			// See wasm-pack docs
 			// Build with `wasm-pack build --release --target web --out-dir pkg`
diff --git a/server/site/package-lock.json b/server/site/package-lock.json
new file mode 100644
index 0000000..3573a37
--- /dev/null
+++ b/server/site/package-lock.json
@@ -0,0 +1,17 @@
+{
+  "name": "site",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "xterm": "^5.3.0"
+      }
+    },
+    "node_modules/xterm": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/xterm/-/xterm-5.3.0.tgz",
+      "integrity": "sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg=="
+    }
+  }
+}
diff --git a/site/package.json b/server/site/package.json
similarity index 100%
rename from site/package.json
rename to server/site/package.json
diff --git a/site/resources/Fantasque.ttf b/server/site/resources/Fantasque.ttf
similarity index 100%
rename from site/resources/Fantasque.ttf
rename to server/site/resources/Fantasque.ttf
diff --git a/site/resources/banner.svg b/server/site/resources/banner.svg
similarity index 100%
rename from site/resources/banner.svg
rename to server/site/resources/banner.svg
diff --git a/site/resources/daisy-dark.svg b/server/site/resources/daisy-dark.svg
similarity index 100%
rename from site/resources/daisy-dark.svg
rename to server/site/resources/daisy-dark.svg
diff --git a/site/resources/daisy-icon-dark.svg b/server/site/resources/daisy-icon-dark.svg
similarity index 100%
rename from site/resources/daisy-icon-dark.svg
rename to server/site/resources/daisy-icon-dark.svg
diff --git a/site/resources/daisy-icon-light.svg b/server/site/resources/daisy-icon-light.svg
similarity index 100%
rename from site/resources/daisy-icon-light.svg
rename to server/site/resources/daisy-icon-light.svg
diff --git a/site/resources/daisy-light.svg b/server/site/resources/daisy-light.svg
similarity index 100%
rename from site/resources/daisy-light.svg
rename to server/site/resources/daisy-light.svg
diff --git a/site/resources/readme-banner.png b/server/site/resources/readme-banner.png
similarity index 100%
rename from site/resources/readme-banner.png
rename to server/site/resources/readme-banner.png
diff --git a/shell.nix b/shell.nix
index dff6d69..98d2bc8 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,11 +1,22 @@
+{ nixpkgs ? import <nixpkgs> { }}:
 let
- pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/f155f0cf4ea43c4e3c8918d2d327d44777b6cad4.tar.gz") {};
+  # If you set hash to an empty string, you'll get
+  # an error with the correct hash.
+  pinnedPkgs = nixpkgs.fetchFromGitHub {
+    owner  = "NixOS";
+    repo   = "nixpkgs";
+    rev    = "4ecab3273592f27479a583fb6d975d4aba3486fe";
+    sha256 = "btHN1czJ6rzteeCuE/PNrdssqYD2nIA4w48miQAFloM=";
+  };
+  pkgs = import pinnedPkgs {};
+
 in pkgs.mkShell {
   buildInputs = with pkgs; [
     cargo
     rustc
     rustfmt
-    m4
+    rust-analyzer
+    wasm-pack
    ];
 }
 
diff --git a/site/.gitignore b/site/.gitignore
deleted file mode 100644
index 6bd0e57..0000000
--- a/site/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/node_modules
-/package-lock.json
-/pkg
\ No newline at end of file
diff --git a/src/lib.rs b/src/lib.rs
index ceed6cc..e8d4f7d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -68,15 +68,12 @@ cfg_if::cfg_if! {
 						return format!("\r\n{}", daisy_prompt(state));
 					}
 
-					if in_str.trim() == "quit" {
-						return "[quit]".to_string();
-					} else {
-						let r = crate::do_string( unsafe { &mut (*state).context }, &in_str);
 
-						match r {
-							Ok(t) | Err(t) => {
-								out += t;
-							}
+					let r = crate::do_string( unsafe { &mut (*state).context }, &in_str);
+
+					match r {
+						Ok(t) | Err(t) => {
+							out += t;
 						}
 					}
 				},
@@ -91,7 +88,20 @@ cfg_if::cfg_if! {
 				//'\x04' | '\x03'
 				//=> { break 'outer; },
 
-				_ => { unsafe { (*state).promptbuffer.add_char(s.chars().next().unwrap()); } },
+				// Only process sane characters
+
+				_ => {
+					let c = s.chars().next().unwrap();
+					match c {
+						'a'..='z' | 'A'..='Z' | '0'..='9'
+						|'!'|'@'|'#'|'$'|'%'|'^'|'&'|'*'|'('|')'
+						|'?'|'~'|','|'.'|'['|']'|' '
+						|'<'|'>'|'/'|'_'|'-'|':'|'|'|'='|'+'|';'
+						=> { unsafe { (*state).promptbuffer.add_char(c); } },
+
+						_ => {}
+					}
+				},
 			};
 			
 			let t = unsafe { (*state).promptbuffer.write_prompt(&mut (*state).context) };
diff --git a/src/main.rs b/src/main.rs
index 94903de..5eb4fbd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -120,7 +120,7 @@ pub fn main() -> Result<(), std::io::Error> {
 					// Only process sane characters
 					'a'..='z' | 'A'..='Z' | '0'..='9'
 					|'!'|'@'|'#'|'$'|'%'|'^'|'&'|'*'|'('|')'
-					|'?'|'~'|','|'.'|'['|']'
+					|'?'|'~'|','|'.'|'['|']'|' '
 					|'<'|'>'|'/'|'_'|'-'|':'|'|'|'='|'+'|';'
 					=> { pb.add_char(*q); },