diff --git a/.gitignore b/.gitignore
index 803358fb..3ea1640e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-build.properties
 private.properties
+environment.properties
 .DS_Store
 .DS_Store?
 .Spotlight-V100
diff --git a/build.properties b/build.properties
new file mode 100644
index 00000000..b6360465
--- /dev/null
+++ b/build.properties
@@ -0,0 +1,5 @@
+#Tue, 17 Sep 2013 20:27:04 -0400
+minecraft_version=1.6.2
+forge_version=9.10.1.871
+mod_version=pre2a
+build_number=26
diff --git a/build.xml b/build.xml
index f02b833c..76f893a7 100644
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,7 @@
 
 	<!-- Public property files-->
 	<property file="build.properties" prefix="build" />
-	<property file="build_number.properties" prefix="build_number" />
+	<property file="environment.properties" prefix="environment" />
 
 	<!-- Private property files 
 		private.properties only contains the following properties; 
@@ -21,25 +21,25 @@
 	<property name="minecraftforge_src_archive_location" value="http://files.minecraftforge.net/minecraftforge/${minecraftforge_src_archive}" />
 
 	<target name="forge-clean">
-		<delete dir="${build.base_location}/forge" />
+		<delete dir="${environment.base_location}/forge" />
 	</target>
 
 	<target name="forge-download">
-		<mkdir dir="${build.base_location}/temp" />
-		<get src="${minecraftforge_src_archive_location}" dest="${build.base_location}/temp/" verbose="true" usetimestamp="true" />
+		<mkdir dir="${environment.base_location}/temp" />
+		<get src="${minecraftforge_src_archive_location}" dest="${environment.base_location}/temp/" verbose="true" usetimestamp="true" />
 	</target>
 
 	<target name="forge-uncompress" depends="forge-download, forge-clean">
-		<unzip src="${build.base_location}/temp/${minecraftforge_src_archive}" dest="${build.base_location}" />
-		<delete dir="${build.base_location}/temp" />
+		<unzip src="${environment.base_location}/temp/${minecraftforge_src_archive}" dest="${environment.base_location}" />
+		<delete dir="${environment.base_location}/temp" />
 	</target>
 
 	<target name="forge-install" depends="forge-uncompress">
-		<exec dir="${build.base_location}/forge/" executable="cmd.exe" osfamily="windows" failonerror="true">
+		<exec dir="${environment.base_location}/forge/" executable="cmd.exe" osfamily="windows" failonerror="true">
 			<arg value="/c" />
-			<arg value="${build.base_location}\forge\install.cmd" />
+			<arg value="${environment.base_location}\forge\install.cmd" />
 		</exec>
-		<exec dir="${build.base_location}/forge/" executable="bash" osfamily="unix" failonerror="true">
+		<exec dir="${environment.base_location}/forge/" executable="bash" osfamily="unix" failonerror="true">
 			<arg line="install.sh" />
 		</exec>
 	</target>
@@ -47,51 +47,51 @@
 	<target name="forge-clean-install" depends="forge-clean, forge-install" />
 
 	<target name="clean">
-		<delete dir="${build.base_location}/temp" />
-		<delete file="${build.mcp_location}/src/minecraft/mcmod.info" />
-		<delete file="${build.mcp_location}/src/minecraft/pack.mcmeta" />
-		<delete dir="${build.mcp_location}/src/minecraft/com/pahimar" />
-		<delete dir="${build.mcp_location}/reobf/minecraft" />
+		<delete dir="${environment.base_location}/temp" />
+		<delete file="${environment.mcp_location}/src/minecraft/mcmod.info" />
+		<delete file="${environment.mcp_location}/src/minecraft/pack.mcmeta" />
+		<delete dir="${environment.mcp_location}/src/minecraft/com/pahimar" />
+		<delete dir="${environment.mcp_location}/reobf/minecraft" />
 	</target>
 
 	<target name="increment_build_number">
-		<propertyfile file="build_number.properties">
+		<propertyfile file="build.properties">
 			<entry key="build_number" type="int" operation="+" default="1" />
 		</propertyfile>
 	</target>
 
 	<target name="prep">
-		<copy todir="${build.mcp_location}/src/minecraft">
-			<fileset dir="${build.source_location}/common/" />
+		<copy todir="${environment.mcp_location}/src/minecraft">
+			<fileset dir="${environment.source_location}/common/" />
 		</copy>
 	</target>
 
 	<target name="replace_tokens">
-		<replace dir="${build.mcp_location}/src/minecraft/com/pahimar" token="@VERSION@" value="${build.mod_version}" />
-		<replace dir="${build.mcp_location}/src/minecraft/com/pahimar" token="@FINGERPRINT@" value="${private.fingerprint_signature}" />
-		<replace dir="${build.mcp_location}/src/minecraft/com/pahimar" token="@BUILD_NUMBER@" value="${build_number.build_number}" />
+		<replace dir="${environment.mcp_location}/src/minecraft/com/pahimar" token="@VERSION@" value="${build.mod_version}" />
+		<replace dir="${environment.mcp_location}/src/minecraft/com/pahimar" token="@FINGERPRINT@" value="${private.fingerprint_signature}" />
+		<replace dir="${environment.mcp_location}/src/minecraft/com/pahimar" token="@BUILD_NUMBER@" value="${build.build_number}" />
 	</target>
 
 	<target name="recompile">
