diff --git a/startup_hooks/login b/startup_hooks/login
index ce8a889..953be43 100644
--- a/startup_hooks/login
+++ b/startup_hooks/login
@@ -1,37 +1,48 @@
-set login_sourced
+if( ! $?CSHENV_LOGIN_SOURCED ) then
+    setenv CSHENV_LOGIN_SOURCED
+
+    if( $?CSHENV_DEBUG ) then
+        echo "Starting login..."
+    endif
+
+    if( ! $?CSHENV_DIR ) then
+        setenv CSHENV_DIR ~/cshenv
+    endif
+
+    if( $?CSHENV_DEBUG ) then
+        echo "Set CSHENV_DIR to: " ${CSHENV_DIR}
+    endif
+
+    #echo "Under: " $_
+    #echo "Zero: " $0
+
+    #if( -n "${_}" ) then
+    #	echo $0
+    #	setenv CSHENV_LOGIN_PATH $0
+    #else
+    #	echo ${_}:1
+    #	setenv CSHENV_LOGIN_PATH "${_}:1"
+    #else
+    #endif
+
+    #echo login hook lives at: ${CSHENV_LOGIN_PATH}
+
+
+    setenv LC_NUMERIC en_US.UTF-8
+    setenv LC_MEASUREMENT en_US.UTF-8
+    setenv LC_MONETARY en_US.UTF-8
+    setenv LC_TIME en_US.UTF-8
+
+    if( $?CSHENV_DEBUG ) then
+        echo "Ending login..."
+    endif
+
+    # Chain off to tcshrc, afterwards, if login hasn't been sourced
+    source ${CSHENV_DIR}/startup_hooks/tcshrc
 
-if( $?CSHENV_DEBUG ) then
-	echo "Starting login..."
 endif
 
-#if( ! $?CSHENV_DIR ) then
-	#setenv CSHENV_DIR ~/proj/cshenv
-#endif
-
-#echo "Under: " $_
-#echo "Zero: " $0
-
-#if( -n "${_}" ) then
-#	echo $0
-#	setenv CSHENV_LOGIN_PATH $0
-#else
-#	echo ${_}:1
-#	setenv CSHENV_LOGIN_PATH "${_}:1"
-#else
-#endif
-
-#echo login hook lives at: ${CSHENV_LOGIN_PATH}
-
-
-if( $?CSHENV_DEBUG ) then
-	echo "Ending login..."
-endif
 
 ###########################
 # vim: ft=tcsh
 ###########################
-
-setenv LC_NUMERIC en_US.UTF-8
-setenv LC_MEASUREMENT en_US.UTF-8
-setenv LC_MONETARY en_US.UTF-8
-setenv LC_TIME en_US.UTF-8
diff --git a/startup_hooks/tcshrc b/startup_hooks/tcshrc
index 2f4aab1..aa41a71 100644
--- a/startup_hooks/tcshrc
+++ b/startup_hooks/tcshrc
@@ -1,41 +1,37 @@
-set tcshrc_sourced
+# Only take this file in, if LOGIN is sourced.  LOGIN will be sourced
+# first, therefore, and will chain off to this.
+if( $?CSHENV_LOGIN_SOURCED && ! $?CSHENV_TCSHRC_SOURCED ) then
 
-if( $?CSHENV_DEBUG ) then
-	echo "Starting tcshrc..."
-endif
+    set CSHENV_TCSHRC_SOURCED
 
-if( ! $?CSHENV_DIR ) then
-	setenv CSHENV_DIR ~/proj/cshenv
-endif
+    if( $?CSHENV_DEBUG ) then
+        echo "Starting tcshrc..."
+    endif
 
-if( $?CSHENV_DEBUG ) then
-	echo "Setup CSHENV_DIR to: " ${CSHENV_DIR}
-endif
+    #if( -z ${_} ) then
+        #echo $0
+        #setenv CSHENV_TCSHRC_PATH $0
+    #else
+        #echo ${_}
+        #setenv CSHENV_TCSHRC_PATH "${_}"
+    #endif
 
-#if( -z ${_} ) then
-	#echo $0
-	#setenv CSHENV_TCSHRC_PATH $0
-#else
-	#echo ${_}
-	#setenv CSHENV_TCSHRC_PATH "${_}"
-#endif
+    #echo tcshrc hook lives at: ${CSHENV_TCSHRC_PATH}
 
-#echo tcshrc hook lives at: ${CSHENV_TCSHRC_PATH}
+    if( -c `tty` ) then
+        if( $?CSHENV_DEBUG ) then
+            echo "Going to source core tcshrc..."
+        endif
+        source ${CSHENV_DIR}/tcshrc
+    endif
 
-if( -c `tty` ) then
-	if( $?CSHENV_DEBUG ) then
-		echo "Going to source core tcshrc..."
-	endif
-	source ${CSHENV_DIR}/tcshrc
-endif
+    # Not using tcshrc bits for non-login shells.  Will decide what to do later.
 
-# Not using tcshrc bits for non-login shells.  Will decide what to do later.
-
-if( $?CSHENV_DEBUG ) then
-	echo "Ending tcshrc..."
+    if( $?CSHENV_DEBUG ) then
+        echo "Ending tcshrc..."
+    endif
 endif
 
 ###########################
 # vim: ft=tcsh
 ###########################
-