The following report provides an overview of the current status of the water-based transformation, including details of the design, geometry, and fabrication of the test section and network piping, for the ½ scale water-based NSTF program at Argonne National Laboratory.In early FY2015, efforts towards a water-based design began in parallel with on-going airbased work, and began by identifying top level objectives of the transformation. Scaling studies and preparation tasks with computational modeling were carried out to guide the design decisions, minimize distortions, and ensure relevant data among scales. This entailed close collaboration with AREVA, whose water-based RCCS (included as part of their 625 MWt SC-HTGR) served as the primary design basis for incorporation into the NSTF. A literature review of previous works was made, with an emphasis placed on similar facilities, relevance to passive decay heat removal, and details pertaining to two-phase flow and measurement techniques.The study focused on input from key designers and a thermal analysis of existing cooling panels (e.g. at TAMU and UW-Madison) and two proposed AREVA cooling panels. A base case was used as a reference point for parametric studies of effects from varying tube spacing (pitch), tube diameter, fin thickness, and materials. Then, a structural analysis was performed to ensure safe material stresses during high temperature operation. Details of the pipe network geometry and guidelines for design of the water storage tank are finally presented, followed by engineering drawings in the appendix.