diff --git a/install b/install
index a6430cc..4165d91 100644
--- a/install
+++ b/install
@@ -1,47 +1,29 @@
 #!/bin/bash
 
-source "$HOME/.dotfiles/script_helpers/all.sh"
-
-set -e
+source "script_helpers/printing.sh"
+source "script_helpers/core.sh"
+source "script_helpers/platform.sh"
+source "script_helpers/file_ops.sh"
 
 cwd=$PWD
 platform=`uname`
-
-echo platform: $platform
-
+confirm_link=0
 os_is_windows is_windows
+
 if [[ $is_windows -eq 1 ]]; then
-  error "This is only supported on Linux or MacOS.\n"
-  exit 1
+    # Check for admin permissions.
+    net session &>/dev/null
+    admin_error=$?
+    if [[ ! $admin_error -eq 0 ]]; then
+        fatal "You need to run this in an admin shell!"
+    fi
 fi
 
-setup_dotfile_repo() {
-  if [ ! -d "$HOME/.dotfiles" ]; then
-    printf "${YELLOW}Creating dotfiles symlink${NORMAL}\n"
-    ln -s $cwd $HOME/.dotfiles
-  fi
+set -e
 
-  # Used by various things (e.g. vim history)
-  mkdir -p $HOME/tmp
-}
-
-link() {
-  file=$1
-  link_file "$HOME/.dotfiles/$file" "$HOME/.$file" 0
-}
-
-setup_git() {
-  printf "Setting up git...\n"
-
-  FILES=()
-  FILES+=('gitconfig')
-  FILES+=('githelpers')
-
-  for file in "${FILES[@]}"
-  do
-    link "$file"
-  done
-}
+####################################################################################################
+# Helpers
+####################################################################################################
 
 setup_zsh() {
   printf "Setting up zsh...\n"
@@ -68,52 +50,59 @@ setup_zsh() {
 
   for file in "${FILES[@]}"
   do
-    link "$file"
+    setup_file "$file"
   done
 }
 
-setup_vim() {
-  printf "Setting up vim...\n"
+####################################################################################################
+# Setup
+####################################################################################################
 
-  FILES=()
-  FILES+=('vim')
-  FILES+=('vimrc')
+pushd "$HOME" &>/dev/null
 
-  for file in "${FILES[@]}"
-  do
-    link "$file"
-  done
-}
+#########################
+# Setup root dirs
+#########################
+setup_dir $cwd .dotfiles
+setup_dir .dotfiles/vim .vim
 
-setup_misc() {
-  printf "Setting up misc...\n"
+#########################
+# Setup root files
+#########################
+FILES=()
+FILES+=('aliases')
+FILES+=('functions')
+FILES+=('gitconfig')
+FILES+=('githelpers')
+FILES+=('vimrc')
+FILES+=('curlrc')
 
-  FILES=()
-  FILES+=('curlrc')
+for file in "${FILES[@]}"
+do
+    setup_file .dotfiles/$file .$file
+done
 
-  for file in "${FILES[@]}"
-  do
-    link "$file"
-  done
-}
+#########################
+# Setup non-root files
+#########################
+if [[ $is_windows -eq 1 ]]; then
+    setup_file .dotfiles/bash/bashrc .bashrc
+    setup_file .dotfiles/bash/bash_profile .bash_profile
+    setup_file .dotfiles/bash/inputrc .inputrc
+    setup_file .dotfiles/windows/gitconfig.platform .gitconfig.platform
+fi
 
-# ////////////////////////////////////////////////////////////////////////////////////////
-# OSX
+curl https://raw.githubusercontent.com/git/git/master/contrib/completion/git-completion.bash -o .git-completion.bash
 
-setup_osx() {
-  ./osx/install.sh
-}
-
-# ////////////////////////////////////////////////////////////////////////////////////////
-# Run
-
-setup_dotfile_repo
-setup_git
-setup_zsh
-setup_vim
-setup_misc
+if [[ $is_windows -eq 0 ]]; then
+    setup_zsh
+fi
 
 if [[ $platform == 'Darwin' ]]; then
-  printf "\n${BOLD}Running the OS X installer${NORMAL}\n"
-  setup_osx
+    printf "\n${BOLD}Running the OS X installer${NORMAL}\n"
+    ./osx/install.sh
 fi
+
+popd "$HOME" &>/dev/null
+
+printf "${BOLD}${GREEN}Done!${NORMAL}\n"
diff --git a/script_helpers/file_ops.sh b/script_helpers/file_ops.sh
index dbef154..28abcfb 100644
--- a/script_helpers/file_ops.sh
+++ b/script_helpers/file_ops.sh
@@ -213,3 +213,23 @@ link_file() {
     eval $link_cmd
 }
 
+function setup_file() {
+    src=$1
+    dest=$2
+    if [ ! -f $dest ]; then
+        link_file $src $dest $confirm_link
+    else
+        printf "${BOLD}*${NORMAL} ${YELLOW}'$dest'${NORMAL} already linked to ${YELLOW}'$src'${NORMAL}\n"
+    fi
+}
+
+function setup_dir() {
+    src=$1
+    dest=$2
+    if [ ! -d $dest ]; then
+        link_file $src $dest $confirm_link
+    else
+        printf "${BOLD}*${NORMAL} ${YELLOW}'$dest'${NORMAL} already linked to ${YELLOW}'$src'${NORMAL}\n"
+    fi
+}
+
diff --git a/script_helpers/printing.sh b/script_helpers/printing.sh
index 5afb88a..9c33710 100644
--- a/script_helpers/printing.sh
+++ b/script_helpers/printing.sh
@@ -23,6 +23,12 @@ error() {
   printf "${BOLD}${RED}$1${NORMAL}"
 }
 
+fatal() {
+    msg=$1
+    printf "${RED}${msg}${NORMAL}\n"
+    exit 1
+}
+
 log() {
   msg="$1"
   value="$2"
diff --git a/windows/readme.md b/windows/readme.md
index 258b948..b554b19 100644
--- a/windows/readme.md
+++ b/windows/readme.md
@@ -111,7 +111,7 @@ processor time and is generally useless.
     * Now you can make a system32 cmd line shortcut that will be used to launch the batch file. e.g.
       * `target:` `%windir%\System32\cmd.exe /k drive:\path-to-bat-file\shell-64.bat`
       * `start in:` `drive:\some-path`
-* Setup git completions for bash:
+* Setup git completions for bash (note: shouldn't have to do this if you ran the install script):
   * `curl https://raw.githubusercontent.com/git/git/master/contrib/completion/git-completion.bash -o ~/.git-completion.bash`
 
 ### 32-bit dev tools