--- a/.bashrc
+++ b/.bashrc
@@ -1,2 +1,47 @@
-source .zsh/50.vcs_functions.zsh
+# This is more or less a clone of my .zshrc, with modifications as needed.
+# The .zshrc is canonical, bash is simply the home-away-from-home when needed.
 
+# one-off alias for a zsh reflex
+alias ..='cd ..'
+
+for file in $(ls $HOME/.shell.d/*.{,ba}sh) ; do
+    source $file
+done
+
+if [ ! "$SHOWED_SCREEN_MESSAGE" = "true" ]; then
+        if which screen > /dev/null; then
+                detached_screens=`screen -list | grep Detached | sed -e 's/	(Detached)//'`
+                if [ ! -z "$detached_screens" ]; then
+                        echo "+---------------------------------------+"
+                        echo "| Detached screens are available:       |"
+                        echo "$detached_screens"
+                        echo "+---------------------------------------+"
+                fi
+        fi
+        export SHOWED_SCREEN_MESSAGE="true"
+fi
+
+# If available, source private extensions stored in a different repo
+if [[ -a ~/.private/bashrc ]]; then
+    source ~/.private/bashrc
+fi
+
+# I really wish bash had something like .zshenv - maybe I just don't know what it is called?
+if [[ "x$TZ" == "x" ]] ; then
+        export MACHINE_TZ="xNoTimeZone"
+        local DEFAULT_TZ="America/Detroit"
+fi
+
+# Do this right before the timezone stuff
+if [[ -a ~/.bashrc-machine ]]; then
+        source ~/.bashrc-machine
+fi
+
+# do this last so that we can tell if .zshenv-machine set the timezone
+if [[ "x$TZ" == "x" ]] ; then
+        if [ "$MACHINE_TZ" = "xNoTimeZone" ]; then
+          export TZ="$DEFAULT_TZ"
+        else
+                export TZ="$MACHINE_TZ"
+        fi
+fi