*: _Support for unit testing within the build:_ For the purposes of testing it is advantageous to have a build tool which supports running automated unit tests as part of a "unit" build.
 
-
-*: _Packaging:_ Many build systems provide automated packaging for it's native environment.  This can be highly useful as it eliminates and automates custom build steps and scripts and makes it easier to maintain.  Having this requirement can reduce the
+*: _Packaging:_ Many build systems provide automated packaging for it's native environment.  This can be highly useful as it eliminates and automates custom build steps and scripts and makes it easier to maintain.  Having this requirement can reduce the overhead on condor developers and allow them to focus on bug fixes.  It also allows condor to get out of the packaging business and simplifies the consumption for downstream folks.
 
 {section: Possible Options }
 If we use the afore mentioned goals as hard requirements, then it eliminates a lot of possible choices, and only a couple remain:
@@ -75,16 +74,17 @@
 
 -----
 
-*[On Hold per 7.4.0] Stage 2: Evaluation, Adoption, & Continuation*
+*[In Progress as of 11/14/09] Stage 2: Evaluation, Adoption, & Continuation*
 
 	Estimated: 	~1 - ? Months
-	Time Elapsed: 	On Hold
+	Time Elapsed: 	1 week
 
 	X Cleanup and cruft and provide tracking branch for UW. (origin/CMAKE)
 	X Setup an wiki page
 	- Have an evaluation with UW and RedHat folks
 		- Try to gain critical feedback.
 	- Continued conversion, and merge out regularly
+        *Develop a test plan methodology (RH & UW)
 	- Establish auto-builds (either through NMI or hudson)
 
 -----
@@ -118,6 +118,13 @@
 {section: Contributing}
 All of the updated cmake files exist under src/new_build and are open to contribution.  The current branch tracks against master and all files under new_build are a series of softlinks against the originals to allow for easy merge-outs, and to allow for parallel builds in case it is needed.  There are a substantial number of changes and cruft removal in this branch so there may need to be a bit of work to get the old build to function in this new branch, as I have not made it a priority atm.
 
+*Conventions*
+*: #include <lib>/header.h  (no more relative includes)
+*: Compiles fully in C++
+*: Proper use of extern &#8220;C&#8221;
+*: Minimal linkage, explicitly specify
+*: Platform specific files are suffixed as to allow glob macros to add to target (.windows, .unix)
+
 {section: Links}
 
 {link: http://www.cmake.org/cmake/help/documentation.html CMake Official Documentation}