-		<exec dir="${build.mcp_location}" executable="cmd" osfamily="windows">
+		<exec dir="${environment.mcp_location}" executable="cmd" osfamily="windows">
 			<arg line="/c recompile.bat" />
 		</exec>
-		<exec dir="${build.mcp_location}" executable="bash" osfamily="unix">
+		<exec dir="${environment.mcp_location}" executable="bash" osfamily="unix">
 			<arg line="recompile.sh" />
 		</exec>
 	</target>
 
 	<target name="reobfuscate">
-		<exec dir="${build.mcp_location}" executable="cmd" osfamily="windows">
+		<exec dir="${environment.mcp_location}" executable="cmd" osfamily="windows">
 			<arg line="/c reobfuscate_srg.bat" />
 		</exec>
-		<exec dir="${build.mcp_location}" executable="bash" osfamily="unix">
+		<exec dir="${environment.mcp_location}" executable="bash" osfamily="unix">
 			<arg line="reobfuscate_srg.sh" />
 		</exec>
 	</target>
 
 	<target name="sign_jar">
-		<signjar jar="${build.release_location}/MC ${build.minecraft_version}/${build.mod_version}/ee3-universal-${build.mod_version}-${build_number.build_number}.jar" keystore="${private.keystore_location}" alias="${private.keystore_user_alias}" storepass="${private.keystore_user_password}" />
+		<signjar jar="${environment.release_location}/MC ${build.minecraft_version}/${build.mod_version}/ee3-universal-${build.mod_version}-${build.build_number}.jar" keystore="${private.keystore_location}" alias="${private.keystore_user_alias}" storepass="${private.keystore_user_password}" />
 	</target>
 
 	<target name="build">
@@ -103,12 +103,12 @@
 		<antcall target="reobfuscate" />
 
 		<!-- Build the jar -->
-		<mkdir dir="${build.release_location}/MC ${build.minecraft_version}/${build.mod_version}" />
-		<jar destfile="${build.release_location}/MC ${build.minecraft_version}/${build.mod_version}/ee3-universal-${build.mod_version}-${build_number.build_number}.jar">
-			<fileset dir="${build.mcp_location}/src/minecraft/" includes="mcmod.info" />
-			<fileset dir="${build.mcp_location}/src/minecraft/" includes="pack.mcmeta" />
-			<fileset dir="${build.mcp_location}/reobf/minecraft" />
-			<fileset dir="${build.source_location}/resources" excludes="**/xcf/**" />
+		<mkdir dir="${environment.release_location}/MC ${build.minecraft_version}/${build.mod_version}" />
+		<jar destfile="${environment.release_location}/MC ${build.minecraft_version}/${build.mod_version}/ee3-universal-${build.mod_version}-${build.build_number}.jar">
+			<fileset dir="${environment.mcp_location}/src/minecraft/" includes="mcmod.info" />
+			<fileset dir="${environment.mcp_location}/src/minecraft/" includes="pack.mcmeta" />
+			<fileset dir="${environment.mcp_location}/reobf/minecraft" />
+			<fileset dir="${environment.source_location}/resources" excludes="**/xcf/**" />
 		</jar>
 
 		<!-- Clean up the MCP source now that we are done -->
@@ -125,12 +125,12 @@
 		<antcall target="reobfuscate" />
 
 		<!-- Build the jar -->
-		<mkdir dir="${build.release_location}/MC ${build.minecraft_version}/${build.mod_version}" />
-		<jar destfile="${build.release_location}/MC ${build.minecraft_version}/${build.mod_version}/ee3-universal-${build.mod_version}-${build_number.build_number}.jar">
-			<fileset dir="${build.mcp_location}/src/minecraft/" includes="mcmod.info" />
-			<fileset dir="${build.mcp_location}/src/minecraft/" includes="pack.mcmeta" />
-			<fileset dir="${build.mcp_location}/reobf/minecraft" />
-			<fileset dir="${build.source_location}/resources" excludes="**/xcf/**" />
+		<mkdir dir="${environment.release_location}/MC ${build.minecraft_version}/${build.mod_version}" />
+		<jar destfile="${environment.release_location}/MC ${build.minecraft_version}/${build.mod_version}/ee3-universal-${build.mod_version}-${build.build_number}.jar">
+			<fileset dir="${environment.mcp_location}/src/minecraft/" includes="mcmod.info" />
+			<fileset dir="${environment.mcp_location}/src/minecraft/" includes="pack.mcmeta" />
+			<fileset dir="${environment.mcp_location}/reobf/minecraft" />
+			<fileset dir="${environment.source_location}/resources" excludes="**/xcf/**" />
 		</jar>
 
 		<!-- Sign the finished jar -->
diff --git a/build_number.properties b/build_number.properties
deleted file mode 100644
index ad75cf0d..00000000
--- a/build_number.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu, 12 Sep 2013 22:45:26 -0400
-
-build_number=23
diff --git a/environment.properties_sample b/environment.properties_sample
new file mode 100644
index 00000000..2869a5eb
--- /dev/null
+++ b/environment.properties_sample
@@ -0,0 +1,4 @@
+base_location=D:/development/
+source_location=${base_location}/eclipse/Equivalent-Exchange-3
+mcp_location=${base_location}/forge/mcp
+release_location=D:/Dropbox/Public/EE3
\ No newline at end of file