diff --git a/config.toml b/config.toml
index c7bfbabcda..84f4123ebe 100644
--- a/config.toml
+++ b/config.toml
@@ -17,4 +17,6 @@ phoneme_dictionary_file_development = "./dictionary/cmudict-0.7b"
 phoneme_dictionary_file_production = "./dictionary/cmudict-0.7b"
 extra_dictionary_file_development = "./dictionary/extra-dict"
 extra_dictionary_file_production = "./dictionary/extra-dict"
+square_dictionary_file_development = "./dictionary/square-dict"
+square_dictionary_file_production = "./dictionary/square-dict"
 
diff --git a/dictionary/IMPROVE.md b/dictionary/IMPROVE.md
index 47aa926f78..4263448b01 100644
--- a/dictionary/IMPROVE.md
+++ b/dictionary/IMPROVE.md
@@ -5,12 +5,14 @@ These words need improvement
 "really?"
 "to do"
 4chan
+^^^ how (THIS IS SO BAD)
 able
 access
 again
 america (non-shout)
 arab
 arabic
+aren't
 ask
 asswipe
 bear
@@ -19,6 +21,7 @@ beta
 bin
 bite
 bullshit
+buy
 can
 cat
 chinese
diff --git a/dictionary/extra-dict b/dictionary/extra-dict
index e04859fad4..0155de0524 100644
--- a/dictionary/extra-dict
+++ b/dictionary/extra-dict
@@ -41,12 +41,16 @@ MILKSHAKE  M IH1 L K SH EY1 K
 MILKSHAKES  M IH1 L K SH EY1 K S
 PIKACHU  P IY1 K AH0 CH UW1
 POKEMON  P OW1 K EY1 AH0 N
+PR  P IY1 AA1 R
+PR'S  P IY1 AA1 R Z
+PRS  P IY1 AA1 R Z
 PUPPER  P AH1 P ER0
 PUPPERS  P AH1 P ER0 Z
 REDDIT  R EH1 D IH0 T
 ROFL  R AA1 F AH0 L
 SHEEPLE  SH IY1 P AH0 L
 SQUIRTLE  S K W ER1 T AH0 L
+SSH  EH1 S EH1 S EY1 CH
 SUDO  S UW1 D UW1
 ZOMBO  Z AA1 M B OW0
 ZOMBOCOM  Z AA1 M B OW0 K AA2 M
diff --git a/dictionary/square-dict b/dictionary/square-dict
new file mode 100644
index 0000000000..99daf998f3
--- /dev/null
+++ b/dictionary/square-dict
@@ -0,0 +1,22 @@
+;;; ===============================
+;;; Work-Related Arpabet Extensions
+;;; Copyright 2016 Brandon Thomas <bt@brand.io, echelon@gmail.com>
+;;; ===============================
+;;;
+GEOCODING  JH IY1 OW0 K OW1 D IH0 NG
+GNS  JH IY1 EH1 N EH1 S
+KOCHIKU  K OW1 CH IY1 K UW1
+MAPBOX  M AE1 P B AA2 K S
+MPFE  EH1 M P IY1 EH1 F IY1
+MULTIPASS  M AH1 L T IY0 P AE2 S
+MULTIPASSFE  M AH1 L T IY0 P AE2 S EH1 F IY1
+P2  P IY1 T UW1
+SQROOT S K W EH1 R R UW1 T
+SQWEB S K W EH1 R W EH1 B
+TRACON  T R AE1 K AA1 N
+;
+; TODO --
+;
+; BITBUCKET
+; TINMINATOR
+; TYPESCRIPT
diff --git a/src/config.rs b/src/config.rs
index 38bde767dc..1ca1596050 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -24,6 +24,9 @@ pub struct Config {
 
   pub extra_dictionary_file_development: String,
   pub extra_dictionary_file_production: String,
+
+  pub square_dictionary_file_development: String,
+  pub square_dictionary_file_production: String,
 }
 
 impl Config {
diff --git a/src/main.rs b/src/main.rs
index cfd88fdacc..b5d4adced6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -124,7 +124,13 @@ fn create_synthesizer(config: &Config) -> Synthesizer {
   let extra_dictionary = ArpabetDictionary::load_from_file(
       &config.extra_dictionary_file_development).unwrap();
 
-  let dictionary = arpabet_dictionary.combine(&extra_dictionary);
+  info!("Reading Square Dictionary...");
+  let square_dictionary = ArpabetDictionary::load_from_file(
+      &config.square_dictionary_file_development).unwrap();
+
+  let dictionary = arpabet_dictionary
+      .combine(&extra_dictionary)
+      .combine(&square_dictionary);
 
   let audiobank = Audiobank::new(&config.get_sound_path());