diff --git a/applications/test/xfer/xferListTest.C b/applications/test/xfer/xferListTest.C
index 0089569394..6f2af0932a 100644
--- a/applications/test/xfer/xferListTest.C
+++ b/applications/test/xfer/xferListTest.C
@@ -33,9 +33,13 @@ Description
 #include "IOstreams.H"
 #include "IStringStream.H"
 #include "labelList.H"
+#include "DynamicList.H"
+#include "face.H"
 
 using namespace Foam;
 
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 //  Main program:
 
@@ -43,12 +47,12 @@ int main(int argc, char *argv[])
 {
     List<label> lstA(10);
     List<label> lstC(IStringStream("(1 2 3 4)")());
-    
+
     forAll(lstA, i)
     {
         lstA[i] = i;
     }
-        
+
     Info<< "lstA: " << lstA << endl;
     Info<< "lstC: " << lstC << endl;
 
@@ -72,10 +76,10 @@ int main(int argc, char *argv[])
     Info<< "lstC: " << lstC << endl;
 
     xB = xA;
-    
+
     List<label> lstD(xferCopy(lstC));
     List<label> lstE(xferMove(lstC));
-    
+
     // this must be empty
     List<label> lstF = xferCopy(lstC);
 
@@ -88,12 +92,30 @@ int main(int argc, char *argv[])
     Info<< "lstE: " << lstE << endl;
     Info<< "lstF: " << lstF << endl;
 
-    Info<< "xB size: " << xB->size() << endl;
+    Info<< "xB[" << xB->size() << "]\n";
 
     // clear the underlying List
     xB->clear();
 
-    Info<< "xB size: " << xB->size() << endl;
+    Info<< "xB[" << xB->size() << "]\n";
+
+    DynamicList<label> dl(10);
+    for (label i = 0; i < 5; i++)
+    {
+        dl.append(i);
+    }
+
+    face f1(dl);
+    face f2(xferCopy<labelList>(dl));
+
+    Info<< "dl[" << dl.size() << "/" << dl.allocSize() << "] " << dl << endl;
+    Info<< "f1: " << f1 << endl;
+    Info<< "f2: " << f2 << endl;
+
+    // note: using xferMoveTo to ensure the correct transfer() method is called
+    face f3( xferMoveTo<labelList>(dl) );
+    Info<< "dl[" << dl.size() << "/" << dl.allocSize() << "] " << dl << endl;
+    Info<< "f3: " << f3 << endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index c7e85f0a6e..5cbd9f9770 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -316,11 +316,10 @@ autoPtr<mapPolyMesh> reorderMesh
 
     mesh.resetPrimitives
     (
-        mesh.nFaces(),
-        mesh.points(),
-        newFaces,
-        newOwner,
-        newNeighbour,
+        xfer<pointField>::null(),
+        xferMove(newFaces),
+        xferMove(newOwner),
+        xferMove(newNeighbour),
         patchSizes,
         patchStarts
     );
diff --git a/applications/utilities/surface/README b/applications/utilities/surface/README
index acc552cf1c..292d8ca0b5 100644
--- a/applications/utilities/surface/README
+++ b/applications/utilities/surface/README
@@ -1,40 +1,46 @@
-09/01/04
+2008-10-23
+
 Contents:
 
 surfaceAdd
-adds to surface files. (but does not intersect or anything) 
+- adds to surface files. (but does not intersect or anything)
 
 surfaceBooleanOp
-Boolean operations (add, or, xor) on closed surfaces. Probably not working.
+- Boolean operations (add, or, xor) on closed surfaces. Probably not working.
 
 surfaceCheck
-checks surface for incorrect topology. Checks normals of neighbouring faces.
+- checks surface for incorrect topology. Checks normals of neighbouring faces.
 
 surfaceCoarsen
-Stan Melax coarsening algorithm
+- Stan Melax coarsening algorithm
 
 surfaceConvert
-Converts surfaces to/from various formats
+- Converts surfaces to/from various formats
 
 surfaceFind
-Finds nearest vertex and face to given point.
+- Finds nearest vertex and face to given point.
 
 surfaceMeshTriangulate
-Triangulate external facses of mesh and write as surface.
+- Triangulate external facses of mesh and write as surface.
 
 surfacePointMerge
-Explicit point merge of surface.
+- Explicit point merge of surface.
 
 surfaceSetOutside
-Orient normals on (closed) surface.
+- Orient normals on (closed) surface.
 
 surfaceSmooth
-Laplacian smoothing on surface vertices
+- Laplacian smoothing on surface vertices
 
 surfaceSubset
-Subsets surface
+- Subsets surface
 
 surfaceToPatch
-Applies region information of surfaces to mesh. Each external face of mesh
-gets region number of nearest surface triangle.
+- Applies region information of surfaces to mesh.
+  Each external face of mesh gets region number of nearest surface triangle.
+
+-------------------------------------------------------------------------------
+
+surfaceMeshConvert
+- Similar to surfaceConvert, but uses surfMesh library
 
diff --git a/applications/utilities/surface/surfaceMeshConvert/Make/files b/applications/utilities/surface/surfaceMeshConvert/Make/files
new file mode 100644
index 0000000000..1e0566c6aa
--- /dev/null
+++ b/applications/utilities/surface/surfaceMeshConvert/Make/files
@@ -0,0 +1,3 @@
+surfaceMeshConvert.C
+
+EXE = $(FOAM_APPBIN)/surfaceMeshConvert
diff --git a/applications/utilities/surface/surfaceMeshConvert/Make/options b/applications/utilities/surface/surfaceMeshConvert/Make/options
new file mode 100644
index 0000000000..5293dabe4c
--- /dev/null
+++ b/applications/utilities/surface/surfaceMeshConvert/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude
+
+EXE_LIBS = -lsurfMesh
diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
new file mode 100644
index 0000000000..ad09dc328c
--- /dev/null
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -0,0 +1,145 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Application
+    surfaceMeshConvert
+
+Description
+    Converts from one surface mesh format to another
+
+Usage
+    - surfaceMeshConvert inputFile outputFile [OPTION]
+
+    @param -clean \n
+    Perform some surface checking/cleanup on the input surface
+
+    @param -scale \<scale\> \n
+    Specify a scaling factor for writing the files
+
+    @param -triSurface \n
+    Use triSurface library for input/output
+
+Note
+    The filename extensions are used to determine the file format type.
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "timeSelector.H"
+#include "Time.H"
+#include "polyMesh.H"
+#include "meshedSurface.H"
+#include "triSurface.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noParallel();
+    argList::validArgs.append("inputFile");
+    argList::validArgs.append("outputFile");
+    argList::validOptions.insert("scale", "scale");
+    argList::validOptions.insert("clean", "");
+    argList::validOptions.insert("triSurface", "");
+#   include "setRootCase.H"
+    const stringList& params = args.additionalArgs();
+
+    scalar scaleFactor = 0;
+    if (args.options().found("scale"))
+    {
+        IStringStream(args.options()["scale"])() >> scaleFactor;
+    }
+
+    fileName importName(params[0]);
+    fileName exportName(params[1]);
+
+    if
+    (
+        !meshedSurface::canRead(importName.ext(), true)
+     || !meshedSurface::canWrite(exportName.ext(), true)
+    )
+    {
+        return 1;
+    }
+
+    if (args.options().found("triSurface"))
+    {
+// #       include "createTime.H"
+//         instantList timeDirs = timeSelector::select0(runTime, args);
+// #       include "createPolyMesh.H"
+
+        triSurface surf(importName);
+
+        if (args.options().found("clean"))
+        {
+            surf.cleanup(true);
+            surf.checkOrientation(true);
+        }
+
+        Info << "writing " << exportName;
+        if (scaleFactor <= 0)
+        {
+            Info<< " without scaling" << endl;
+        }
+        else
+        {
+            Info<< " triSurface does not yet support scaling "
+                << scaleFactor << endl;
+            // surf.scalePoints(scaleFactor);
+        }
+        surf.write(exportName);
+    }
+    else
+    {
+        meshedSurface surf(importName);
+
+        if (args.options().found("clean"))
+        {
+            surf.cleanup(true);
+            surf.checkOrientation(true);
+        }
+
+        surf.scalePoints(scaleFactor);
+
+        Info<< "writing " << exportName;
+        if (scaleFactor <= 0)
+        {
+            Info<< " without scaling" << endl;
+        }
+        else
+        {
+            Info<< " with scaling " << scaleFactor << endl;
+        }
+        surf.write(exportName);
+    }
+
+    Info<< "\nEnd\n" << endl;
+
+    return 0;
+}
+
+// ************************************************************************* //
diff --git a/bin/foamNew b/bin/foamNew
index 15005c5c83..2c4fa6f751 100755
--- a/bin/foamNew
+++ b/bin/foamNew
@@ -36,7 +36,7 @@ usage() {
 
 usage: ${0##*/} <type> {args}
 
-* create a new standard OpenFOAM source file
+* create a new standard OpenFOAM source or template file
 
 type: (source|template)
 
@@ -46,25 +46,24 @@ USAGE
 
 if [ "$#" -lt 2 ]
 then
-   usage "wrong number of arguments, expected 2 (or more)"
+    usage "wrong number of arguments, expected 2 (or more)"
 fi
 
 case "$1" in
 -h | -help)
-   usage
-   ;;
+    usage
+    ;;
 source)
-   shift
-   $WM_PROJECT_DIR/bin/foamTemplates/source/newSource $*
-   ;;
+    shift
+    $WM_PROJECT_DIR/bin/foamTemplates/source/newSource $*
+    ;;
 template)
-   shift
-   $WM_PROJECT_DIR/bin/foamTemplates/sourceTemplate/newSourceTemplate $*
-   ;;
+    shift
+    $WM_PROJECT_DIR/bin/foamTemplates/sourceTemplate/newSourceTemplate $*
+    ;;
 *)
-   usage "unknown type"
-   ;;
+    usage "unknown type"
+    ;;
 esac
 
-
 #------------------------------------------------------------------------------
diff --git a/bin/foamPack b/bin/foamPack
index 8166714c6b..3691b49add 100755
--- a/bin/foamPack
+++ b/bin/foamPack
@@ -38,20 +38,20 @@ packFile=${packDir}_${timeStamp}.gtgz
 
 if [ ! -d $packDir ]
 then
-   echo "Error: directory $packDir does not exist"
-   exit 1
+    echo "Error: directory $packDir does not exist" 1>&2
+    exit 1
 fi
 
 # add optional output directory
 if [ -d "$1" ]
 then
-   packFile="$1/$packFile"
+    packFile="$1/$packFile"
 fi
 
 if [ -f $packFile ]
 then
-   echo "Error: $packFile already exists"
-   exit 1
+    echo "Error: $packFile already exists" 1>&2
+    exit 1
 fi
 
 # Create time stamp file
@@ -102,10 +102,10 @@ tar czpf $packFile --files-from $tmpFile
 
 if [ $? = 0 ]
 then
-   echo "Finished packing and compressing $packDir into file $packFile"
+    echo "Finished packing and compressing $packDir into file $packFile"
 else
-   echo "Error: failure packing $packDir into file $packFile"
-   rm -f $packFile 2>/dev/null
+    echo "Error: failure packing $packDir into file $packFile" 1>&2
+    rm -f $packFile 2>/dev/null
 fi
 
 #------------------------------------------------------------------------------
diff --git a/bin/foamPackDoxygen b/bin/foamPackDoxygen
index 239c87c740..52976452ca 100755
--- a/bin/foamPackDoxygen
+++ b/bin/foamPackDoxygen
@@ -34,6 +34,7 @@ packDir=$WM_PROJECT-$WM_PROJECT_VERSION
 packTag=_Doxygen.gtgz
 
 usage() {
+    while [ $# -gt 0 ]; do echo "$1" 1>&2; shift; done
 cat <<USAGE 1>&2
 Usage: ${0##*/} [-prefix DIR] [-o outputDir]
 
@@ -47,38 +48,38 @@ unset prefix outputDir
 
 while [ "$#" -gt 0 ]
 do
-   case $1 in
-   -prefix | --prefix )
-      prefix=${2%%/}
-      shift 2
-      ;;
-   -o | -output )
-      outputDir=${2%%/}
-      shift 2
-      ;;
-   -h | -help )
-      usage
-      ;;
-   -*)
-      usage "unknown option: '$*'"
-      ;;
-   esac
+    case $1 in
+    -prefix | --prefix )
+        prefix=${2%%/}
+        shift 2
+        ;;
+    -o | -output )
+        outputDir=${2%%/}
+        shift 2
+        ;;
+    -h | -help )
+        usage
+        ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
+    esac
 done
 
 # if packing from within the directory, use -prefix form
 if [ "${PWD##*/}" = "$packDir" ]
 then
-   : ${prefix:=$packDir}
+    : ${prefix:=$packDir}
 fi
 
 # pack the directories directly and add prefix afterwards
 if [ -n "$prefix" ]
 then
-   packDir="$prefix"
+    packDir="$prefix"
 elif [ ! -d $packDir ]
 then
-   echo "Error: directory $packDir does not exist"
-   exit 1
+    echo "Error: directory $packDir does not exist" 1>&2
+    exit 1
 fi
 
 #
diff --git a/bin/foamUpdateCaseFileHeader b/bin/foamUpdateCaseFileHeader
index 805f4e128a..f4340fc53c 100755
--- a/bin/foamUpdateCaseFileHeader
+++ b/bin/foamUpdateCaseFileHeader
@@ -36,26 +36,25 @@
 foamVersion=$WM_PROJECT_VERSION
 
 usage() {
-   cat<<USAGE
+    cat<<USAGE
 
 usage: ${0##*/} [OPTION] <file1> ... <fileN>
 
 options:
-  -v "<version>"  specifies the version to be written in the header
-  -h              help
+  -v VER  specifies the version to be written in the header
+  -h      help
 
-  Updates the header of application files.
+  Updates the header of application files and removes consecutive blank lines.
   By default, writes current version in the header.
-  Alternatively version can be specified with -v option.
-  Also removes consecutive blank lines from file.
+  An alternative version can be specified with -v option.
 
 USAGE
-   exit 1
+    exit 1
 }
 
 
 printHeader() {
-   cat<<HEADER
+    cat<<HEADER
 /*--------------------------------*- C++ -*----------------------------------*\\
 | =========                 |                                                 |
 | \\\\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
@@ -78,7 +77,7 @@ HEADER
 # extract attribute '$1' from file '$2'
 #
 FoamFileAttribute() {
-   sed -n -e 's/[ ;]*$//' -e "s/^ *$1 *//p" $2
+    sed -n -e 's/[ ;]*$//' -e "s/^ *$1 *//p" $2
 }
 
 
@@ -88,22 +87,22 @@ FoamFileAttribute() {
 OPTS=`getopt hv: $*`
 if [ $? -ne 0 ]
 then
-   echo "Aborting due to invalid option"
-   usage
+    echo "Aborting due to invalid option"
+    usage
 fi
 eval set -- '$OPTS'
 while [ "$1" != "--" ]
 do
-   case $1 in
-   -v)
-      foamVersion=$2
-      shift
-      ;;
-   -h)
-      usage
-      ;;
-   esac
-   shift
+    case $1 in
+    -v)
+        foamVersion=$2
+        shift
+        ;;
+    -h)
+        usage
+        ;;
+    esac
+    shift
 done
 shift
 
@@ -118,24 +117,24 @@ foamVersion=`printf %-36s $foamVersion`
 #
 for caseFile
 do
-   if grep FoamFile $caseFile >/dev/null 2>&1
-   then
-      echo "Updating case file: $caseFile"
-      sed -n '/FoamFile/,/}/p' $caseFile > FoamFile.tmp
+    if grep FoamFile $caseFile >/dev/null 2>&1
+    then
+        echo "Updating case file: $caseFile"
+        sed -n '/FoamFile/,/}/p' $caseFile > FoamFile.tmp
 
-      CLASS=`FoamFileAttribute class FoamFile.tmp`
-      OBJECT=`FoamFileAttribute object FoamFile.tmp`
-      FORMAT=`FoamFileAttribute format FoamFile.tmp`
+        CLASS=`FoamFileAttribute class FoamFile.tmp`
+        OBJECT=`FoamFileAttribute object FoamFile.tmp`
+        FORMAT=`FoamFileAttribute format FoamFile.tmp`
 
-      printHeader $FORMAT $CLASS $OBJECT $NOTE > FoamFile.tmp
-      sed '1,/}/d' $caseFile | sed '/./,/^$/!d' >> FoamFile.tmp
+        printHeader $FORMAT $CLASS $OBJECT $NOTE > FoamFile.tmp
+        sed '1,/}/d' $caseFile | sed '/./,/^$/!d' >> FoamFile.tmp
 
-      # use cat to avoid removing/replace soft-links
-      [ -s FoamFile.tmp ] && cat FoamFile.tmp >| $caseFile
-      rm FoamFile.tmp
-   else
-      echo " Invalid case file: $caseFile"
-   fi
+        # use cat to avoid removing/replace soft-links
+        [ -s FoamFile.tmp ] && cat FoamFile.tmp >| $caseFile
+        rm FoamFile.tmp
+    else
+        echo " Invalid case file: $caseFile" 1>&2
+    fi
 done
 
 #------------------------------------------------------------------------------
diff --git a/bin/foamUpgradeTurbulenceProperties b/bin/foamUpgradeTurbulenceProperties
index 297b7e4e63..9d542ca0e2 100755
--- a/bin/foamUpgradeTurbulenceProperties
+++ b/bin/foamUpgradeTurbulenceProperties
@@ -37,7 +37,7 @@
 #------------------------------------------------------------------------------
 
 usage() {
-   cat<<USAGE
+    cat<<USAGE
 
 usage: ${0##*/} <turbulenceProperties>
 
@@ -57,42 +57,42 @@ USAGE
 #
 convertDict()
 {
-   echo "Identified $1 turbulence model in '$3'"
-   outputPath=`dirname $3`
+    echo "Identified $1 turbulence model in '$3'"
+    outputPath=`dirname $3`
 
-   if [ -e "$outputPath/$1Properties" ]
-   then
-      echo "Error: file already exists $outputPath/$1Properties'"
-   else
-      sed -e "s/turbulenceProperties/$1Properties/" \
-          -e "s/$2/$1Model/" \
-          -e "s/[a-zA-Z0-9]* [ ]*\[[0-9 ]*\]//" \
-          $3 > "$outputPath/$1Properties"
+    if [ -e "$outputPath/$1Properties" ]
+    then
+        echo "Error: file already exists $outputPath/$1Properties'" 1>&2
+    else
+        sed -e "s/turbulenceProperties/$1Properties/" \
+            -e "s/$2/$1Model/" \
+            -e "s/[a-zA-Z0-9]* [ ]*\[[0-9 ]*\]//" \
+            $3 > "$outputPath/$1Properties"
 
-      echo "    wrote $outputPath/$1Properties"
-   fi
+        echo "    wrote $outputPath/$1Properties"
+    fi
 }
 
 [ $# -ge 1 ] || usage
 
 for turbDict
 do
-   # Identify type of turbulence model and convert
-   if [ -f $turbDict ]
-   then
-      if grep turbulenceModel $turbDict >/dev/null 2>&1
-      then
-          convertDict RAS turbulenceModel $turbDict
-      elif grep LESmodel $turbDict >/dev/null 2>&1
-      then
-          convertDict LES LESmodel $turbDict
-      else
-          echo "Unable to determine turbulence model type in '$turbDict'"
-          echo "    - nothing changed"
-      fi
-   else
-      echo "Error: file '$turbDict' does not exist"
-   fi
+    # Identify type of turbulence model and convert
+    if [ -f $turbDict ]
+    then
+        if grep turbulenceModel $turbDict >/dev/null 2>&1
+        then
+            convertDict RAS turbulenceModel $turbDict
+        elif grep LESmodel $turbDict >/dev/null 2>&1
+        then
+            convertDict LES LESmodel $turbDict
+        else
+            echo "Unable to determine turbulence model type in '$turbDict'" 1>&2
+            echo "    - nothing changed" 1>&2
+        fi
+    else
+        echo "Error: file '$turbDict' does not exist" 1>&2
+    fi
 done
 
 #------------------------------------------------------------------------------
diff --git a/bin/rmclassall b/bin/rmclassall
index 059306bee5..de45bb2b2b 100755
--- a/bin/rmclassall
+++ b/bin/rmclassall
@@ -3,22 +3,23 @@
 # default is pwd
 if [ "$#" -eq 0 ]
 then
-   set -- .
+    set -- .
 elif [ "$1" = "-h" -o "$1" = "-help" ]
 then
-   echo "Usage: ${0##*/} [dir1] .. [dirN]"
-   echo "    remove all .class files"
-   exit 1
+    echo "Usage: ${0##*/} [dir1] .. [dirN]"
+    echo "    remove all .class files"
+    exit 1
 fi
 
 for i
 do
-   if [ -d "$i" ]
-   then
-      echo "removing all .class files"
-      find $i -name '*.class' -print | xargs -t rm
-   else
-      echo "no directory: $i"
-   fi
+    if [ -d "$i" ]
+    then
+        echo "removing all .class files: $i"
+        find $i -name '*.class' -print | xargs -t rm 2>/dev/null
+    else
+        echo "no directory: $i" 1>&2
+    fi
 done
+
 #------------------------------------------------------------------------------
diff --git a/bin/rmcore b/bin/rmcore
index f34cae57a5..dddf09406c 100755
--- a/bin/rmcore
+++ b/bin/rmcore
@@ -3,23 +3,23 @@
 # default is pwd
 if [ "$#" -eq 0 ]
 then
-   set -- .
+    set -- .
 elif [ "$1" = "-h" -o "$1" = "-help" ]
 then
-   echo "Usage: ${0##*/} [dir1] .. [dirN]"
-   echo "    remove all core files"
-   exit 1
+    echo "Usage: ${0##*/} [dir1] .. [dirN]"
+    echo "    remove all core files"
+    exit 1
 fi
 
 for i
 do
-   if [ -d "$i" ]
-   then
-      echo "removing all core files"
-      find $i \( -type f -name 'core' -o -name 'core.[1-9]*' -o -name 'vgcore.*' \) -print | xargs -t rm
-   else
-      echo "no directory: $i"
-   fi
+    if [ -d "$i" ]
+    then
+        echo "removing all core files: $i"
+        find $i \( -type f -name 'core' -o -name 'core.[1-9]*' -o -name 'vgcore.*' \) -print | xargs -t rm 2>/dev/null
+    else
+        echo "no directory: $i" 1>&2
+    fi
 done
-#------------------------------------------------------------------------------
 
+#------------------------------------------------------------------------------
diff --git a/bin/rmdepall b/bin/rmdepall
index 4cfa1ad680..b0f1876b45 100755
--- a/bin/rmdepall
+++ b/bin/rmdepall
@@ -2,18 +2,18 @@
 
 if [ "$1" = "-h" -o "$1" = "-help" -o "$#" -gt 1 ]
 then
-   echo "Usage: ${0##*/}         : remove all .dep files"
-   echo "       ${0##*/} <file>  : remove all .dep files referring to <file>"
-   exit 1
+    echo "Usage: ${0##*/}         : remove all .dep files"
+    echo "       ${0##*/} <file>  : remove all .dep files referring to <file>"
+    exit 1
 fi
 
 if [ "$#" -eq 0 ]
 then
-   echo "removing all .dep files"
-   find . -name '*.dep' -print | xargs -t rm
+    echo "removing all .dep files"
+    find . -name '*.dep' -print | xargs -t rm 2>/dev/null
 else
-   echo "removing all .dep files containing $1..."
-   find . -name '*.dep' -exec grep "$1" '{}' \; -exec rm '{}' \;
+    echo "removing all .dep files containing $1..."
+    find . -name '*.dep' -exec grep "$1" '{}' \; -exec rm '{}' \;
 fi
 
 #------------------------------------------------------------------------------
diff --git a/bin/rmoall b/bin/rmoall
index 32bd804788..d49a6f4a05 100755
--- a/bin/rmoall
+++ b/bin/rmoall
@@ -3,22 +3,23 @@
 # default is pwd
 if [ "$#" -eq 0 ]
 then
-   set -- .
+    set -- .
 elif [ "$1" = "-h" -o "$1" = "-help" ]
 then
-   echo "Usage: ${0##*/} [dir1] .. [dirN]"
-   echo "    remove all .o files"
-   exit 1
+    echo "Usage: ${0##*/} [dir1] .. [dirN]"
+    echo "    remove all .o files"
+    exit 1
 fi
 
 for i
 do
-   if [ -d "$i" ]
-   then
-      echo "removing all .o files: $i"
-      find $i -name '*.o' -print | xargs -t rm
-   else
-      echo "no directory: $i"
-   fi
+    if [ -d "$i" ]
+    then
+        echo "removing all .o files: $i"
+        find $i -name '*.o' -print | xargs -t rm 2>/dev/null
+    else
+        echo "no directory: $i" 1>&2
+    fi
 done
+
 #------------------------------------------------------------------------------
diff --git a/bin/rm~all b/bin/rm~all
index 0725382447..ab8b4b17c7 100755
--- a/bin/rm~all
+++ b/bin/rm~all
@@ -3,22 +3,23 @@
 # default is pwd
 if [ "$#" -eq 0 ]
 then
-   set -- .
+    set -- .
 elif [ "$1" = "-h" -o "$1" = "-help" ]
 then
-   echo "Usage: ${0##*/} [dir1] .. [dirN]"
-   echo "    remove all *~ files"
-   exit 1
+    echo "Usage: ${0##*/} [dir1] .. [dirN]"
+    echo "    remove all *~ files"
+    exit 1
 fi
 
 for i
 do
-   if [ -d "$i" ]
-   then
-      echo "removing all *~ files"
-      find $i \( -name '*~' -o -name '.*~' \) -print | xargs -t rm
-   else
-      echo "no directory: $i"
-   fi
+    if [ -d "$i" ]
+    then
+        echo "removing all *~ files: $i"
+        find $i \( -name '*~' -o -name '.*~' \) -print | xargs -t rm 2>/dev/null
+    else
+       echo "no directory: $i" 1>&2
+    fi
 done
+
 #------------------------------------------------------------------------------
diff --git a/etc/settings.csh b/etc/settings.csh
index 0a38b78f6a..764fdfe1bf 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -193,9 +193,17 @@ endsw
 _foamAddLib $FOAM_MPI_LIBBIN
 
 
-# Set the MPI buffer size (used by all platforms except SGI MPI)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-setenv MPI_BUFFER_SIZE 20000000
+# Set the minimum MPI buffer size (used by all platforms except SGI MPI)
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+set minBufferSize=20000000
+
+if ( $?MPI_BUFFER_SIZE ) then
+    if ( $MPI_BUFFER_SIZE < $minBufferSize ) then
+        setenv MPI_BUFFER_SIZE $minBufferSize
+    endif
+else
+    setenv MPI_BUFFER_SIZE $minBufferSize
+endif
 
 
 # CGAL library if available
@@ -217,5 +225,6 @@ endif
 unalias _foamAddPath
 unalias _foamAddLib
 unalias _foamMkDir
+unset minBufferSize
 
 # -----------------------------------------------------------------------------
diff --git a/etc/settings.sh b/etc/settings.sh
index 6519bd9682..a5d9903ffb 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -223,9 +223,15 @@ esac
 _foamAddLib $FOAM_MPI_LIBBIN
 
 
-# Set the MPI buffer size (used by all platforms except SGI MPI)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-export MPI_BUFFER_SIZE=20000000
+# Set the minimum MPI buffer size (used by all platforms except SGI MPI)
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+minBufferSize=20000000
+
+if [ "${MPI_BUFFER_SIZE:=$minBufferSize}" -lt $minBufferSize ]
+then
+    MPI_BUFFER_SIZE=$minBufferSize
+fi
+export MPI_BUFFER_SIZE
 
 
 # CGAL library if available
@@ -242,6 +248,6 @@ export MPI_BUFFER_SIZE=20000000
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
-unset _foamAddPath _foamAddLib _foamMkDir
+unset _foamAddPath _foamAddLib _foamMkDir minBufferSize
 
 # -----------------------------------------------------------------------------
diff --git a/src/Allwmake b/src/Allwmake
index 341ee2ed6f..76cc0b157c 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -13,6 +13,7 @@ wmake libso lagrangian/basic
 
 wmake libso triSurface
 wmake libso edgeMesh
+wmake libso surfMesh
 wmake libso meshTools
 wmake libso finiteVolume
 
diff --git a/src/OpenFOAM/containers/HashTables/Map/Map.H b/src/OpenFOAM/containers/HashTables/Map/Map.H
index d076afd2a3..533e7f520c 100644
--- a/src/OpenFOAM/containers/HashTables/Map/Map.H
+++ b/src/OpenFOAM/containers/HashTables/Map/Map.H
@@ -54,7 +54,6 @@ class Map
 {
 
 public:
-
     // Constructors
 
         //- Construct given initial map size
@@ -74,6 +73,15 @@ public:
         :
             HashTable<T, label, Hash<label> >(map)
         {}
+
+
+    //- Return a null Map
+    static const Map<T>& null()
+    {
+        Map<T>* nullPtr = reinterpret_cast<Map<T>*>(0);
+        return *nullPtr;
+    }
+
 };
 
 
diff --git a/src/OpenFOAM/containers/Keyed/Keyed.H b/src/OpenFOAM/containers/Keyed/Keyed.H
index 2d0caa7b18..223ffe7bd6 100644
--- a/src/OpenFOAM/containers/Keyed/Keyed.H
+++ b/src/OpenFOAM/containers/Keyed/Keyed.H
@@ -39,6 +39,7 @@ SourceFiles
 #define Keyed_H
 
 #include "List.H"
+#include "xfer.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,6 +49,7 @@ namespace Foam
 // Forward declaration of friend functions and operators
 
 template<class T> class Keyed;
+template<class T> class xfer;
 
 template<class T> Istream& operator>>(Istream&, Keyed<T>&);
 template<class T> Ostream& operator<<(Ostream&, const Keyed<T>&);
@@ -92,6 +94,9 @@ public:
         //- Construct as a copy of item, with a key
         inline Keyed(const T& item, const label key=0);
 
+        //- Construct by transferring the item, with a key
+        inline Keyed(const xfer<T>& item, const label key=0);
+
         //- Construct from Istream
         inline Keyed(Istream&);
 
diff --git a/src/OpenFOAM/containers/Keyed/KeyedI.H b/src/OpenFOAM/containers/Keyed/KeyedI.H
index ecae23da3d..61b7d9599f 100644
--- a/src/OpenFOAM/containers/Keyed/KeyedI.H
+++ b/src/OpenFOAM/containers/Keyed/KeyedI.H
@@ -30,7 +30,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-//- Construct null
 template<class T>
 inline Foam::Keyed<T>::Keyed()
 :
@@ -38,7 +37,6 @@ inline Foam::Keyed<T>::Keyed()
 {}
 
 
-//- Construct from components
 template<class T>
 inline Foam::Keyed<T>::Keyed(const T& item, const label key)
 :
@@ -47,6 +45,14 @@ inline Foam::Keyed<T>::Keyed(const T& item, const label key)
 {}
 
 
+template<class T>
+inline Foam::Keyed<T>::Keyed(const xfer<T>& item, const label key)
+:
+    T(item),
+    key_(key)
+{}
+
+
 template<class T>
 inline Foam::Keyed<T>::Keyed(Istream& is)
 {
diff --git a/src/OpenFOAM/memory/autoPtr/autoPtr.H b/src/OpenFOAM/memory/autoPtr/autoPtr.H
index 3fbe085a3f..4ee0c95e88 100644
--- a/src/OpenFOAM/memory/autoPtr/autoPtr.H
+++ b/src/OpenFOAM/memory/autoPtr/autoPtr.H
@@ -62,7 +62,7 @@ public:
     // Constructors
 
         //- Store object pointer
-        inline explicit autoPtr(T* = NULL);
+        inline explicit autoPtr(T* = 0);
 
         //- Construct as copy by transfering pointer to this autoPtr and
         //  setting the arguments pointer to NULL
@@ -90,11 +90,11 @@ public:
 
             //- Set pointer to that given.
             //  If object pointer already set issue a FatalError.
-            inline void set(T* p);
+            inline void set(T*);
 
             //- If object pointer already set delete object and
             //  set pointer to that given
-            inline void reset(T* p = NULL);
+            inline void reset(T* = 0);
 
             //- If object pointer points to valid object:
             //  delete object and set pointer to NULL
diff --git a/src/OpenFOAM/memory/autoPtr/autoPtrI.H b/src/OpenFOAM/memory/autoPtr/autoPtrI.H
index fb4c87c49d..0013d9f8e0 100644
--- a/src/OpenFOAM/memory/autoPtr/autoPtrI.H
+++ b/src/OpenFOAM/memory/autoPtr/autoPtrI.H
@@ -29,9 +29,9 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T>
-inline Foam::autoPtr<T>::autoPtr(T* tPtr)
+inline Foam::autoPtr<T>::autoPtr(T* p)
 :
-    ptr_(tPtr)
+    ptr_(p)
 {}
 
 
@@ -40,7 +40,7 @@ inline Foam::autoPtr<T>::autoPtr(const autoPtr<T>& ap)
 :
     ptr_(ap.ptr_)
 {
-    ap.ptr_ = NULL;
+    ap.ptr_ = 0;
 }
 
 
@@ -64,7 +64,7 @@ template<class T>
 inline T* Foam::autoPtr<T>::ptr()
 {
     T* ptr = ptr_;
-    ptr_ = NULL;
+    ptr_ = 0;
     return ptr;
 }
 
@@ -74,7 +74,7 @@ inline void Foam::autoPtr<T>::set(T* p)
 {
     if (ptr_)
     {
-        FatalErrorIn("void autoPtr<T>::set(T* p)")
+        FatalErrorIn("void autoPtr<T>::set(T*)")
             << "object already allocated"
             << abort(FatalError);
     }
@@ -98,7 +98,7 @@ inline void Foam::autoPtr<T>::reset(T* p)
 template<class T>
 inline void Foam::autoPtr<T>::clear()
 {
-    reset(NULL);
+    reset(0);
 }
 
 
diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index 316e109e2f..77894fe239 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.H
@@ -98,16 +98,11 @@ public:
             //  or a temporary that has been allocated
             inline bool valid() const;
 
-
         // Edit
 
             //- Return tmp pointer for reuse
             inline T* ptr() const;
 
-            //- If object pointer points to valid object:
-            //  delete object and set pointer to NULL
-            inline void clear();
-
             //- If object pointer points to valid object:
             //  delete object and set pointer to NULL
             inline void clear() const;
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index dcba145d07..1c110816a1 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.H
@@ -26,15 +26,10 @@ License
 
 #include "error.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T>
-inline tmp<T>::tmp(T* tPtr)
+inline Foam::tmp<T>::tmp(T* tPtr)
 :
     isTmp_(true),
     ptr_(tPtr),
@@ -43,16 +38,16 @@ inline tmp<T>::tmp(T* tPtr)
 
 
 template<class T>
-inline tmp<T>::tmp(const T& tRef)
+inline Foam::tmp<T>::tmp(const T& tRef)
 :
     isTmp_(false),
-    ptr_(NULL),
+    ptr_(0),
     ref_(tRef)
 {}
 
 
 template<class T>
-inline tmp<T>::tmp(const tmp<T>& t)
+inline Foam::tmp<T>::tmp(const tmp<T>& t)
 :
     isTmp_(t.isTmp_),
     ptr_(t.ptr_),
@@ -75,14 +70,14 @@ inline tmp<T>::tmp(const tmp<T>& t)
 
 
 template<class T>
-inline tmp<T>::~tmp()
+inline Foam::tmp<T>::~tmp()
 {
     if (isTmp_ && ptr_)
     {
         if (ptr_->okToDelete())
         {
             delete ptr_;
-            ptr_ = NULL;
+            ptr_ = 0;
         }
         else
         {
@@ -95,21 +90,21 @@ inline tmp<T>::~tmp()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
-inline bool tmp<T>::isTmp() const
+inline bool Foam::tmp<T>::isTmp() const
 {
     return isTmp_;
 }
 
 
 template<class T>
-inline bool tmp<T>::valid() const
+inline bool Foam::tmp<T>::valid() const
 {
     return (!isTmp_ || (isTmp_ && ptr_));
 }
 
 
 template<class T>
-inline T* tmp<T>::ptr() const
+inline T* Foam::tmp<T>::ptr() const
 {
     if (isTmp_)
     {
@@ -121,7 +116,7 @@ inline T* tmp<T>::ptr() const
          }
 
          T* ptr = ptr_;
-         ptr_ = NULL;
+         ptr_ = 0;
 
          ptr->resetRefCount();
 
@@ -135,27 +130,20 @@ inline T* tmp<T>::ptr() const
 
 
 template<class T>
-inline void tmp<T>::clear()
+inline void Foam::tmp<T>::clear() const
 {
     if (isTmp_ && ptr_) // && ptr_->okToDelete())
     {
         delete ptr_;
-        ptr_ = NULL;
+        ptr_ = 0;
     }
 }
 
 
-template<class T>
-inline void tmp<T>::clear() const
-{
-    const_cast<tmp<T>&>(*this).clear();
-}
-
-
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T>
-inline T& tmp<T>::operator()()
+inline T& Foam::tmp<T>::operator()()
 {
     if (isTmp_)
     {
@@ -181,7 +169,7 @@ inline T& tmp<T>::operator()()
 
 
 template<class T>
-inline const T& tmp<T>::operator()() const
+inline const T& Foam::tmp<T>::operator()() const
 {
     if (isTmp_)
     {
@@ -202,14 +190,14 @@ inline const T& tmp<T>::operator()() const
 
 
 template<class T>
-inline tmp<T>::operator const T&() const
+inline Foam::tmp<T>::operator const T&() const
 {
     return operator()();
 }
 
 
 template<class T>
-inline T* tmp<T>::operator->()
+inline T* Foam::tmp<T>::operator->()
 {
     if (isTmp_)
     {
@@ -230,21 +218,21 @@ inline T* tmp<T>::operator->()
 
 
 template<class T>
-inline const T* tmp<T>::operator->() const
+inline const T* Foam::tmp<T>::operator->() const
 {
     return const_cast<tmp<T>&>(*this).operator->();
 }
 
 
 template<class T>
-inline void tmp<T>::operator=(const tmp<T>& t)
+inline void Foam::tmp<T>::operator=(const tmp<T>& t)
 {
     if (isTmp_ && ptr_)
     {
         if (ptr_->okToDelete())
         {
             delete ptr_;
-            ptr_ = NULL;
+            ptr_ = 0;
         }
         else
         {
@@ -277,8 +265,4 @@ inline void tmp<T>::operator=(const tmp<T>& t)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/memory/xfer/xfer.H b/src/OpenFOAM/memory/xfer/xfer.H
index e13782c9f4..b1cc60f81d 100644
--- a/src/OpenFOAM/memory/xfer/xfer.H
+++ b/src/OpenFOAM/memory/xfer/xfer.H
@@ -26,19 +26,33 @@ Class
     Foam::xfer
 
 Description
-    A simple container that can be used to copy or transfer the contents
-    of objects of type \<T\>.
-
-    Since it is decided upon construction of the xfer object whether the
-    parameter is to be copied or transferred, the contents of the resulting
-    object can be transferred unconditionally.
-
-    This greatly simplifies defining the constructors for other classes
-    with mixed transfer/copy semantics.
+    A simple container for copying or transferring objects of type \<T\>.
 
     The wrapped object of type \<T\> must implement a transfer() method and
     an operator=() copy method.
 
+    Since it is decided upon construction of the xfer object whether the
+    parameter is to be copied or transferred, the contents of the resulting
+    xfer object can be transferred unconditionally. This greatly simplifies
+    defining constructors or methods in other classes with mixed
+    transfer/copy semantics without requiring 2^N different versions.
+
+    When transferring between dissimilar types, the xferCopyTo() and
+    xferMoveTo() functions can prove useful. An example is transferring
+    from a DynamicList to a List.  Since the
+    List\<T\>::transfer(List\<T\>&) method could result in some allocated
+    memory becoming inaccessible, the xferMoveTo() function can be used to
+    invoke the correct List\<T\>::transfer(DynamicList\<T\>&) method.
+
+    @code
+        DynamicList<label> dynLst;
+        ...
+        labelList plainLst( xferMoveTo<labelList>(dynLst) );
+    @endcode
+
+SeeAlso
+    xferCopy, xferCopyTo, xferMove, xferMoveTo, xferTmp
+
 SourceFiles
     xferI.H
 
@@ -64,7 +78,7 @@ class xfer
 {
     // Private data
 
-        //- Pointer to temporary object
+        //- Pointer to underlying datatype
         mutable T* ptr_;
 
 public:
@@ -88,6 +102,11 @@ public:
 
         inline ~xfer();
 
+    // Member Functions
+
+        //- Return a null object reference
+        inline static const xfer<T>& null();
+
     // Member Operators
 
         //- Transfer the contents into the object
@@ -108,49 +127,56 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 /**
- * @fn template<class T> xferCopy(const T&)
  * Construct by copying the contents of the @a arg
  *
- * @sa xferMove, xferTmp and Foam::xfer
+ * @sa xferCopyTo, xferMove, xferMoveTo, xferTmp and Foam::xfer
 */
 template<class T>
-Foam::xfer<T> xferCopy(const T& t)
-{
-    return Foam::xfer<T>(t);
-}
+inline xfer<T> xferCopy(const T&);
+
+/**
+ * Construct by transferring the contents of the @a arg
+ *
+ * @sa xferCopy, xferCopyTo, xferMoveTo, xferTmp and Foam::xfer
+*/
+template<class T>
+inline xfer<T> xferMove(T&);
 
 
 /**
- * @fn template<class T> xferMove(T&)
  * Construct by transferring the contents of the @a arg
  *
+ * @sa xferCopy, xferCopyTo, xferMove, xferMoveTo and Foam::xfer
+*/
+template<class T>
+inline xfer<T> xferTmp(Foam::tmp<T>&);
+
+
+/**
+ * Construct by copying the contents of the @a arg
+ * between dissimilar types
+ *
+ * @sa xferCopy, xferMove, xferMoveTo, xferTmp and Foam::xfer
+*/
+template<class To, class From>
+inline xfer<To> xferCopyTo(const From&);
+
+
+/**
+ * Construct by transferring the contents of the @a arg
+ * between dissimilar types
+ *
  * @par Example Use
  * @code
- *     List<label> a;
+ *     DynamicList<label> dynLst;
  *     ...
- *     List<label> b(xferMove(a));
+ *     labelList plainLst( xferMoveTo<labelList>(dynLst) );
  * @endcode
  *
- * @sa xferCopy, xferTmp and Foam::xfer
+ * @sa xferCopy, xferCopyTo, xferMove, xferTmp and Foam::xfer
 */
-template<class T>
-Foam::xfer<T> xferMove(T& t)
-{
-    return Foam::xfer<T>(t, true);
-}
-
-
-/**
- * @fn template<class T> xferTmp(tmp<T>&)
- * Construct by transferring the contents of the @a arg
- *
- * @sa xferCopy, xferMove and Foam::xfer
-*/
-template<class T>
-Foam::xfer<T> xferTmp(Foam::tmp<T>& tt)
-{
-    return Foam::xfer<T>(tt(), tt.isTmp());
-}
+template<class To, class From>
+inline xfer<To> xferMoveTo(From&);
 
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/memory/xfer/xferI.H b/src/OpenFOAM/memory/xfer/xferI.H
index 55830008a9..94b75b0d04 100644
--- a/src/OpenFOAM/memory/xfer/xferI.H
+++ b/src/OpenFOAM/memory/xfer/xferI.H
@@ -77,6 +77,16 @@ inline Foam::xfer<T>::~xfer()
 }
 
 
+// * * * * * * * * * * * * *  Member Functions * * * * * * * * * * * * * * * //
+
+template<class T>
+inline const Foam::xfer<T>& Foam::xfer<T>::null()
+{
+    xfer<T>* nullPtr = reinterpret_cast<xfer<T>*>(0);
+    return *nullPtr;
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T>
@@ -89,7 +99,7 @@ inline void Foam::xfer<T>::operator=(T& t)
 template<class T>
 inline void Foam::xfer<T>::operator=(const xfer<T>& t)
 {
-    // silently ignore copy to self
+    // silently ignore attempted copy to self
     if (this != &t)
     {
         ptr_->transfer(*(t.ptr_));
@@ -110,4 +120,46 @@ inline T* Foam::xfer<T>::operator->() const
     return ptr_;
 }
 
+
+// * * * * * * * * * * * * *  Helper Functions * * * * * * * * * * * * * * * //
+
+
+template<class T>
+inline Foam::xfer<T> Foam::xferCopy(const T& t)
+{
+    return Foam::xfer<T>(t);
+}
+
+template<class T>
+inline Foam::xfer<T> Foam::xferMove(T& t)
+{
+    return Foam::xfer<T>(t, true);
+}
+
+
+template<class T>
+inline Foam::xfer<T> Foam::xferTmp(Foam::tmp<T>& tt)
+{
+    return Foam::xfer<T>(tt(), tt.isTmp());
+}
+
+
+template<class To, class From>
+inline Foam::xfer<To> Foam::xferCopyTo(const From& t)
+{
+    Foam::xfer<To> xf;
+    xf() = t;
+    return xf;
+}
+
+
+template<class To, class From>
+inline Foam::xfer<To> Foam::xferMoveTo(From& t)
+{
+    Foam::xfer<To> xf;
+    xf().transfer(t);
+    return xf;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/MeshObject/MeshObject.H b/src/OpenFOAM/meshes/MeshObject/MeshObject.H
index 3bf11b5f6a..eac6096c79 100644
--- a/src/OpenFOAM/meshes/MeshObject/MeshObject.H
+++ b/src/OpenFOAM/meshes/MeshObject/MeshObject.H
@@ -104,12 +104,12 @@ public:
         );
 
 
-    // Destructor
-
-        static bool Delete(const Mesh& mesh);
+    // Destructors
 
         virtual ~MeshObject();
 
+        static bool Delete(const Mesh& mesh);
+
 
     // Member Functions
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cell.H b/src/OpenFOAM/meshes/meshShapes/cell/cell.H
index eb82de5a2b..a7f42b8cf1 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cell.H
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cell.H
@@ -76,7 +76,10 @@ public:
         explicit inline cell(label);
 
         //- Construct from components
-        explicit inline cell(const labelList& f);
+        explicit inline cell(const labelList&);
+
+        //- Construct by transferring the parameter contents
+        explicit inline cell(const xfer<labelList>&);
 
         //- Construct from Istream
         inline cell(Istream&);
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cellI.H b/src/OpenFOAM/meshes/meshShapes/cell/cellI.H
index dd2e81b598..5dc2832f48 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cellI.H
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cellI.H
@@ -26,34 +26,35 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-//- Construct null
-inline cell::cell()
+// Construct null
+inline Foam::cell::cell()
 {}
 
 
 // Construct given size
-inline cell::cell(label s)
+inline Foam::cell::cell(label s)
 :
     labelList(s, -1)
 {}
 
 
-//- Construct from components
-inline cell::cell(const labelList& f)
+// Construct from components
+inline Foam::cell::cell(const labelList& lst)
 :
-    labelList(f)
+    labelList(lst)
+{}
+
+
+inline Foam::cell::cell(const xfer<labelList>& lst)
+:
+    labelList(lst)
 {}
 
 
 // Construct from Istream
-inline cell::cell(Istream& is)
+inline Foam::cell::cell(Istream& is)
 :
     labelList(is)
 {}
@@ -61,21 +62,16 @@ inline cell::cell(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-//- Number of faces
-inline label cell::nFaces() const
+// Number of faces
+inline Foam::label Foam::cell::nFaces() const
 {
     return size();
 }
 
 
-inline bool operator!=(const cell& a, const cell& b)
+inline bool Foam::operator!=(const cell& a, const cell& b)
 {
     return (!(a == b));
 }
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index 502e3e3eec..b34f838b6a 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -588,22 +588,19 @@ Foam::vector Foam::face::normal(const pointField& p) const
 Foam::face Foam::face::reverseFace() const
 {
     // reverse the label list and return
-    // Changed to make sure that the starting point of the original
-    // and the reverse face is identical.
-    //
-
-    const labelList& myList = *this;
+    // The starting points of the original and reverse face are identical.
 
+    const labelList& f = *this;
     labelList newList(size());
 
-    newList[0] = myList[0];
+    newList[0] = f[0];
 
     for (label pointI = 1; pointI < newList.size(); pointI++)
     {
-        newList[pointI] = myList[size() - pointI];
+        newList[pointI] = f[size() - pointI];
     }
 
-    return face(newList);
+    return face(xferMove(newList));
 }
 
 
@@ -643,7 +640,6 @@ Foam::scalar Foam::face::sweptVol
     label nPoints = size();
 
     point nextOldPoint = centreOldPoint;
-
     point nextNewPoint = centreNewPoint;
 
     register label pI;
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.H b/src/OpenFOAM/meshes/meshShapes/face/face.H
index 4d74a2536a..fe9570e2b9 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.H
@@ -138,6 +138,9 @@ public:
         //- Construct from labelList
         explicit inline face(const labelList&);
 
+        //- Construct by transferring the parameter contents
+        explicit inline face(const xfer<labelList>&);
+
         //- Construct from Istream
         inline face(Istream&);
 
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceI.H b/src/OpenFOAM/meshes/meshShapes/face/faceI.H
index ce8fab30e3..50d1787a00 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceI.H
@@ -24,20 +24,17 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // Edge to the right of face vertex i
-inline label face::right(const label i) const
+inline Foam::label Foam::face::right(const label i) const
 {
     return i;
 }
 
 
 // Edge to the left of face vertex i
-inline label face::left(const label i) const
+inline Foam::label Foam::face::left(const label i) const
 {
     return i == 0 ? size() - 1 : (i - 1);
 }
@@ -46,26 +43,32 @@ inline label face::left(const label i) const
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Construct NULL
-inline face::face()
+inline Foam::face::face()
 {}
 
 
 // Construct given size
-inline face::face(label s)
+inline Foam::face::face(label s)
 :
     labelList(s, -1)
 {}
 
 
 // Construct from components
-inline face::face(const labelList& l)
+inline Foam::face::face(const labelList& lst)
 :
-    labelList(l)
+    labelList(lst)
+{}
+
+// Construct from components
+inline Foam::face::face(const xfer<labelList>& lst)
+:
+    labelList(lst)
 {}
 
 
 // Construct from Istream
-inline face::face(Istream& is)
+inline Foam::face::face(Istream& is)
 {
     is >> *this;
 }
@@ -73,7 +76,7 @@ inline face::face(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline pointField face::points(const pointField& meshPoints) const
+inline Foam::pointField Foam::face::points(const pointField& meshPoints) const
 {
     // There are as many points as there labels for them
     pointField p(size());
@@ -90,34 +93,34 @@ inline pointField face::points(const pointField& meshPoints) const
 }
 
 
-inline scalar face::mag(const pointField& p) const
+inline Foam::scalar Foam::face::mag(const pointField& p) const
 {
     return ::Foam::mag(normal(p));
 }
 
 
-inline label face::nEdges() const
+inline Foam::label Foam::face::nEdges() const
 {
     // for a closed polygon a number of edges is the same as number of points
     return size();
 }
 
 
-inline edge face::faceEdge(const label n) const
+inline Foam::edge Foam::face::faceEdge(const label n) const
 {
     return edge(operator[](n), operator[](fcIndex(n)));
 }
 
 
 // Next vertex on face
-inline label face::nextLabel(const label i) const
+inline Foam::label Foam::face::nextLabel(const label i) const
 {
     return operator[](fcIndex(i));
 }
 
 
 // Previous vertex on face
-inline label face::prevLabel(const label i) const
+inline Foam::label Foam::face::prevLabel(const label i) const
 {
     return operator[](rcIndex(i));
 }
@@ -125,13 +128,13 @@ inline label face::prevLabel(const label i) const
 
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
-inline bool operator==(const face& a, const face& b)
+inline bool Foam::operator==(const face& a, const face& b)
 {
     return face::compare(a,b) != 0;
 }
 
 
-inline bool operator!=(const face& a, const face& b)
+inline bool Foam::operator!=(const face& a, const face& b)
 {
     return face::compare(a,b) == 0;
 }
@@ -139,7 +142,7 @@ inline bool operator!=(const face& a, const face& b)
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-inline Istream& operator>>(Istream& is, face& f)
+inline Foam::Istream& Foam::operator>>(Istream& is, face& f)
 {
     if (is.version() == IOstream::originalVersion)
     {
@@ -166,9 +169,4 @@ inline Istream& operator>>(Istream& is, face& f)
     return is;
 }
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCell.H b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCell.H
index 67f4a9e789..5088ece8b5 100644
--- a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCell.H
+++ b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCell.H
@@ -32,6 +32,7 @@ Description
     class, a tetrahedron cell shape model and a tetCell
 
 SourceFiles
+    tetCell.C
     tetCellI.H
 
 \*---------------------------------------------------------------------------*/
@@ -77,6 +78,9 @@ public:
             const label d
         );
 
+        //- Construct from FixedList
+        inline tetCell(const FixedList<label, 4>&);
+
         //- Construct from Istream
         inline tetCell(Istream&);
 
diff --git a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H
index 1f424e39ea..d935bd7402 100644
--- a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H
+++ b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H
@@ -56,6 +56,12 @@ inline tetCell::tetCell
 }
 
 
+inline tetCell::tetCell(const FixedList<label, 4>& lst)
+:
+    FixedList<label, 4>(lst)
+{}
+
+
 inline tetCell::tetCell(Istream& is)
 :
     FixedList<label, 4>(is)
@@ -130,7 +136,7 @@ inline label tetCell::edgeAdjacentFace
         {3, -1, -1, 0},
         {1, 0, -1, -1}
     };
-    
+
 #   ifdef FULLDEBUG
     if (facei >= 4)
     {
@@ -161,7 +167,7 @@ inline edge tetCell::tetEdge(const label edgei) const
 {
     // Warning. Ordering of edges needs to be the same for a tetrahedron
     // class, a tetrahedron cell shape model and a tetCell
-    // 
+    //
     static const label start[] = {0, 0, 0, 3, 1, 3};
     static const label end[] = {1, 2, 3, 1, 2, 2};
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 31ff85bf2c..0b1e679013 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -230,7 +230,7 @@ Foam::polyMesh::polyMesh(const IOobject& io)
     }
     else
     {
-        cellIOList c
+        cellIOList cLst
         (
             IOobject
             (
@@ -243,9 +243,8 @@ Foam::polyMesh::polyMesh(const IOobject& io)
             )
         );
 
-
         // Set the primitive mesh
-        initMesh(c);
+        initMesh(cLst);
 
         owner_.write();
         neighbour_.write();
@@ -271,162 +270,6 @@ Foam::polyMesh::polyMesh(const IOobject& io)
 }
 
 
-Foam::polyMesh::polyMesh
-(
-    const IOobject& io,
-    const pointField& points,
-    const faceList& faces,
-    const labelList& owner,
-    const labelList& neighbour,
-    const bool syncPar
-)
-:
-    objectRegistry(io),
-    primitiveMesh(),
-    points_
-    (
-        IOobject
-        (
-            "points",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        points
-    ),
-    faces_
-    (
-        IOobject
-        (
-            "faces",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        faces
-    ),
-    owner_
-    (
-        IOobject
-        (
-            "owner",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        owner
-    ),
-    neighbour_
-    (
-        IOobject
-        (
-            "neighbour",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        neighbour
-    ),
-    clearedPrimitives_(false),
-    boundary_
-    (
-        IOobject
-        (
-            "boundary",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        *this,
-        0
-    ),
-    bounds_(points_, syncPar),
-    directions_(Vector<label>::zero),
-    pointZones_
-    (
-        IOobject
-        (
-            "pointZones",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        *this,
-        0
-    ),
-    faceZones_
-    (
-        IOobject
-        (
-            "faceZones",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        *this,
-        0
-    ),
-    cellZones_
-    (
-        IOobject
-        (
-            "cellZones",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        *this,
-        0
-    ),
-    globalMeshDataPtr_(NULL),
-    moving_(false),
-    changing_(false),
-    curMotionTimeIndex_(time().timeIndex()),
-    oldPointsPtr_(NULL)
-{
-    // Check if the faces and cells are valid
-    forAll (faces_, faceI)
-    {
-        const face& curFace = faces_[faceI];
-
-        if (min(curFace) < 0 || max(curFace) > points_.size())
-        {
-            FatalErrorIn
-            (
-                "polyMesh::polyMesh\n"
-                "(\n"
-                "    const IOobject& io,\n"
-                "    const pointField& points,\n"
-                "    const faceList& faces,\n"
-                "    const cellList& cells\n"
-                ")\n"
-            )   << "Face " << faceI << "contains vertex labels out of range: "
-                << curFace << " Max point index = " << points_.size()
-                << abort(FatalError);
-        }
-    }
-
-    // Set the primitive mesh
-    initMesh();
-}
-
-
 Foam::polyMesh::polyMesh
 (
     const IOobject& io,
@@ -583,183 +426,6 @@ Foam::polyMesh::polyMesh
 }
 
 
-Foam::polyMesh::polyMesh
-(
-    const IOobject& io,
-    const pointField& points,
-    const faceList& faces,
-    const cellList& cells,
-    const bool syncPar
-)
-:
-    objectRegistry(io),
-    primitiveMesh(),
-    points_
-    (
-        IOobject
-        (
-            "points",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        points
-    ),
-    faces_
-    (
-        IOobject
-        (
-            "faces",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        faces
-    ),
-    owner_
-    (
-        IOobject
-        (
-            "owner",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        0
-    ),
-    neighbour_
-    (
-        IOobject
-        (
-            "neighbour",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        0
-    ),
-    clearedPrimitives_(false),
-    boundary_
-    (
-        IOobject
-        (
-            "boundary",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        *this,
-        0
-    ),
-    bounds_(points_, syncPar),
-    directions_(Vector<label>::zero),
-    pointZones_
-    (
-        IOobject
-        (
-            "pointZones",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        *this,
-        0
-    ),
-    faceZones_
-    (
-        IOobject
-        (
-            "faceZones",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        *this,
-        0
-    ),
-    cellZones_
-    (
-        IOobject
-        (
-            "cellZones",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        *this,
-        0
-    ),
-    globalMeshDataPtr_(NULL),
-    moving_(false),
-    changing_(false),
-    curMotionTimeIndex_(time().timeIndex()),
-    oldPointsPtr_(NULL)
-{
-    // Check if the faces and cells are valid
-    forAll (faces_, faceI)
-    {
-        const face& curFace = faces_[faceI];
-
-        if (min(curFace) < 0 || max(curFace) > points_.size())
-        {
-            FatalErrorIn
-            (
-                "polyMesh::polyMesh\n"
-                "(\n"
-                "    const IOobject& io,\n"
-                "    const pointField& points,\n"
-                "    const faceList& faces,\n"
-                "    const cellList& cells\n"
-                ")\n"
-            )   << "Face " << faceI << "contains vertex labels out of range: "
-                << curFace << " Max point index = " << points_.size()
-                << abort(FatalError);
-        }
-    }
-
-    // Check if the faces and cells are valid
-    forAll (cells, cellI)
-    {
-        const cell& curCell = cells[cellI];
-
-        if (min(curCell) < 0 || max(curCell) > faces_.size())
-        {
-            FatalErrorIn
-            (
-                "polyMesh::polyMesh\n"
-                "(\n"
-                "    const IOobject& io,\n"
-                "    const pointField& points,\n"
-                "    const faceList& faces,\n"
-                "    const cellList& cells\n"
-                ")\n"
-            )   << "Cell " << cellI << "contains face labels out of range: "
-                << curCell << " Max face index = " << faces_.size()
-                << abort(FatalError);
-        }
-    }
-
-    // Set the primitive mesh
-    initMesh(const_cast<cellList&>(cells));
-}
-
-
 Foam::polyMesh::polyMesh
 (
     const IOobject& io,
@@ -910,7 +576,8 @@ Foam::polyMesh::polyMesh
         }
     }
 
-    const cellList& cLst = cells();
+    // transfer in cell list
+    cellList cLst(cells);
 
     // Check if cells are valid
     forAll (cLst, cellI)
@@ -935,130 +602,12 @@ Foam::polyMesh::polyMesh
     }
 
     // Set the primitive mesh
-    initMesh(cells);
+    initMesh(cLst);
 }
 
 
 void Foam::polyMesh::resetPrimitives
 (
-    const label nUsedFaces,
-    const pointField& points,
-    const faceList& faces,
-    const labelList& owner,
-    const labelList& neighbour,
-    const labelList& patchSizes,
-    const labelList& patchStarts,
-    const bool validBoundary
-)
-{
-    // Clear addressing. Keep geometric props for mapping.
-    clearAddressing();
-
-    // Take over new primitive data. Note extra optimization to prevent
-    // assignment to self.
-    if (&points_ != &points)
-    {
-        points_ = points;
-        bounds_ = boundBox(points_, validBoundary);
-    }
-    if (&faces_ != &faces)
-    {
-        faces_ = faces;
-    }
-    if (&owner_ != &owner)
-    {
-        owner_ = owner;
-    }
-    if (&neighbour_ != &neighbour)
-    {
-        neighbour_ = neighbour;
-    }
-
-    // Reset patch sizes and starts
-    forAll(boundary_, patchI)
-    {
-        boundary_[patchI] = polyPatch
-        (
-            boundary_[patchI].name(),
-            patchSizes[patchI],
-            patchStarts[patchI],
-            patchI,
-            boundary_
-        );
-    }
-
-
-    // Flags the mesh files as being changed
-    setInstance(time().timeName());
-
-    // Check if the faces and cells are valid
-    forAll (faces_, faceI)
-    {
-        const face& curFace = faces_[faceI];
-
-        if (min(curFace) < 0 || max(curFace) > points_.size())
-        {
-            FatalErrorIn
-            (
-                "polyMesh::polyMesh::resetPrimitives\n"
-                "(\n"
-                "    const label nUsedFaces,\n"
-                "    const pointField& points,\n"
-                "    const faceList& faces,\n"
-                "    const labelList& owner,\n"
-                "    const labelList& neighbour,\n"
-                "    const labelList& patchSizes,\n"
-                "    const labelList& patchStarts\n"
-                ")\n"
-            )   << "Face " << faceI << " contains vertex labels out of range: "
-                << curFace << " Max point index = " << points_.size()
-                << abort(FatalError);
-        }
-    }
-
-
-    // Set the primitive mesh from the owner_, neighbour_. Works
-    // out from patch end where the active faces stop.
-    initMesh();
-
-
-    if (validBoundary)
-    {
-        // Note that we assume that all the patches stay the same and are
-        // correct etc. so we can already use the patches to do
-        // processor-processor comms.
-
-        // Calculate topology for the patches (processor-processor comms etc.)
-        boundary_.updateMesh();
-
-        // Calculate the geometry for the patches (transformation tensors etc.)
-        boundary_.calcGeometry();
-
-        // Warn if global empty mesh (constructs globalData!)
-        if (globalData().nTotalPoints() == 0 || globalData().nTotalCells() == 0)
-        {
-            FatalErrorIn
-            (
-                "polyMesh::polyMesh::resetPrimitives\n"
-                "(\n"
-                "    const label nUsedFaces,\n"
-                "    const pointField& points,\n"
-                "    const faceList& faces,\n"
-                "    const labelList& owner,\n"
-                "    const labelList& neighbour,\n"
-                "    const labelList& patchSizes,\n"
-                "    const labelList& patchStarts\n"
-                ")\n"
-            )
-                << "no points or no cells in mesh" << endl;
-        }
-    }
-}
-
-
-void Foam::polyMesh::resetPrimitives
-(
-    const label nUsedFaces,
     const xfer<pointField>& points,
     const xfer<faceList>& faces,
     const xfer<labelList>& owner,
@@ -1072,12 +621,28 @@ void Foam::polyMesh::resetPrimitives
     clearAddressing();
 
     // Take over new primitive data.
-    points_.transfer(points());
-    bounds_ = boundBox(points_, validBoundary);
+    // Optimized to avoid overwriting data at all
+    if (&points)
+    {
+        points_.transfer(points());
+        bounds_ = boundBox(points_, validBoundary);
+    }
+
+    if (&faces)
+    {
+        faces_.transfer(faces());
+    }
+
+    if (&owner)
+    {
+        owner_.transfer(owner());
+    }
+
+    if (&neighbour)
+    {
+        neighbour_.transfer(neighbour());
+    }
 
-    faces_.transfer(faces());
-    owner_.transfer(owner());
-    neighbour_.transfer(neighbour());
 
     // Reset patch sizes and starts
     forAll(boundary_, patchI)
@@ -1107,7 +672,6 @@ void Foam::polyMesh::resetPrimitives
             (
                 "polyMesh::polyMesh::resetPrimitives\n"
                 "(\n"
-                "    const label nUsedFaces,\n"
                 "    const xfer<pointField>&,\n"
                 "    const xfer<faceList>&,\n"
                 "    const xfer<labelList>& owner,\n"
@@ -1122,8 +686,8 @@ void Foam::polyMesh::resetPrimitives
     }
 
 
-    // Set the primitive mesh from the owner_, neighbour_. Works
-    // out from patch end where the active faces stop.
+    // Set the primitive mesh from the owner_, neighbour_.
+    // Works out from patch end where the active faces stop.
     initMesh();
 
 
@@ -1146,7 +710,6 @@ void Foam::polyMesh::resetPrimitives
             (
                 "polyMesh::polyMesh::resetPrimitives\n"
                 "(\n"
-                "    const label nUsedFaces,\n"
                 "    const xfer<pointField>&,\n"
                 "    const xfer<faceList>&,\n"
                 "    const xfer<labelList>& owner,\n"
@@ -1306,9 +869,9 @@ void Foam::polyMesh::addZones
         (
             "void addZones\n"
             "(\n"
-            "    const List<pointZone*>& pz,\n"
-            "    const List<faceZone*>& fz,\n"
-            "    const List<cellZone*>& cz\n"
+            "    const List<pointZone*>&,\n"
+            "    const List<faceZone*>&,\n"
+            "    const List<cellZone*>&\n"
             ")"
         )   << "point, face or cell zone already exists"
             << abort(FatalError);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index d794705216..19ce87c2f0 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -116,8 +116,8 @@ private:
             //- Boundary mesh
             mutable polyBoundaryMesh boundary_;
 
-            //- Mesh bounding-box. created from points on construction
-            //  and updated when the mesh moves
+            //- Mesh bounding-box.
+            //  Created from points on construction, updated when the mesh moves
             boundBox bounds_;
 
             //- vector of valid directions in mesh
@@ -170,9 +170,6 @@ private:
         //- Initialise the polyMesh from the given set of cells
         void initMesh(cellList& c);
 
-        //- Initialise the polyMesh from the given set of cells
-        void initMesh(const xfer<cellList>& c);
-
         //- Calculate the valid directions in the mesh from the boundaries
         void calcDirections() const;
 
@@ -217,18 +214,6 @@ public:
         //- Construct from IOobject
         explicit polyMesh(const IOobject& io);
 
-        //- Construct without boundary from components.
-        //  Boundary is added using addPatches() member function
-        polyMesh
-        (
-            const IOobject& io,
-            const pointField& points,
-            const faceList& faces,
-            const labelList& owner,
-            const labelList& neighbour,
-            const bool syncPar = true
-        );
-
         //- Construct without boundary from components.
         //  Boundary is added using addPatches() member function
         polyMesh
@@ -241,17 +226,6 @@ public:
             const bool syncPar = true
         );
 
-        //- Construct without boundary with cells rather than owner/neighbour.
-        //  Boundary is added using addPatches() member function
-        polyMesh
-        (
-            const IOobject& io,
-            const pointField& points,
-            const faceList& faces,
-            const cellList& cells,
-            const bool syncPar = true
-        );
-
         //- Construct without boundary with cells rather than owner/neighbour.
         //  Boundary is added using addPatches() member function
         polyMesh
@@ -267,7 +241,7 @@ public:
         polyMesh
         (
             const IOobject& io,
-            const pointField& points,
+            const xfer<pointField>& points,
             const cellShapeList& shapes,
             const faceListList& boundaryFaces,
             const wordList& boundaryPatchNames,
@@ -460,24 +434,6 @@ public:
             //  patch ends at nActiveFaces) and change patches with addPatches.
             void resetPrimitives
             (
-                const label nUsedFaces,
-                const pointField& points,
-                const faceList& faces,
-                const labelList& owner,
-                const labelList& neighbour,
-                const labelList& patchSizes,
-                const labelList& patchStarts,
-                const bool validBoundary = true
-            );
-
-            //- Reset mesh primitive data. Assumes all patch info correct
-            //  (so does e.g. parallel communication). If not use
-            //  validBoundary=false
-            //  (still assumes patchStarts[0] = nInternalFaces and last
-            //  patch ends at nActiveFaces) and change patches with addPatches.
-            void resetPrimitives
-            (
-                const label nUsedFaces,
                 const xfer<pointField>& points,
                 const xfer<faceList>& faces,
                 const xfer<labelList>& owner,
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index 4818d3009c..19418a2311 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -39,7 +39,7 @@ Foam::labelListList Foam::polyMesh::cellShapePointCells
     const cellShapeList& c
 ) const
 {
-    List<DynamicList<label, primitiveMesh::cellsPerPoint_> > 
+    List<DynamicList<label, primitiveMesh::cellsPerPoint_> >
         pc(points().size());
 
     // For each cell
@@ -136,7 +136,7 @@ Foam::labelList Foam::polyMesh::facePatchFaceCells
 Foam::polyMesh::polyMesh
 (
     const IOobject& io,
-    const pointField& points,
+    const xfer<pointField>& points,
     const cellShapeList& cellsAsShapes,
     const faceListList& boundaryFaces,
     const wordList& boundaryPatchNames,
@@ -311,7 +311,7 @@ Foam::polyMesh::polyMesh
         // Insertion cannot be done in one go as the faces need to be
         // added into the list in the increasing order of neighbour
         // cells.  Therefore, all neighbours will be detected first
-        // and then added in the correct order.  
+        // and then added in the correct order.
 
         const faceList& curFaces = cellsFaceShapes[cellI];
 
@@ -414,8 +414,8 @@ Foam::polyMesh::polyMesh
                 (
                     "polyMesh::polyMesh\n"
                     "(\n"
-                    "    const IOobject& io,\n"
-                    "    const pointField& points,\n"
+                    "    const IOobject&,\n"
+                    "    const xfer<pointField>&,\n"
                     "    const cellShapeList& cellsAsShapes,\n"
                     "    const faceListList& boundaryFaces,\n"
                     "    const wordList& boundaryPatchTypes,\n"
@@ -472,8 +472,8 @@ Foam::polyMesh::polyMesh
                         (
                             "polyMesh::polyMesh\n"
                             "(\n"
-                            "    const IOobject& io,\n"
-                            "    const pointField& points,\n"
+                            "    const IOobject&,\n"
+                            "    const xfer<pointField>&,\n"
                             "    const cellShapeList& cellsAsShapes,\n"
                             "    const faceListList& boundaryFaces,\n"
                             "    const wordList& boundaryPatchTypes,\n"
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index e9a6d14069..8589047396 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -284,12 +284,28 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
             *this
         );
 
-        pointZones_.setSize(newPointZones.size());
-        forAll (pointZones_, pzI)
+        label oldSize = pointZones_.size();
+
+        if (newPointZones.size() <= pointZones_.size())
         {
-            pointZones_[pzI] = newPointZones[pzI];
+            pointZones_.setSize(newPointZones.size());
         }
 
+        // Reset existing ones
+        forAll (pointZones_, czI)
+        {
+            pointZones_[czI] = newPointZones[czI];
+        }
+
+        // Extend with extra ones
+        pointZones_.setSize(newPointZones.size());
+
+        for (label czI = oldSize; czI < newPointZones.size(); czI++)
+        {
+            pointZones_.set(czI, newPointZones[czI].clone(pointZones_));
+        }
+
+
         faceZoneMesh newFaceZones
         (
             IOobject
@@ -305,7 +321,14 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
             *this
         );
 
-        faceZones_.setSize(newFaceZones.size());
+        oldSize = faceZones_.size();
+
+        if (newFaceZones.size() <= faceZones_.size())
+        {
+            faceZones_.setSize(newFaceZones.size());
+        }
+
+        // Reset existing ones
         forAll (faceZones_, fzI)
         {
             faceZones_[fzI].resetAddressing
@@ -315,6 +338,15 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
             );
         }
 
+        // Extend with extra ones
+        faceZones_.setSize(newFaceZones.size());
+
+        for (label fzI = oldSize; fzI < newFaceZones.size(); fzI++)
+        {
+            faceZones_.set(fzI, newFaceZones[fzI].clone(faceZones_));
+        }
+
+
         cellZoneMesh newCellZones
         (
             IOobject
@@ -330,12 +362,28 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
             *this
         );
 
-        cellZones_.setSize(newCellZones.size());
+        oldSize = cellZones_.size();
+
+        if (newCellZones.size() <= cellZones_.size())
+        {
+            cellZones_.setSize(newCellZones.size());
+        }
+
+        // Reset existing ones
         forAll (cellZones_, czI)
         {
             cellZones_[czI] = newCellZones[czI];
         }
 
+        // Extend with extra ones
+        cellZones_.setSize(newCellZones.size());
+
+        for (label czI = oldSize; czI < newCellZones.size(); czI++)
+        {
+            cellZones_.set(czI, newCellZones[czI].clone(cellZones_));
+        }
+
+
         if (boundaryChanged)
         {
             return polyMesh::TOPO_PATCH_CHANGE;
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
index d4d74ee22d..b3baa5335e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
@@ -154,11 +154,4 @@ void Foam::polyMesh::initMesh(cellList& c)
     neighbour_.note() = meshInfo;
 }
 
-
-void Foam::polyMesh::initMesh(const xfer<cellList>& clst)
-{
-    initMesh(clst());
-}
-
-
 // ************************************************************************* //
diff --git a/src/conversion/meshReader/meshReader.C b/src/conversion/meshReader/meshReader.C
index d35429c8db..95447f904e 100644
--- a/src/conversion/meshReader/meshReader.C
+++ b/src/conversion/meshReader/meshReader.C
@@ -142,9 +142,9 @@ Foam::autoPtr<Foam::polyMesh> Foam::meshReader::mesh
                 "constant",
                 registry
             ),
-            points_,
-            meshFaces_,
-            cellPolys_
+            xferMove(points_),
+            xferMove(meshFaces_),
+            xferMove(cellPolys_)
         )
     );
 
@@ -166,14 +166,7 @@ void Foam::meshReader::writeMesh
     IOstream::streamFormat fmt
 ) const
 {
-    fileName meshDir = mesh.objectRegistry::path()/mesh.meshDir();
-
-    // remove some directories and files - this should be easier
-    mesh.removeFiles(mesh.instance());
-    if (dir(meshDir/"sets"))
-    {
-        rmDir(meshDir/"sets");
-    }
+    mesh.removeFiles();
 
     Info<< "Writing polyMesh" << endl;
     mesh.writeObject
diff --git a/src/conversion/polyDualMesh/polyDualMesh.C b/src/conversion/polyDualMesh/polyDualMesh.C
index 6a776e3b83..93a0088c84 100644
--- a/src/conversion/polyDualMesh/polyDualMesh.C
+++ b/src/conversion/polyDualMesh/polyDualMesh.C
@@ -1349,11 +1349,10 @@ void Foam::polyDualMesh::calcDual
     // Assign to mesh.
     resetPrimitives
     (
-        dualFaces.size(),
-        dualPoints,
-        dualFaces,
-        dualOwner,
-        dualNeighbour,
+        xferMove(dualPoints),
+        xferMove(dualFaces),
+        xferMove(dualOwner),
+        xferMove(dualNeighbour),
         patchSizes,
         patchStarts
     );
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index b04bc9101e..3adafa0dfa 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
@@ -959,7 +959,7 @@ void Foam::polyMeshAdder::mergeFaceZones
 )
 {
     zoneNames.setSize(fz0.size() + fz1.size());
-    
+
     append(fz0.names(), zoneNames);
 
     from1ToAll.setSize(fz1.size());
@@ -1041,7 +1041,7 @@ void Foam::polyMeshAdder::mergeCellZones
 )
 {
     zoneNames.setSize(cz0.size() + cz1.size());
-    
+
     append(cz0.names(), zoneNames);
 
     from1ToAll.setSize(cz1.size());
@@ -1168,7 +1168,7 @@ void Foam::polyMeshAdder::addZones
             mesh.pointZones()
         );
     }
-    
+
     List<faceZone*> fZones(fzFaces.size());
     forAll(fZones, i)
     {
@@ -1398,10 +1398,10 @@ Foam::autoPtr<Foam::polyMesh> Foam::polyMeshAdder::add
         new polyMesh
         (
             io,
-            allPoints,
-            allFaces,
-            allOwner,
-            allNeighbour
+            xferMove(allPoints),
+            xferMove(allFaces),
+            xferMove(allOwner),
+            xferMove(allNeighbour)
         )
     );
     polyMesh& mesh = tmesh();
@@ -1557,7 +1557,7 @@ Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::polyMeshAdder::add
 
     // Inplace extend mesh0 patches (note that patches0.size() now also
     // has changed)
-    polyBoundaryMesh& allPatches = 
+    polyBoundaryMesh& allPatches =
         const_cast<polyBoundaryMesh&>(mesh0.boundaryMesh());
     allPatches.setSize(allPatchNames.size());
 
@@ -1702,11 +1702,10 @@ Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::polyMeshAdder::add
     mesh0.resetMotion();    // delete any oldPoints.
     mesh0.resetPrimitives
     (
-        allFaces.size(),
-        allPoints,
-        allFaces,
-        allOwner,
-        allNeighbour,
+        xferMove(allPoints),
+        xferMove(allFaces),
+        xferMove(allOwner),
+        xferMove(allNeighbour),
         patchSizes,     // size
         patchStarts,    // patchstarts
         validBoundary   // boundary valid?
@@ -1792,7 +1791,7 @@ Foam::Map<Foam::label> Foam::polyMeshAdder::findSharedPoints
         }
     }
 
-    
+
     // Assign single master for every shared with multiple geometric points
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index 38ce05f6c7..d8611fae13 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -852,7 +852,7 @@ void Foam::polyTopoChange::compact
                                     << " at position " << faceI << endl
                                     << "Probably face has not been adapted for"
                                     << " removed points." << abort(FatalError);
-                            } 
+                            }
                             localPointMap[pointI] = newPointI++;
                         }
                     }
@@ -904,7 +904,7 @@ void Foam::polyTopoChange::compact
                                     << " at position " << faceI << endl
                                     << "Probably face has not been adapted for"
                                     << " removed points." << abort(FatalError);
-                            } 
+                            }
                             localPointMap[pointI] = newPointI++;
                         }
                     }
@@ -2097,29 +2097,20 @@ Foam::polyTopoChange::polyTopoChange
 
 void Foam::polyTopoChange::clear()
 {
-    points_.clear();
-    points_.setSize(0);
-    pointMap_.clear();
-    pointMap_.setSize(0);
-    reversePointMap_.clear();
-    reversePointMap_.setSize(0);
+    points_.clearStorage();
+    pointMap_.clearStorage();
+    reversePointMap_.clearStorage();
     pointZone_.clear();
     pointZone_.resize(0);
     retiredPoints_.clear();
     retiredPoints_.resize(0);
 
-    faces_.clear();
-    faces_.setSize(0);
-    region_.clear();
-    region_.setSize(0);
-    faceOwner_.clear();
-    faceOwner_.setSize(0);
-    faceNeighbour_.clear();
-    faceNeighbour_.setSize(0);
-    faceMap_.clear();
-    faceMap_.setSize(0);
-    reverseFaceMap_.clear();
-    reverseFaceMap_.setSize(0);
+    faces_.clearStorage();
+    region_.clearStorage();
+    faceOwner_.clearStorage();
+    faceNeighbour_.clearStorage();
+    faceMap_.clearStorage();
+    reverseFaceMap_.clearStorage();
     faceFromPoint_.clear();
     faceFromPoint_.resize(0);
     faceFromEdge_.clear();
@@ -2132,12 +2123,9 @@ void Foam::polyTopoChange::clear()
     faceZoneFlip_.resize(0);
     nActiveFaces_ = 0;
 
-    cellMap_.clear();
-    cellMap_.setSize(0);
-    reverseCellMap_.clear();
-    reverseCellMap_.setSize(0);
-    cellZone_.clear();
-    cellZone_.setSize(0);
+    cellMap_.clearStorage();
+    reverseCellMap_.clearStorage();
+    cellZone_.clearStorage();
     cellFromPoint_.clear();
     cellFromPoint_.resize(0);
     cellFromEdge_.clear();
@@ -2987,13 +2975,12 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
 
         mesh.resetPrimitives
         (
-            nActiveFaces_,
-            xferMove<pointField>(renumberedMeshPoints),
-            xferMove<faceList>(faces_),
-            xferMove<labelList>(faceOwner_),
-            xferMove<labelList>(faceNeighbour_),
-            xferMove<labelList>(patchSizes),
-            xferMove<labelList>(patchStarts),
+            xferMove(renumberedMeshPoints),
+            xferMoveTo<faceList>(faces_),
+            xferMoveTo<labelList>(faceOwner_),
+            xferMoveTo<labelList>(faceNeighbour_),
+            patchSizes,
+            patchStarts,
             syncParallel
         );
 
@@ -3004,13 +2991,12 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
         // Set new points.
         mesh.resetPrimitives
         (
-            nActiveFaces_,
-            xferMove<pointField>(newPoints),
-            xferMove<faceList>(faces_),
-            xferMove<labelList>(faceOwner_),
-            xferMove<labelList>(faceNeighbour_),
-            xferMove<labelList>(patchSizes),
-            xferMove<labelList>(patchStarts),
+            xferMove(newPoints),
+            xferMoveTo<faceList>(faces_),
+            xferMoveTo<labelList>(faceOwner_),
+            xferMoveTo<labelList>(faceNeighbour_),
+            patchSizes,
+            patchStarts,
             syncParallel
         );
         // Invalidate new points to go into map.
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
index 5ed6f9ba79..1eccbed5f2 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
@@ -431,17 +431,17 @@ public:
                 return faces_;
             }
 
-            const DynamicList<label>& region()const
+            const DynamicList<label>& region() const
             {
                 return region_;
             }
 
-            const DynamicList<label>& faceOwner()const
+            const DynamicList<label>& faceOwner() const
             {
                 return faceOwner_;
             }
 
-            const DynamicList<label>& faceNeighbour()const
+            const DynamicList<label>& faceNeighbour() const
             {
                 return faceNeighbour_;
             }
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencil.H b/src/finiteVolume/fvMesh/extendedStencil/extendedStencil.H
index 12d3179e62..25ba241f1e 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencil.H
@@ -131,7 +131,6 @@ public:
             const GeometricField<Type, fvPatchField, volMesh>& fld,
             const List<List<scalar> >& stencilWeights
         );
-
 };
 
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCFCStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCFCStencilObject.H
index 704f9a92d4..e36be07993 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCFCStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCFCStencilObject.H
@@ -70,10 +70,9 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~centredCFCStencilObject()
-        {}
+    //- Destructor
+    virtual ~centredCFCStencilObject()
+    {}
 };
 
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilTemplates.C
index 4aac55df75..ec024775d3 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilTemplates.C
@@ -128,7 +128,6 @@ Foam::extendedStencil::weightedSum
 
     // Boundaries. Either constrained or calculated so assign value
     // directly (instead of nicely using operator==)
-    /*
     typename GeometricField<Type, fvsPatchField, surfaceMesh>::
         GeometricBoundaryField& bSfCorr = sf.boundaryField();
 
@@ -136,22 +135,24 @@ Foam::extendedStencil::weightedSum
     {
         fvsPatchField<Type>& pSfCorr = bSfCorr[patchi];
 
-        label faceI = pSfCorr.patch().patch().start();
-
-        forAll(pSfCorr, i)
+        if (pSfCorr.coupled())
         {
-            const List<Type>& stField = stencilFld[faceI];
-            const List<scalar>& stWeight = stencilWeights[faceI];
+            label faceI = pSfCorr.patch().patch().start();
 
-            forAll(stField, j)
+            forAll(pSfCorr, i)
             {
-                pSfCorr[i] += stField[j]*stWeight[j];
-            }
+                const List<Type>& stField = stencilFld[faceI];
+                const List<scalar>& stWeight = stencilWeights[faceI];
 
-            faceI++;
+                forAll(stField, j)
+                {
+                    pSfCorr[i] += stField[j]*stWeight[j];
+                }
+
+                faceI++;
+            }
         }
     }
-    */
 
     return tsfCorr;
 }
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedUpwindStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/extendedUpwindStencilTemplates.C
index 1cfa79eaa5..00cd58e17d 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedUpwindStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedUpwindStencilTemplates.C
@@ -102,32 +102,35 @@ Foam::extendedUpwindStencil::weightedSum
     {
         fvsPatchField<Type>& pSfCorr = bSfCorr[patchi];
 
-        label faceI = pSfCorr.patch().patch().start();
-
-        forAll(pSfCorr, i)
+        if (pSfCorr.coupled())
         {
-            if (phi[faceI] > 0)
-            {
-                // Flux out of owner. Use upwind (= owner side) stencil.
-                const List<Type>& stField = ownFld[faceI];
-                const List<scalar>& stWeight = ownWeights[faceI];
+            label faceI = pSfCorr.patch().patch().start();
 
-                forAll(stField, j)
-                {
-                    pSfCorr[i] += stField[j]*stWeight[j];
-                }
-            }
-            else
+            forAll(pSfCorr, i)
             {
-                const List<Type>& stField = neiFld[faceI];
-                const List<scalar>& stWeight = neiWeights[faceI];
-
-                forAll(stField, j)
+                if (phi[faceI] > 0)
                 {
-                    pSfCorr[i] += stField[j]*stWeight[j];
+                    // Flux out of owner. Use upwind (= owner side) stencil.
+                    const List<Type>& stField = ownFld[faceI];
+                    const List<scalar>& stWeight = ownWeights[faceI];
+
+                    forAll(stField, j)
+                    {
+                        pSfCorr[i] += stField[j]*stWeight[j];
+                    }
                 }
+                else
+                {
+                    const List<Type>& stField = neiFld[faceI];
+                    const List<scalar>& stWeight = neiWeights[faceI];
+
+                    forAll(stField, j)
+                    {
+                        pSfCorr[i] += stField[j]*stWeight[j];
+                    }
+                }
+                faceI++;
             }
-            faceI++;
         }
     }
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellFaceCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellFaceCellStencil.H
index 93e9d9117a..67179e4607 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellFaceCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellFaceCellStencil.H
@@ -68,7 +68,6 @@ public:
 
         //- Construct from mesh
         explicit cellFaceCellStencil(const polyMesh& mesh);
-
 };
 
 
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 7fc9856c31..ff714d00eb 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -42,9 +42,9 @@ License
 #include "extendedLeastSquaresVectors.H"
 #include "extendedLeastSquaresVectors.H"
 #include "leastSquaresVectors.H"
-//#include "linearFitData.H"
-//#include "quadraticFitData.H"
-//#include "quadraticFitSnGradData.H"
+#include "CentredFitData.H"
+#include "linearFitPolynomial.H"
+#include "quadraticLinearFitPolynomial.H"
 #include "skewCorrectionVectors.H"
 
 #include "centredCECStencilObject.H"
@@ -89,15 +89,13 @@ void Foam::fvMesh::clearGeom()
     // Mesh motion flux cannot be deleted here because the old-time flux
     // needs to be saved.
 
-
     // Things geometry dependent that are not updated.
     volPointInterpolation::Delete(*this);
     extendedLeastSquaresVectors::Delete(*this);
     extendedLeastSquaresVectors::Delete(*this);
     leastSquaresVectors::Delete(*this);
-    //linearFitData::Delete(*this);
-    //quadraticFitData::Delete(*this);
-    //quadraticFitSnGradData::Delete(*this);
+    CentredFitData<linearFitPolynomial>::Delete(*this);
+    CentredFitData<quadraticLinearFitPolynomial>::Delete(*this);
     skewCorrectionVectors::Delete(*this);
 }
 
@@ -112,9 +110,8 @@ void Foam::fvMesh::clearAddressing()
     extendedLeastSquaresVectors::Delete(*this);
     extendedLeastSquaresVectors::Delete(*this);
     leastSquaresVectors::Delete(*this);
-    //linearFitData::Delete(*this);
-    //quadraticFitData::Delete(*this);
-    //quadraticFitSnGradData::Delete(*this);
+    CentredFitData<linearFitPolynomial>::Delete(*this);
+    CentredFitData<quadraticLinearFitPolynomial>::Delete(*this);
     skewCorrectionVectors::Delete(*this);
 
     centredCECStencilObject::Delete(*this);
@@ -228,38 +225,6 @@ Foam::fvMesh::fvMesh(const IOobject& io)
 }
 
 
-Foam::fvMesh::fvMesh
-(
-    const IOobject& io,
-    const pointField& points,
-    const faceList& faces,
-    const labelList& allOwner,
-    const labelList& allNeighbour,
-    const bool syncPar
-)
-:
-    polyMesh(io, points, faces, allOwner, allNeighbour, syncPar),
-    surfaceInterpolation(*this),
-    boundary_(*this),
-    lduPtr_(NULL),
-    curTimeIndex_(time().timeIndex()),
-    VPtr_(NULL),
-    V0Ptr_(NULL),
-    V00Ptr_(NULL),
-    SfPtr_(NULL),
-    magSfPtr_(NULL),
-    CPtr_(NULL),
-    CfPtr_(NULL),
-    phiPtr_(NULL)
-{
-    if (debug)
-    {
-        Info<< "Constructing fvMesh from components"
-            << endl;
-    }
-}
-
-
 Foam::fvMesh::fvMesh
 (
     const IOobject& io,
@@ -286,39 +251,7 @@ Foam::fvMesh::fvMesh
 {
     if (debug)
     {
-        Info<< "Constructing fvMesh from components"
-            << endl;
-    }
-}
-
-
-Foam::fvMesh::fvMesh
-(
-    const IOobject& io,
-    const pointField& points,
-    const faceList& faces,
-    const cellList& cells,
-    const bool syncPar
-)
-:
-    polyMesh(io, points, faces, cells, syncPar),
-    surfaceInterpolation(*this),
-    boundary_(*this),
-    lduPtr_(NULL),
-    curTimeIndex_(time().timeIndex()),
-    VPtr_(NULL),
-    V0Ptr_(NULL),
-    V00Ptr_(NULL),
-    SfPtr_(NULL),
-    magSfPtr_(NULL),
-    CPtr_(NULL),
-    CfPtr_(NULL),
-    phiPtr_(NULL)
-{
-    if (debug)
-    {
-        Info<< "Constructing fvMesh from components"
-            << endl;
+        Info<< "Constructing fvMesh from components" << endl;
     }
 }
 
@@ -348,8 +281,7 @@ Foam::fvMesh::fvMesh
 {
     if (debug)
     {
-        Info<< "Constructing fvMesh from components"
-            << endl;
+        Info<< "Constructing fvMesh from components" << endl;
     }
 }
 
@@ -364,7 +296,6 @@ Foam::fvMesh::~fvMesh()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Helper function for construction from pieces
 void Foam::fvMesh::addFvPatches
 (
     const List<polyPatch*> & p,
@@ -552,6 +483,30 @@ void Foam::fvMesh::mapFields(const mapPolyMesh& meshMap)
 }
 
 
+// Temporary helper function to call move points on
+// MeshObjects
+template<class Type>
+void MeshObjectMovePoints(const Foam::fvMesh& mesh)
+{
+    if
+    (
+        mesh.db().objectRegistry::foundObject<Type>
+        (
+            Type::typeName
+        )
+    )
+    {
+        const_cast<Type&>
+        (
+            mesh.db().objectRegistry::lookupObject<Type>
+            (
+                Type::typeName
+            )
+        ).movePoints();
+    }
+}
+
+
 Foam::tmp<Foam::scalarField> Foam::fvMesh::movePoints(const pointField& p)
 {
     // Grab old time volumes if the time has been incremented
@@ -642,133 +597,12 @@ Foam::tmp<Foam::scalarField> Foam::fvMesh::movePoints(const pointField& p)
 
     // Hack until proper callbacks. Below are all the fvMesh MeshObjects with a
     // movePoints function.
-
-    // volPointInterpolation
-    if
-    (
-        db().objectRegistry::foundObject<volPointInterpolation>
-        (
-            volPointInterpolation::typeName
-        )
-    )
-    {
-        const_cast<volPointInterpolation&>
-        (
-            db().objectRegistry::lookupObject<volPointInterpolation>
-            (
-                volPointInterpolation::typeName
-            )
-        ).movePoints();
-    }
-
-    // extendedLeastSquaresVectors
-    if
-    (
-        db().objectRegistry::foundObject<extendedLeastSquaresVectors>
-        (
-            extendedLeastSquaresVectors::typeName
-        )
-    )
-    {
-        const_cast<extendedLeastSquaresVectors&>
-        (
-            db().objectRegistry::lookupObject<extendedLeastSquaresVectors>
-            (
-                extendedLeastSquaresVectors::typeName
-            )
-        ).movePoints();
-    }
-
-    // leastSquaresVectors
-    if
-    (
-        db().objectRegistry::foundObject<leastSquaresVectors>
-        (
-            leastSquaresVectors::typeName
-        )
-    )
-    {
-        const_cast<leastSquaresVectors&>
-        (
-            db().objectRegistry::lookupObject<leastSquaresVectors>
-            (
-                leastSquaresVectors::typeName
-            )
-        ).movePoints();
-    }
-
-    //// linearFitData
-    //if
-    //(
-    //    db().objectRegistry::foundObject<linearFitData>
-    //    (
-    //        linearFitData::typeName
-    //    )
-    //)
-    //{
-    //    const_cast<linearFitData&>
-    //    (
-    //        db().objectRegistry::lookupObject<linearFitData>
-    //        (
-    //            linearFitData::typeName
-    //        )
-    //    ).movePoints();
-    //}
-
-    //// quadraticFitData
-    //if
-    //(
-    //    db().objectRegistry::foundObject<quadraticFitData>
-    //    (
-    //        quadraticFitData::typeName
-    //    )
-    //)
-    //{
-    //    const_cast<quadraticFitData&>
-    //    (
-    //        db().objectRegistry::lookupObject<quadraticFitData>
-    //        (
-    //            quadraticFitData::typeName
-    //        )
-    //    ).movePoints();
-    //}
-
-    //// quadraticFitSnGradData
-    //if
-    //(
-    //    db().objectRegistry::foundObject<quadraticFitSnGradData>
-    //    (
-    //        quadraticFitSnGradData::typeName
-    //    )
-    //)
-    //{
-    //    const_cast<quadraticFitSnGradData&>
-    //    (
-    //        db().objectRegistry::lookupObject<quadraticFitSnGradData>
-    //        (
-    //            quadraticFitSnGradData::typeName
-    //        )
-    //    ).movePoints();
-    //}
-
-    // skewCorrectionVectors
-    if
-    (
-        db().objectRegistry::foundObject<skewCorrectionVectors>
-        (
-            skewCorrectionVectors::typeName
-        )
-    )
-    {
-        const_cast<skewCorrectionVectors&>
-        (
-            db().objectRegistry::lookupObject<skewCorrectionVectors>
-            (
-                skewCorrectionVectors::typeName
-            )
-        ).movePoints();
-    }
-
+    MeshObjectMovePoints<volPointInterpolation>(*this);
+    MeshObjectMovePoints<extendedLeastSquaresVectors>(*this);
+    MeshObjectMovePoints<leastSquaresVectors>(*this);
+    MeshObjectMovePoints<CentredFitData<linearFitPolynomial> >(*this);
+    MeshObjectMovePoints<CentredFitData<quadraticLinearFitPolynomial> >(*this);
+    MeshObjectMovePoints<skewCorrectionVectors>(*this);
 
     return tsweptVols;
 }
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index d89b92a82d..c685751d22 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -93,7 +93,7 @@ class fvMesh
         //- Current time index for cell volumes
         //  Note.  The whole mechanism will be replaced once the
         //  dimensionedField is created and the dimensionedField
-        //  will take care of the old-time levels.  
+        //  will take care of the old-time levels.
         mutable label curTimeIndex_;
 
         //- Cell volumes old time level
@@ -168,18 +168,6 @@ public:
         //- Construct from IOobject
         explicit fvMesh(const IOobject& io);
 
-        //- Construct from components without boundary.
-        //  Boundary is added using addFvPatches() member function
-        fvMesh
-        (
-            const IOobject& io,
-            const pointField& points,
-            const faceList& faces,
-            const labelList& allOwner,
-            const labelList& allNeighbour,
-            const bool syncPar = true
-        );
-
         //- Construct from components without boundary.
         //  Boundary is added using addFvPatches() member function
         fvMesh
@@ -192,20 +180,7 @@ public:
             const bool syncPar = true
         );
 
-        //- Construct from components with cells rather than owner
-        //  and neighbourwithout boundary.
-        //  Boundary is added using addPatches() member function
-        fvMesh
-        (
-            const IOobject& io,
-            const pointField& points,
-            const faceList& faces,
-            const cellList& cells,
-            const bool syncPar = true
-        );
-
-        //- Construct from components with cells rather than owner
-        //  and neighbourwithout boundary.
+        //- Construct without boundary from cells rather than owner/neighbour.
         //  Boundary is added using addPatches() member function
         fvMesh
         (
@@ -252,7 +227,7 @@ public:
                 return *this;
             }
 
-            //- Return reference to name 
+            //- Return reference to name
             //  Note: name() is currently ambiguous due to derivation from
             //  surfaceInterpolation
             const word& name() const
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C
index dc8720ac89..dea1b41143 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C
@@ -43,6 +43,7 @@ Foam::CentredFitData<Polynomial>::CentredFitData
 )
 :
     MeshObject<fvMesh, CentredFitData<Polynomial> >(mesh),
+    stencil_(stencil),
     linearLimitFactor_(linearLimitFactor),
     centralWeight_(centralWeight),
 #   ifdef SPHERICAL_GEOMETRY
@@ -51,62 +52,29 @@ Foam::CentredFitData<Polynomial>::CentredFitData
     dim_(mesh.nGeometricD()),
 #   endif
     minSize_(Polynomial::nTerms(dim_)),
-    coeffs_(mesh.nInternalFaces())
+    coeffs_(mesh.nFaces())
 {
     if (debug)
     {
         Info<< "Contructing CentredFitData<Polynomial>" << endl;
     }
 
-    // check input
-    if (centralWeight_ < 1 - SMALL)
+    // Check input
+    if (linearLimitFactor > 1)
     {
         FatalErrorIn("CentredFitData<Polynomial>::CentredFitData")
-            << "centralWeight requested = " << centralWeight_
+            << "linearLimitFactor requested = " << linearLimitFactor
             << " should not be less than one"
             << exit(FatalError);
     }
 
-    if (minSize_ == 0)
-    {
-        FatalErrorIn("CentredFitSnGradData")
-            << " dimension must be 1,2 or 3, not" << dim_ << exit(FatalError);
-    }
-
-    // store the polynomial size for each cell to write out
-    surfaceScalarField interpPolySize
-    (
-        IOobject
-        (
-            "CentredFitInterpPolySize",
-            "constant",
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        mesh,
-        dimensionedScalar("CentredFitInterpPolySize", dimless, scalar(0))
-    );
-
-    // Get the cell/face centres in stencil order.
-    // Centred face stencils no good for triangles of tets. Need bigger stencils
-    List<List<point> > stencilPoints(mesh.nFaces());
-    stencil.collectData(mesh.C(), stencilPoints);
-
-    // find the fit coefficients for every face in the mesh
-
-    for(label faci = 0; faci < mesh.nInternalFaces(); faci++)
-    {
-        interpPolySize[faci] = calcFit(stencilPoints[faci], faci);
-    }
+    calcFit();
 
     if (debug)
     {
         Info<< "CentredFitData<Polynomial>::CentredFitData() :"
             << "Finished constructing polynomialFit data"
             << endl;
-
-        interpPolySize.write();
     }
 }
 
@@ -120,15 +88,14 @@ void Foam::CentredFitData<Polynomial>::findFaceDirs
     vector& jdir,        // value changed in return
     vector& kdir,        // value changed in return
     const fvMesh& mesh,
-    const label faci
+    const label facei
 )
 {
-    idir = mesh.Sf()[faci];
-    //idir = mesh.C()[mesh.neighbour()[faci]] - mesh.C()[mesh.owner()[faci]];
+    idir = mesh.faceAreas()[facei];
     idir /= mag(idir);
 
 #   ifndef SPHERICAL_GEOMETRY
-    if (mesh.nGeometricD() <= 2) // find the normal direcion
+    if (mesh.nGeometricD() <= 2) // find the normal direction
     {
         if (mesh.directions()[0] == -1)
         {
@@ -143,14 +110,14 @@ void Foam::CentredFitData<Polynomial>::findFaceDirs
             kdir = vector(0, 0, 1);
         }
     }
-    else // 3D so find a direction in the place of the face
+    else // 3D so find a direction in the plane of the face
     {
-        const face& f = mesh.faces()[faci];
-        kdir = mesh.points()[f[0]] - mesh.points()[f[1]];
+        const face& f = mesh.faces()[facei];
+        kdir = mesh.points()[f[0]] - mesh.faceCentres()[facei];
     }
 #   else
     // Spherical geometry so kdir is the radial direction
-    kdir = mesh.Cf()[faci];
+    kdir = mesh.faceCentres()[facei];
 #   endif
 
     if (mesh.nGeometricD() == 3)
@@ -175,17 +142,58 @@ void Foam::CentredFitData<Polynomial>::findFaceDirs
 }
 
 
+template<class Polynomial>
+void Foam::CentredFitData<Polynomial>::calcFit()
+{
+    const fvMesh& mesh = this->mesh();
+
+    // Get the cell/face centres in stencil order.
+    // Centred face stencils no good for triangles of tets.
+    // Need bigger stencils
+    List<List<point> > stencilPoints(mesh.nFaces());
+    stencil_.collectData(mesh.C(), stencilPoints);
+
+    // find the fit coefficients for every face in the mesh
+
+    const surfaceScalarField& w = this->mesh().surfaceInterpolation::weights();
+
+    for(label facei = 0; facei < mesh.nInternalFaces(); facei++)
+    {
+        calcFit(stencilPoints[facei], w[facei], facei);
+    }
+
+    const surfaceScalarField::GeometricBoundaryField& bw = w.boundaryField();
+
+    forAll(bw, patchi)
+    {
+        const fvsPatchScalarField& pw = bw[patchi];
+
+        if (pw.coupled())
+        {
+            label facei = pw.patch().patch().start();
+
+            forAll(pw, i)
+            {
+                calcFit(stencilPoints[facei], pw[i], facei);
+                facei++;
+            }
+        }
+    }
+}
+
+
 template<class Polynomial>
 Foam::label Foam::CentredFitData<Polynomial>::calcFit
 (
     const List<point>& C,
-    const label faci
+    const scalar wLin,
+    const label facei
 )
 {
     vector idir(1,0,0);
     vector jdir(0,1,0);
     vector kdir(0,0,1);
-    findFaceDirs(idir, jdir, kdir, this->mesh(), faci);
+    findFaceDirs(idir, jdir, kdir, this->mesh(), facei);
 
     // Setup the point weights
     scalarList wts(C.size(), scalar(1));
@@ -193,7 +201,7 @@ Foam::label Foam::CentredFitData<Polynomial>::calcFit
     wts[1] = centralWeight_;
 
     // Reference point
-    point p0 = this->mesh().faceCentres()[faci];
+    point p0 = this->mesh().faceCentres()[facei];
 
     // p0 -> p vector in the face-local coordinate system
     vector d;
@@ -235,13 +243,10 @@ Foam::label Foam::CentredFitData<Polynomial>::calcFit
 
     // Set the fit
     label stencilSize = C.size();
-    coeffs_[faci].setSize(stencilSize);
+    coeffs_[facei].setSize(stencilSize);
     scalarList singVals(minSize_);
     label nSVDzeros = 0;
 
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>& w =
-        this->mesh().surfaceInterpolation::weights();
-
     bool goodFit = false;
     for(int iIt = 0; iIt < 10 && !goodFit; iIt++)
     {
@@ -251,11 +256,11 @@ Foam::label Foam::CentredFitData<Polynomial>::calcFit
         scalar fit1 = wts[1]*svd.VSinvUt()[0][1];
 
         goodFit =
-            (mag(fit0 - w[faci]) < linearLimitFactor_*w[faci])
-         && (mag(fit1 - (1 - w[faci])) < linearLimitFactor_*(1 - w[faci]));
+            (mag(fit0 - wLin) < linearLimitFactor_*wLin)
+         && (mag(fit1 - (1 - wLin)) < linearLimitFactor_*(1 - wLin));
 
-        //scalar w0Err = fit0/w[faci];
-        //scalar w1Err = fit1/(1 - w[faci]);
+        //scalar w0Err = fit0/wLin;
+        //scalar w1Err = fit1/(1 - wLin);
 
         //goodFit =
         //    (w0Err > linearLimitFactor_ && w0Err < (1 + linearLimitFactor_))
@@ -263,12 +268,12 @@ Foam::label Foam::CentredFitData<Polynomial>::calcFit
 
         if (goodFit)
         {
-            coeffs_[faci][0] = fit0;
-            coeffs_[faci][1] = fit1;
+            coeffs_[facei][0] = fit0;
+            coeffs_[facei][1] = fit1;
 
             for(label i=2; i<stencilSize; i++)
             {
-                coeffs_[faci][i] = wts[i]*svd.VSinvUt()[0][i];
+                coeffs_[facei][i] = wts[i]*svd.VSinvUt()[0][i];
             }
 
             singVals = svd.S();
@@ -300,22 +305,24 @@ Foam::label Foam::CentredFitData<Polynomial>::calcFit
         // (
         //     min
         //     (
-        //         min(alpha - beta*mag(coeffs_[faci][0] - w[faci])/w[faci], 1),
-        //         min(alpha - beta*mag(coeffs_[faci][1] - (1 - w[faci]))/(1 - w[faci]), 1)
+        //         min(alpha - beta*mag(coeffs_[facei][0] - wLin)/wLin, 1),
+        //         min(alpha - beta*mag(coeffs_[facei][1] - (1 - wLin))
+        //       /(1 - wLin), 1)
         //     ), 0
         // );
 
-        //Info<< w[faci] << " " << coeffs_[faci][0] << " " << (1 - w[faci]) << " " << coeffs_[faci][1] << endl;
+        //Info<< wLin << " " << coeffs_[facei][0]
+        //    << " " << (1 - wLin) << " " << coeffs_[facei][1] << endl;
 
-        // Remove the uncorrected linear coefficients
-        coeffs_[faci][0] -= w[faci];
-        coeffs_[faci][1] -= 1 - w[faci];
+        // Remove the uncorrected linear ocefficients
+        coeffs_[facei][0] -= wLin;
+        coeffs_[facei][1] -= 1 - wLin;
 
         // if (limiter < 0.99)
         // {
         //     for(label i = 0; i < stencilSize; i++)
         //     {
-        //         coeffs_[faci][i] *= limiter;
+        //         coeffs_[facei][i] *= limiter;
         //     }
         // }
     }
@@ -326,16 +333,16 @@ Foam::label Foam::CentredFitData<Polynomial>::calcFit
             WarningIn
             (
                 "CentredFitData<Polynomial>::calcFit"
-                "(const List<point>& C, const label faci"
-            )   << "Could not fit face " << faci
+                "(const List<point>& C, const label facei"
+            )   << "Could not fit face " << facei
                 << ", reverting to linear." << nl
                 << "    Weights "
-                << coeffs_[faci][0] << " " << w[faci] << nl
+                << coeffs_[facei][0] << " " << wLin << nl
                 << "    Linear weights "
-                << coeffs_[faci][1] << " " << 1 - w[faci] << endl;
+                << coeffs_[facei][1] << " " << 1 - wLin << endl;
         }
 
-        coeffs_[faci] = 0;
+        coeffs_[facei] = 0;
     }
 
     return minSize_ - nSVDzeros;
@@ -345,8 +352,7 @@ Foam::label Foam::CentredFitData<Polynomial>::calcFit
 template<class Polynomial>
 bool Foam::CentredFitData<Polynomial>::movePoints()
 {
-    notImplemented("CentredFitData<Polynomial>::movePoints()");
-
+    calcFit();
     return true;
 }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.H
index c225642964..1630e06a92 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.H
@@ -57,6 +57,9 @@ class CentredFitData
 {
     // Private data
 
+        //- The stencil the fit is based on
+        const extendedCentredStencil& stencil_;
+
         //- Factor the fit is allowed to deviate from linear.
         //  This limits the amount of high-order correction and increases
         //  stability on bad meshes
@@ -88,7 +91,17 @@ class CentredFitData
             const label faci
         );
 
-        label calcFit(const List<point>&, const label faci);
+        //- Calculate the fit for the all the mesh faces
+        //  and set the coefficients
+        void calcFit();
+
+        //- Calculate the fit for the specified face and set the coefficients
+        label calcFit
+        (
+            const List<point>&,  // Stencil points
+            const scalar wLin,   // Linear weight
+            const label faci     // Current face index
+        );
 
 
 public:
diff --git a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
index 405bbb67e3..c4861bbfaf 100644
--- a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
+++ b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
@@ -237,7 +237,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 
             // Go through the points and start from the point used twice
             // check all the edges to find the edges starting from this point
-            // add the 
+            // add the
 
             labelListList edgesToInsert(singleEdges.size());
             label nEdgesToInsert = 0;
@@ -438,7 +438,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                 // Warning: the ordering must be parametric, because in
                 // the case of multiple point insertion onto the same edge
                 // it is possible to get non-cyclic loops
-                // 
+                //
 
                 const labelList& unorderedEdge = edgesToInsert[edgeToInsertI];
 
@@ -678,7 +678,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                                 << oldFaces[currentFaceIndex] << nl
                                 << "newFace: " << newFace << endl;
 #                           endif
- 
+
                             // Check for duplicate points in the new face
                             forAll (newFace, checkI)
                             {
@@ -756,11 +756,10 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
         // (patches guaranteed to be in increasing order)
         mesh.resetPrimitives
         (
-            patchStarts[bMesh.size()-1] + patchSizes[bMesh.size()-1],
-            mesh.points(),
-            newFaces,
-            mesh.faceOwner(),
-            mesh.faceNeighbour(),
+            xfer<pointField>::null(),
+            xferMove(newFaces),
+            xfer<labelList>::null(),
+            xfer<labelList>::null(),
             patchSizes,
             patchStarts,
             true                // boundary forms valid boundary mesh.
diff --git a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
index a42408e9bc..a3e499bd65 100644
--- a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
@@ -1904,8 +1904,8 @@ void Foam::distributedTriSurfaceMesh::distribute
         }
         else
         {
-            dict_.set("bounds", procBb_[Pstream::myProcNo()]);
             procBb_.transfer(newProcBb);
+            dict_.set("bounds", procBb_[Pstream::myProcNo()]);
         }
     }
 
@@ -2192,9 +2192,10 @@ bool Foam::distributedTriSurfaceMesh::writeObject
     // Make sure dictionary goes to same directory as surface
     const_cast<fileName&>(dict_.instance()) = searchableSurface::instance();
 
+    // Dictionary needs to be written in ascii - binary output not supported.
     return
         triSurfaceMesh::writeObject(fmt, ver, cmp)
-     && dict_.writeObject(fmt, ver, cmp);
+     && dict_.writeObject(IOstream::ASCII, ver, cmp);
 }
 
 
diff --git a/src/surfMesh/Make/files b/src/surfMesh/Make/files
new file mode 100644
index 0000000000..2bf476cb72
--- /dev/null
+++ b/src/surfMesh/Make/files
@@ -0,0 +1,23 @@
+keyedSurface/keyedSurface.C
+keyedSurface/keyedSurfaceCleanup.C
+keyedSurface/newKeyedSurface.C
+
+meshedSurface/meshedSurface.C
+meshedSurface/meshedSurfaceCleanup.C
+meshedSurface/newMeshedSurface.C
+
+fileFormats = keyedSurface/fileFormats
+$(fileFormats)/ac3d/AC3DfileFormat.C
+$(fileFormats)/gts/GTSfileFormat.C
+$(fileFormats)/nas/NASfileFormat.C
+$(fileFormats)/obj/OBJfileFormat.C
+$(fileFormats)/off/OFFfileFormat.C
+$(fileFormats)/smesh/SMESHfileFormat.C
+$(fileFormats)/starcd/STARCDfileFormat.C
+$(fileFormats)/stl/STLfileFormat.C
+$(fileFormats)/stl/STLfileFormatASCII.L
+$(fileFormats)/tri/TRIfileFormat.C
+$(fileFormats)/vtk/VTKfileFormat.C
+
+LIB = $(FOAM_LIBBIN)/libsurfMesh
+
diff --git a/src/surfMesh/Make/options b/src/surfMesh/Make/options
new file mode 100644
index 0000000000..45765759c1
--- /dev/null
+++ b/src/surfMesh/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+    -I$(LIB_SRC)/triSurface/lnInclude
+
+LIB_LIBS = \
+    -ltriSurface
diff --git a/src/surfMesh/keyedSurface/fileFormats/ac3d/AC3DfileFormat.C b/src/surfMesh/keyedSurface/fileFormats/ac3d/AC3DfileFormat.C
new file mode 100644
index 0000000000..d92b2f91df
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/ac3d/AC3DfileFormat.C
@@ -0,0 +1,588 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "AC3DfileFormat.H"
+#include "clock.H"
+#include "IFstream.H"
+#include "IStringStream.H"
+#include "tensor.H"
+#include "primitivePatch.H"
+#include "addToRunTimeSelectionTable.H"
+#include "addToMemberFunctionSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+namespace Foam
+{
+namespace fileFormats
+{
+
+addNamedToRunTimeSelectionTable
+(
+    keyedSurface,
+    AC3DfileFormat,
+    fileExtension,
+    ac
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    keyedSurface,
+    AC3DfileFormat,
+    write,
+    fileExtension,
+    ac
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    meshedSurface,
+    AC3DfileFormat,
+    write,
+    fileExtension,
+    ac
+);
+
+}
+}
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+Type Foam::fileFormats::AC3DfileFormat::parse(const string& str)
+{
+    IStringStream ss(str);
+
+    Type t;
+    ss >> t;
+    return t;
+}
+
+
+bool Foam::fileFormats::AC3DfileFormat::readCmd
+(
+    IFstream& is,
+    string& cmd,
+    string& args
+)
+{
+    if (is.good())
+    {
+        string line;
+        is.getLine(line);
+
+        string::size_type space = line.find(' ');
+
+        if (space != string::npos)
+        {
+            cmd  = line.substr(0, space);
+            args = line.substr(space+1);
+
+            return true;
+        }
+    }
+    return false;
+}
+
+
+// Read up to line starting with cmd. Sets args to rest of line.
+// Returns true if found, false if stream is not good anymore.
+bool Foam::fileFormats::AC3DfileFormat::cueTo
+(
+    IFstream& is,
+    const string& cmd,
+    string& args
+)
+{
+    while (is.good())
+    {
+        string line;
+        is.getLine(line);
+
+        string::size_type space = line.find(' ');
+
+        if (space != string::npos)
+        {
+            if (line.substr(0, space) == cmd)
+            {
+                args = line.substr(space+1);
+
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+
+// Similar to cueTo(), but throws error if cmd not found
+Foam::string Foam::fileFormats::AC3DfileFormat::cueToOrDie
+(
+    IFstream& is,
+    const string& cmd,
+    const string& errorMsg
+)
+{
+    string args;
+    if (!cueTo(is, cmd, args))
+    {
+        FatalErrorIn
+        (
+            "fileFormats::AC3DfileFormat::AC3DfileFormat"
+            "(const fileName&)"
+        )
+            << "Cannot find command " << cmd
+            << " " << errorMsg
+            << exit(FatalError);
+    }
+
+    return args;
+}
+
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fileFormats::AC3DfileFormat::AC3DfileFormat()
+:
+    Foam::keyedSurface()
+{}
+
+
+Foam::fileFormats::AC3DfileFormat::AC3DfileFormat
+(
+    const fileName& fName,
+    const bool triangulate
+)
+:
+    Foam::keyedSurface()
+{
+    IFstream is(fName);
+
+    if (!is.good())
+    {
+        FatalErrorIn
+        (
+            "fileFormats::AC3DfileFormat::AC3DfileFormat"
+            "(const fileName&)"
+        )
+            << "Cannot read file " << fName
+            << exit(FatalError);
+    }
+
+    string line, cmd, args;
+
+    is.getLine(line);
+
+    string version = line.substr(4);
+
+    if (version != "b")
+    {
+        WarningIn
+        (
+            "fileFormats::AC3DfileFormat::AC3DfileFormat"
+            "(const fileName&)"
+        )
+            << "When reading AC3D file " << fName
+            << " read header " << line << " with version "
+            << version << endl
+            << "Only tested reading with version 'b'."
+            << " This might give problems" << endl;
+    }
+
+
+    if (!cueTo(is, "OBJECT", args) || (args != "world"))
+    {
+        FatalErrorIn
+        (
+            "fileFormats::AC3DfileFormat::AC3DfileFormat"
+            "(const fileName&)"
+        )
+            << "Cannot find \"OBJECT world\" in file " << fName
+            << exit(FatalError);
+    }
+
+    // # of kids is the # of patches
+    args = cueToOrDie(is, "kids");
+    label nPatches = parse<int>(args);
+
+    // Start of vertices for object/patch
+    label patchVertOffset = 0;
+
+    DynamicList<point> pointLst;
+    DynamicList<keyedFace>  faceLst;
+
+    // patchId => patchName
+    Map<word> regionNames;
+
+    for (label patchI = 0; patchI < nPatches; ++patchI)
+    {
+        word patchName = word("patch") + Foam::name(patchI);
+
+        args = cueToOrDie(is, "OBJECT", "while reading " + patchName);
+
+        // number of vertices for this patch
+        label  nPatchPoints = 0;
+        vector location(pTraits<vector>::zero);
+        // tensor rotation(I);
+
+        // Read all info for current patch
+        while (is.good())
+        {
+            // Read line and get first word. If end of file break since
+            // patch should always end with 'kids' command ?not sure.
+            if (!readCmd(is, cmd, args))
+            {
+                FatalErrorIn
+                    (
+                        "fileFormats::AC3DfileFormat::AC3DfileFormat"
+                        "(const fileName&)"
+                    )
+                    << "Did not read up to \"kids 0\" while reading patch "
+                    << patchI << " from file " << fName
+                    << exit(FatalError);
+            }
+
+            if (cmd == "name")
+            {
+                // name %s
+                string str = parse<string>(args);
+                string::stripInvalid<word>(str);
+
+                patchName = str;
+            }
+            else if (cmd == "rot")
+            {
+                // rot  %f %f %f  %f %f %f  %f %f %f
+
+                // IStringStream lineStream(args);
+                //
+                // lineStream
+                //     >> rotation.xx() >> rotation.xy() >> rotation.xz()
+                //     >> rotation.yx() >> rotation.yy() >> rotation.yz()
+                //     >> rotation.zx() >> rotation.zy() >> rotation.zz();
+
+                WarningIn
+                (
+                    "fileFormats::AC3DfileFormat::AC3DfileFormat"
+                    "(const fileName&)"
+                )
+                    << "rot (rotation tensor) command not implemented"
+                    << "Line:" << cmd << ' ' << args << endl
+                    << "while reading patch " << patchI << endl;
+            }
+            else if (cmd == "loc")
+            {
+                // loc  %f %f %f
+                IStringStream lineStream(args);
+
+                lineStream
+                    >> location.x()
+                    >> location.y()
+                    >> location.z();
+            }
+            else if (cmd == "numvert")
+            {
+                // numvert  %d
+                nPatchPoints = parse<int>(args);
+
+                for (label vertI = 0; vertI < nPatchPoints; ++vertI)
+                {
+                    is.getLine(line);
+                    IStringStream lineStream(line);
+
+                    point pt;
+                    lineStream
+                        >> pt.x() >> pt.y() >> pt.z();
+
+                    // Offset with current translation vector
+                    pointLst.append(location + pt);
+                }
+            }
+            else if (cmd == "numsurf")
+            {
+                label nFaces = parse<int>(args);
+
+                for (label faceI = 0; faceI < nFaces; ++faceI)
+                {
+                    static string errorMsg =
+                        string(" while reading face ")
+                            + Foam::name(faceI) + " on patch "
+                            + Foam::name(patchI)
+                            + " from file " + fName;
+
+                    cueToOrDie(is, "SURF", errorMsg);
+                    cueToOrDie(is, "mat", errorMsg);
+                    args = cueToOrDie(is, "refs", errorMsg);
+
+                    label nVert = parse<int>(args);
+
+                    List<label> verts(nVert);
+                    forAll(verts, vertI)
+                    {
+                        is.getLine(line);
+                        verts[vertI] = parse<int>(line) + patchVertOffset;
+                    }
+
+                    if (triangulate && verts.size() > 3)
+                    {
+                        face fTri(3);
+
+                        // simple face triangulation about f[0].
+                        // cannot use face::triangulation
+                        // since points are incomplete
+                        fTri[0] = verts[0];
+                        for (label fp1 = 1; fp1 < verts.size() - 1; ++fp1)
+                        {
+                            label fp2 = (fp1 + 1) % verts.size();
+
+                            fTri[1] = verts[fp1];
+                            fTri[2] = verts[fp2];
+
+                            faceLst.append(keyedFace(fTri, patchI));
+                        }
+                    }
+                    else
+                    {
+                        faceLst.append(keyedFace(face(verts), patchI));
+                    }
+                }
+
+                // Done the current patch.
+                // Increment the offset vertices are stored at
+                patchVertOffset += nPatchPoints;
+            }
+            else if (cmd == "kids")
+            {
+                // 'kids' denotes the end of the current patch.
+                label nKids = parse<int>(args);
+
+                if (nKids != 0)
+                {
+                    FatalErrorIn
+                    (
+                        "fileFormats::AC3DfileFormat::AC3DfileFormat"
+                        "(const fileName&)"
+                    )
+                        << "Can only read objects without kids."
+                        << " Encountered " << nKids << " kids when"
+                        << " reading patch " << patchI
+                        << exit(FatalError);
+                }
+
+                // Done reading current patch
+                regionNames.insert(patchI, patchName);
+                break;
+            }
+        }
+    }
+
+    // transfer to normal lists
+    points().transfer(pointLst);
+    faces().transfer(faceLst);
+    setPatches(regionNames);
+    stitchFaces(SMALL);
+}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::fileFormats::AC3DfileFormat::writeHeader
+(
+    Ostream& os,
+    const List<surfacePatch>& patchLst
+)
+{
+    // Write with patches as separate objects under "world" object.
+    // Header is taken over from sample file.
+    // Defines separate materials for all patches. Recycle colours.
+
+    // Define 8 standard colours as r,g,b components
+    static scalar colourMap[] =
+    {
+        1, 1, 1,
+        1, 0, 0,
+        0, 1, 0,
+        0, 0, 1,
+        1, 1, 0,
+        0, 1, 1,
+        1, 0, 1,
+        0.5, 0.5, 1
+    };
+
+    // Write header. Define materials.
+    os  << "AC3Db" << nl;
+
+    forAll(patchLst, patchI)
+    {
+        const word& pName = patchLst[patchI].name();
+
+        label colourI = patchI % 8;
+        label colourCompI = 3 * colourI;
+
+        os  << "MATERIAL \"" << pName << "Mat\" rgb "
+            << colourMap[colourCompI] << ' ' << colourMap[colourCompI+1]
+            << ' ' << colourMap[colourCompI+2]
+            << "  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.5 0.5 0.5  shi 10"
+            << "  trans 0"
+            << nl;
+    }
+
+    os  << "OBJECT world" << nl
+        << "kids " << patchLst.size() << endl;
+}
+
+
+void Foam::fileFormats::AC3DfileFormat::write
+(
+    Ostream& os,
+    const keyedSurface& surf
+)
+{
+    labelList faceMap;
+    List<surfacePatch> patchLst = surf.sortedRegions(faceMap);
+
+    writeHeader(os, patchLst);
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        const surfacePatch& sp = patchLst[patchI];
+
+        os  << "OBJECT poly" << nl
+            << "name \"" << sp.name() << '"' << endl;
+
+        // Create patch with only patch faces included for ease of addressing
+        boolList include(surf.size(), false);
+
+        forAll(sp, patchFaceI)
+        {
+            const label faceI = faceMap[faceIndex++];
+
+            include[faceI] = true;
+        }
+
+        labelList pMap;
+        labelList fMap;
+
+        keyedSurface patch = surf.subsetMesh
+        (
+            include, pMap, fMap
+        );
+
+        // Now we have triSurface for this patch alone. Write it.
+        os << "numvert " << patch.nPoints() << endl;
+
+        forAll(patch.localPoints(), ptI)
+        {
+            const point& pt = patch.localPoints()[ptI];
+
+            os << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
+        }
+
+        os << "numsurf " << patch.localFaces().size() << endl;
+
+        forAll(patch.localFaces(), faceI)
+        {
+            const keyedFace& f = patch.localFaces()[faceI];
+
+            os  << "SURF 0x20" << nl          // polygon
+                << "mat " << patchI << nl
+                << "refs " << f.size() << nl;
+
+            forAll(f, fp)
+            {
+                os << f[fp] << " 0 0" << nl;
+            }
+        }
+
+        os << "kids 0" << endl;
+    }
+}
+
+
+void Foam::fileFormats::AC3DfileFormat::write
+(
+    Ostream& os,
+    const meshedSurface& surf
+)
+{
+    const pointField& pointLst = surf.points();
+    const List<face>& faceLst = surf.faces();
+    const List<surfacePatch>& patchLst = surf.patches();
+
+    writeHeader(os, patchLst);
+
+    forAll(patchLst, patchI)
+    {
+        const surfacePatch& sp = patchLst[patchI];
+
+        os  << "OBJECT poly" << nl
+            << "name \"" << sp.name() << '"' << endl;
+
+        // Temporary primitivePatch to calculate compact points & faces
+        primitivePatch patch
+        (
+            SubList<face>
+            (
+                faceLst,
+                sp.start(),
+                sp.size()
+            ),
+            pointLst
+        );
+
+        os << "numvert " << patch.nPoints() << endl;
+
+        forAll(patch.localPoints(), ptI)
+        {
+            const point& pt = patch.localPoints()[ptI];
+
+            os << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
+        }
+
+        os << "numsurf " << patch.localFaces().size() << endl;
+
+        forAll(patch.localFaces(), faceI)
+        {
+            const keyedFace& f = patch.localFaces()[faceI];
+
+            os  << "SURF 0x20" << nl          // polygon
+                << "mat " << patchI << nl
+                << "refs " << f.size() << nl;
+
+            forAll(f, fp)
+            {
+                os << f[fp] << " 0 0" << nl;
+            }
+        }
+
+        os << "kids 0" << endl;
+    }
+}
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/ac3d/AC3DfileFormat.H b/src/surfMesh/keyedSurface/fileFormats/ac3d/AC3DfileFormat.H
new file mode 100644
index 0000000000..286f17c284
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/ac3d/AC3DfileFormat.H
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::fileFormats::AC3DfileFormat
+
+Description
+    Provide a means of reading/writing AC3D format.
+
+    http://www.inivis.com/ac3d/man/ac3dfileformat.html
+
+Note
+   Since the faces are already organized as patches, the reader could be
+   optimized for this, but at expense of losing a common reading approach.
+
+SourceFiles
+    AC3DfileFormat.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef AC3DfileFormat_H
+#define AC3DfileFormat_H
+
+#include "Ostream.H"
+#include "OFstream.H"
+#include "keyedSurface.H"
+#include "meshedSurface.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileFormats
+{
+
+class AC3DfileFormat;
+
+/*---------------------------------------------------------------------------*\
+                      Class AC3DfileFormat Declaration
+\*---------------------------------------------------------------------------*/
+
+class AC3DfileFormat
+:
+    public keyedSurface
+{
+
+    // Private Member Functions
+
+        //- Read a type via IStringStream
+        template<class Type>
+        static Type parse(const string&);
+
+        //- Read cmd, args from IFstream
+        static bool readCmd(IFstream&, string& cmd, string& args);
+
+        //- Cue up to cmd, reading args
+        static bool cueTo(IFstream&, const string& cmd, string& args);
+
+        //- Cue up to cmd, reading args or exit with a FatalError
+        //  returns the command args
+        static string cueToOrDie
+        (
+            IFstream&,
+            const string& cmd,
+            const string& errorMsg=string::null
+        );
+
+        //- Write header with materials
+        static void writeHeader(Ostream&, const List<surfacePatch>&);
+
+        //- Disallow default bitwise copy construct
+        AC3DfileFormat(const AC3DfileFormat&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const AC3DfileFormat&);
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        AC3DfileFormat();
+
+        //- Construct from file name
+        AC3DfileFormat(const fileName&, const bool triangulate=false);
+
+    // Selectors
+
+        //- Read file and return keyedSurface
+        static autoPtr<keyedSurface> New
+        (
+            const fileName& fName,
+            const bool triangulate=false
+        )
+        {
+            return autoPtr<keyedSurface>
+            (
+                new AC3DfileFormat(fName, triangulate)
+            );
+        }
+
+    // Destructor
+
+    // Member Functions
+
+        // Write
+
+        //- Write keyedSurface
+        static void write(Ostream&, const keyedSurface&);
+
+        //- Write keyedSurface
+        static void write(const fileName& fName, const keyedSurface& surf)
+        {
+            write(OFstream(fName)(), surf);
+        }
+
+        //- Write meshedSurface
+        static void write(Ostream&, const meshedSurface&);
+
+        //- Write meshedSurface
+        static void write(const fileName& fName, const meshedSurface& surf)
+        {
+            write(OFstream(fName)(), surf);
+        }
+
+        //- Write object
+        virtual void write(Ostream& os) const
+        {
+            write(os, *this);
+        }
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileFormats
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/gts/GTSfileFormat.C b/src/surfMesh/keyedSurface/fileFormats/gts/GTSfileFormat.C
new file mode 100644
index 0000000000..1fbdf3fae4
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/gts/GTSfileFormat.C
@@ -0,0 +1,440 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "GTSfileFormat.H"
+#include "clock.H"
+#include "IFstream.H"
+#include "IStringStream.H"
+#include "tensor.H"
+#include "primitivePatch.H"
+#include "addToRunTimeSelectionTable.H"
+#include "addToMemberFunctionSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+namespace Foam
+{
+namespace fileFormats
+{
+
+addNamedToRunTimeSelectionTable
+(
+    keyedSurface,
+    GTSfileFormat,
+    fileExtension,
+    gts
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    keyedSurface,
+    GTSfileFormat,
+    write,
+    fileExtension,
+    gts
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    meshedSurface,
+    GTSfileFormat,
+    write,
+    fileExtension,
+    gts
+);
+
+}
+}
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fileFormats::GTSfileFormat::GTSfileFormat()
+:
+    Foam::keyedSurface()
+{}
+
+
+Foam::fileFormats::GTSfileFormat::GTSfileFormat
+(
+    const fileName& fName,
+    const bool triangulate
+)
+:
+    Foam::keyedSurface()
+{
+    IFstream is(fName);
+
+    if (!is.good())
+    {
+        FatalErrorIn
+        (
+            "fileFormats::GTSfileFormat::GTSfileFormat"
+            "(const fileName&)"
+        )
+            << "Cannot read file " << fName
+            << exit(FatalError);
+    }
+
+    // Read header
+    string line = getLineNoComment(is);
+
+    label nPoints, nEdges, nElems;
+    {
+        IStringStream lineStream(line);
+        lineStream
+            >> nPoints
+            >> nEdges
+            >> nElems;
+    }
+
+    pointField pointLst(nPoints);
+
+    // Read points
+    forAll(pointLst, pointI)
+    {
+        scalar x, y, z;
+        line = getLineNoComment(is);
+        {
+            IStringStream lineStream(line);
+            lineStream
+                >> x >> y >> z;
+        }
+
+        pointLst[pointI] = point(x, y, z);
+    }
+
+    // Read edges (Foam indexing)
+    edgeList edges(nEdges);
+    forAll(edges, edgei)
+    {
+        label beg, end;
+        line = getLineNoComment(is);
+        {
+            IStringStream lineStream(line);
+            lineStream
+                >> beg >> end;
+        }
+        edges[edgei] = edge(beg - 1, end - 1);
+    }
+
+
+    // Read triangles. Convert references to edges into pointlabels
+    List<keyedFace> faceLst(nElems);
+
+    label maxPatch = 0;
+
+    forAll(faceLst, faceI)
+    {
+        label e0Label, e1Label, e2Label;
+        label region = 0;
+
+        line = getLineNoComment(is);
+        {
+            IStringStream lineStream(line);
+            lineStream
+                >> e0Label >> e1Label >> e2Label;
+
+            // Optional region number: read first, then check state on stream
+            if (lineStream)
+            {
+                label num;
+                lineStream >> num;
+                if (!lineStream.bad())
+                {
+                    region = num;
+                    if (maxPatch < region)
+                    {
+                        maxPatch = region;
+                    }
+                }
+            }
+        }
+
+        // Determine ordering of edges e0, e1
+        //  common: common vertex, shared by e0 and e1
+        //  e0Far:  vertex on e0 which is not common
+        //  e1Far:  vertex on e1 which is not common
+        const edge& e0 = edges[e0Label - 1];
+        const edge& e1 = edges[e1Label - 1];
+        const edge& e2 = edges[e2Label - 1];
+
+        label common01 = e0.commonVertex(e1);
+        if (common01 == -1)
+        {
+            FatalErrorIn
+            (
+                "fileFormats::GTSfileFormat::GTSfileFormat"
+                "(const fileName&)"
+            )
+                << "Edges 0 and 1 of triangle " << faceI
+                << " do not share a point.\n"
+                << "    edge0:" << e0 << nl
+                << "    edge1:" << e1
+                << exit(FatalError);
+        }
+
+        label e0Far = e0.otherVertex(common01);
+        label e1Far = e1.otherVertex(common01);
+
+        label common12 = e1.commonVertex(e2);
+        if (common12 == -1)
+        {
+            FatalErrorIn
+            (
+                "fileFormats::GTSfileFormat::GTSfileFormat"
+                "(const fileName&)"
+            )
+                << "Edges 1 and 2 of triangle " << faceI
+                << " do not share a point.\n"
+                << "    edge1:" << e1 << nl
+                << "    edge2:" << e2
+                << exit(FatalError);
+        }
+        label e2Far = e2.otherVertex(common12);
+
+        // Does edge2 sit between edge1 and 0?
+        if (common12 != e1Far || e2Far != e0Far)
+        {
+            FatalErrorIn
+            (
+                "fileFormats::GTSfileFormat::GTSfileFormat"
+                "(const fileName&)"
+            )
+                << "Edges of triangle " << faceI
+                << " reference more than three points.\n"
+                << "    edge0:" << e0 << nl
+                << "    edge1:" << e1 << nl
+                << "    edge2:" << e2 << nl
+                << exit(FatalError);
+        }
+
+        keyedFace lface(face(3), region);
+
+        lface[0] = e0Far;
+        lface[1] = common01;
+        lface[2] = e1Far;
+
+        faceLst[faceI] = lface;
+    }
+
+    // transfer to normal lists
+    points().transfer(pointLst);
+    faces().transfer(faceLst);
+    setPatches(maxPatch);
+    // stitchFaces(SMALL);
+}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::fileFormats::GTSfileFormat::write
+(
+    Ostream& os,
+    const keyedSurface& surf
+)
+{
+    const pointField& pointLst = surf.points();
+    const List<keyedFace>& faceLst = surf.faces();
+
+    // It is too annoying to triangulate on-the-fly
+    // just issue a warning and get out
+    label nNonTris = 0;
+    forAll(faceLst, faceI)
+    {
+        if (faceLst[faceI].size() > 3)
+        {
+            ++nNonTris;
+        }
+    }
+
+    if (nNonTris)
+    {
+        FatalErrorIn
+        (
+            "fileFormats::GTSfileFormat::write"
+            "(Ostream&, const keyedSurface&)"
+        )
+            << "Surface has " << nNonTris << "/" << faceLst.size()
+            << " non-triangulated faces - not writing!" << endl;
+        return;
+    }
+
+    labelList faceMap;
+    List<surfacePatch> patchLst = surf.sortedRegions(faceMap);
+
+
+    // Write header, print patch names as comment
+    os  << "# GTS file" << nl
+        << "# Regions:" << nl;
+
+    forAll(patchLst, patchI)
+    {
+        os  << "#     " << patchI << "    "
+            << patchLst[patchI].name() << nl;
+    }
+    os  << "#" << endl;
+
+
+    os  << "# nPoints  nEdges  nTriangles" << nl
+        << pointLst.size() << ' ' << surf.nEdges() << ' '
+        << surf.size() << endl;
+
+
+    // Write vertex coords
+    forAll(pointLst, pointI)
+    {
+        os  << pointLst[pointI].x() << ' '
+            << pointLst[pointI].y() << ' '
+            << pointLst[pointI].z() << endl;
+    }
+
+
+    // Write edges.
+    // Note: edges are in local point labels so convert
+    const edgeList& es = surf.edges();
+    const labelList& meshPts = surf.meshPoints();
+
+    forAll(es, edgeI)
+    {
+        os  << meshPts[es[edgeI].start()] + 1 << ' '
+            << meshPts[es[edgeI].end()] + 1 << endl;
+    }
+
+
+    // Write faces in terms of edges.
+    const labelListList& faceEs = surf.faceEdges();
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        forAll(patchLst[patchI], patchFaceI)
+        {
+            const labelList& fEdges = faceEs[faceMap[faceIndex++]];
+
+            os  << fEdges[0] + 1 << ' '
+                << fEdges[1] + 1 << ' '
+                << fEdges[2] + 1 << ' '
+                << patchI << endl;
+        }
+    }
+}
+
+
+void Foam::fileFormats::GTSfileFormat::write
+(
+    Ostream& os,
+    const meshedSurface& surf
+)
+{
+    const pointField& pointLst = surf.points();
+    const List<surfacePatch>& patchLst = surf.patches();
+    const List<face>& faceLst = surf.faces();
+
+    // It is too annoying to triangulate on-the-fly
+    // just issue a warning and get out
+    label nNonTris = 0;
+    forAll(faceLst, faceI)
+    {
+        if (faceLst[faceI].size() > 3)
+        {
+            ++nNonTris;
+        }
+    }
+
+    if (nNonTris)
+    {
+        WarningIn
+        (
+            "fileFormats::GTSfileFormat::write"
+            "(Ostream&, const meshedSurface&)"
+        )
+            << "Surface has " << nNonTris << "/" << faceLst.size()
+            << " non-triangulated faces - not writing!" << endl;
+        
+        return;
+    }
+
+    // Write header, print patch names as comment
+    os  << "# GTS file" << nl
+        << "# Regions:" << nl;
+
+    forAll(patchLst, patchI)
+    {
+        os  << "#     " << patchI << "    "
+            << patchLst[patchI].name() << nl;
+    }
+    os  << "#" << endl;
+
+    os  << "# nPoints  nEdges  nTriangles" << nl
+        << pointLst.size() << ' ' << surf.nEdges() << ' '
+        << surf.size() << endl;
+
+
+    // Write vertex coords
+    forAll(pointLst, pointI)
+    {
+        os  << pointLst[pointI].x() << ' '
+            << pointLst[pointI].y() << ' '
+            << pointLst[pointI].z() << endl;
+    }
+
+
+    // Write edges.
+    // Note: edges are in local point labels so convert
+    const edgeList& es = surf.edges();
+    const labelList& meshPts = surf.meshPoints();
+
+    forAll(es, edgei)
+    {
+        os  << meshPts[es[edgei].start()] + 1 << ' '
+            << meshPts[es[edgei].end()] + 1 << endl;
+    }
+
+
+    // Write faces in terms of edges.
+    const labelListList& faceEs = surf.faceEdges();
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        const surfacePatch& patch = patchLst[patchI];
+
+        forAll(patch, patchFaceI)
+        {
+            const labelList& fEdges = faceEs[faceIndex++];
+
+            os  << fEdges[0] + 1 << ' '
+                << fEdges[1] + 1 << ' '
+                << fEdges[2] + 1 << ' '
+                << patchI << endl;
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/gts/GTSfileFormat.H b/src/surfMesh/keyedSurface/fileFormats/gts/GTSfileFormat.H
new file mode 100644
index 0000000000..d607cbcd0b
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/gts/GTSfileFormat.H
@@ -0,0 +1,139 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::fileFormats::GTSfileFormat
+
+Description
+    Provide a means of reading/writing GTS format.
+
+SourceFiles
+    GTSfileFormat.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef GTSfileFormat_H
+#define GTSfileFormat_H
+
+#include "Ostream.H"
+#include "OFstream.H"
+#include "keyedSurface.H"
+#include "meshedSurface.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileFormats
+{
+
+class GTSfileFormat;
+
+/*---------------------------------------------------------------------------*\
+                      Class GTSfileFormat Declaration
+\*---------------------------------------------------------------------------*/
+
+class GTSfileFormat
+:
+    public keyedSurface
+{
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        GTSfileFormat(const GTSfileFormat&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const GTSfileFormat&);
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        GTSfileFormat();
+
+        //- Construct from file name
+        GTSfileFormat(const fileName&, const bool triangulate=true);
+
+    // Selectors
+
+        //- Read file and return keyedSurface
+        static autoPtr<keyedSurface> New
+        (
+            const fileName& fName,
+            const bool triangulate=true
+        )
+        {
+            return autoPtr<keyedSurface>
+            (
+                new GTSfileFormat(fName, triangulate)
+            );
+        }
+
+    // Destructor
+
+    // Member Functions
+
+        // Write
+
+        //- Write keyedSurface
+        static void write(Ostream&, const keyedSurface&);
+
+        //- Write keyedSurface
+        static void write(const fileName& fName, const keyedSurface& surf)
+        {
+            write(OFstream(fName)(), surf);
+        }
+
+        //- Write meshedSurface
+        static void write(Ostream&, const meshedSurface&);
+
+        //- Write meshedSurface
+        static void write(const fileName& fName, const meshedSurface& surf)
+        {
+            write(OFstream(fName)(), surf);
+        }
+
+        //- Write object
+        virtual void write(Ostream& os) const
+        {
+            write(os, *this);
+        }
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileFormats
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/nas/NASfileFormat.C b/src/surfMesh/keyedSurface/fileFormats/nas/NASfileFormat.C
new file mode 100644
index 0000000000..ebe30ed350
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/nas/NASfileFormat.C
@@ -0,0 +1,461 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "NASfileFormat.H"
+#include "clock.H"
+#include "IFstream.H"
+#include "IStringStream.H"
+#include "addToRunTimeSelectionTable.H"
+#include "addToMemberFunctionSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+namespace Foam
+{
+namespace fileFormats
+{
+
+// .bdf (Bulk Data Format)
+addNamedToRunTimeSelectionTable
+(
+    keyedSurface,
+    NASfileFormat,
+    fileExtension,
+    bdf
+);
+
+// .nas (Nastran)
+addNamedToRunTimeSelectionTable
+(
+    keyedSurface,
+    NASfileFormat,
+    fileExtension,
+    nas
+);
+
+// addNamedToMemberFunctionSelectionTable
+// (
+//     keyedSurface,
+//     NASfileFormat,
+//     write,
+//     fileExtension,
+//     nas
+// );
+//
+// addNamedToMemberFunctionSelectionTable
+// (
+//     meshedSurface,
+//     NASfileFormat,
+//     write,
+//     fileExtension,
+//     nas
+// );
+
+}
+}
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+
+// Do weird things to extract number
+Foam::scalar Foam::fileFormats::NASfileFormat::parseNASCoord(const string& s)
+{
+    size_t expSign = s.find_last_of("+-");
+
+    if (expSign != string::npos && expSign > 0 && !isspace(s[expSign-1]))
+    {
+        scalar mantissa = readScalar(IStringStream(s.substr(0, expSign))());
+        scalar exponent = readScalar(IStringStream(s.substr(expSign+1))());
+
+        if (s[expSign] == '-')
+        {
+            exponent = -exponent;
+        }
+        return mantissa*pow(10, exponent);
+    }
+    else
+    {
+        return readScalar(IStringStream(s)());
+    }
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fileFormats::NASfileFormat::NASfileFormat()
+:
+    Foam::keyedSurface()
+{}
+
+
+Foam::fileFormats::NASfileFormat::NASfileFormat
+(
+    const fileName& fName,
+    const bool triangulate
+)
+:
+    Foam::keyedSurface()
+{
+    IFstream is(fName);
+
+    if (!is.good())
+    {
+        FatalErrorIn("fileFormats::NASfileFormat::NASfileFormat(const fileName&)")
+            << "Cannot read file " << fName
+            << exit(FatalError);
+    }
+
+    DynamicList<point> pointLst;
+    // Nastran index of points
+    DynamicList<label> pointId;
+    DynamicList<keyedFace>  faceLst;
+    HashTable<label>   groupToPatch;
+
+    // From face groupId to patchId
+    Map<label> groupIdToPatchId;
+    label nPatches = 0;
+
+    // Name for face group
+    Map<word> groupIdToName;
+
+    // Ansa tags. Denoted by $ANSA_NAME. These will appear just before the
+    // first use of a type. We read them and store the pshell types which
+    // are used to name the patches.
+    label ansaId = -1;
+    word ansaType;
+    word ansaName;
+
+    // leave faces that didn't have a group in 0
+    //    label groupID = 0;
+    //    label maxGroupID = -1;
+
+    // A single warning per unrecognized command
+    HashSet<word> unhandledCmd;
+
+    while (is.good())
+    {
+        string line;
+        is.getLine(line);
+
+        // Ansa extension
+        if (line.substr(0, 10) == "$ANSA_NAME")
+        {
+            string::size_type sem0 = line.find (';', 0);
+            string::size_type sem1 = line.find (';', sem0+1);
+            string::size_type sem2 = line.find (';', sem1+1);
+
+            if
+            (
+                sem0 != string::npos
+             && sem1 != string::npos
+             && sem2 != string::npos
+            )
+            {
+                ansaId = readLabel
+                (
+                    IStringStream(line.substr(sem0+1, sem1-sem0-1))()
+                );
+                ansaType = line.substr(sem1+1, sem2-sem1-1);
+
+                string rawName;
+                is.getLine(rawName);
+                if (rawName[rawName.size()-1] == '\r')
+                {
+                    rawName = rawName.substr(1, rawName.size()-2);
+                }
+                else
+                {
+                    rawName = rawName.substr(1, rawName.size()-1);
+                }
+
+                string::stripInvalid<word>(rawName);
+                ansaName = rawName;
+
+                // Info<< "ANSA tag for NastranID:" << ansaID
+                //     << " of type " << ansaType
+                //     << " name " << ansaName << endl;
+            }
+        }
+
+
+        // Hypermesh extension
+        // $HMNAME COMP                   1"partName"
+        if
+        (
+            line.substr(0, 12) == "$HMNAME COMP"
+         && line.find ('"') != string::npos
+        )
+        {
+            label groupId = readLabel
+            (
+                IStringStream(line.substr(16, 16))()
+            );
+
+            IStringStream lineStream(line.substr(32));
+
+            string rawName;
+            lineStream >> rawName;
+            string::stripInvalid<word>(rawName);
+
+            word groupName(rawName);
+            groupIdToName.insert(groupId, groupName);
+
+            Info<< "group " << groupId << " => " << groupName << endl;
+        }
+
+
+        // Skip empty or comment
+        if (line.size() == 0 || line[0] == '$')
+        {
+            continue;
+        }
+
+
+        // Check if character 72 is continuation
+        if (line.size() > 72 && line[72] == '+')
+        {
+            line = line.substr(0, 72);
+
+            while (true)
+            {
+                string buf;
+                is.getLine(buf);
+
+                if (buf.size() > 72 && buf[72] == '+')
+                {
+                    line += buf.substr(8, 64);
+                }
+                else
+                {
+                    line += buf.substr(8, buf.size()-8);
+                    break;
+                }
+            }
+        }
+
+
+        // Read first word
+        IStringStream lineStream(line);
+        word cmd;
+        lineStream >> cmd;
+
+        if (cmd == "CTRIA3")
+        {
+            face fTri(3);
+
+            label groupId = readLabel(IStringStream(line.substr(16,8))());
+            fTri[0] = readLabel(IStringStream(line.substr(24,8))());
+            fTri[1] = readLabel(IStringStream(line.substr(32,8))());
+            fTri[2] = readLabel(IStringStream(line.substr(40,8))());
+
+            // Convert groupID into patchID
+            Map<label>::const_iterator iter = groupIdToPatchId.find(groupId);
+
+            label patchI;
+            if (iter == groupIdToPatchId.end())
+            {
+                patchI = nPatches++;
+                groupIdToPatchId.insert(groupId, patchI);
+                Info<< "patch " << patchI << " => group " << groupId << endl;
+            }
+            else
+            {
+                patchI = iter();
+            }
+
+            faceLst.append(keyedFace(fTri, patchI));
+        }
+        else if (cmd == "CQUAD4")
+        {
+            face fQuad(4);
+
+            label groupId = readLabel(IStringStream(line.substr(16,8))());
+            fQuad[0] = readLabel(IStringStream(line.substr(24,8))());
+            fQuad[1] = readLabel(IStringStream(line.substr(32,8))());
+            fQuad[2] = readLabel(IStringStream(line.substr(40,8))());
+            fQuad[3] = readLabel(IStringStream(line.substr(48,8))());
+
+            // Convert group into patch
+            Map<label>::const_iterator iter = groupIdToPatchId.find(groupId);
+
+            label patchI;
+            if (iter == groupIdToPatchId.end())
+            {
+                patchI = nPatches++;
+                groupIdToPatchId.insert(groupId, patchI);
+                Info<< "patch " << patchI << " => group " << groupId << endl;
+            }
+            else
+            {
+                patchI = iter();
+            }
+
+            if (triangulate)
+            {
+                face fTri(3);
+
+                // simple face triangulation about f[0].
+                // cannot use face::triangulation since points are incomplete
+                fTri[0] = fQuad[0];
+                for (label fp1 = 1; fp1 < fQuad.size() - 1; fp1++)
+                {
+                    label fp2 = (fp1 + 1) % fQuad.size();
+
+                    fTri[1] = fQuad[fp1];
+                    fTri[2] = fQuad[fp2];
+
+                    faceLst.append(keyedFace(fTri, patchI));
+                }
+            }
+            else
+            {
+                faceLst.append(keyedFace(fQuad, patchI));
+            }
+        }
+        else if (cmd == "PSHELL")
+        {
+            // Read shell type since group gives patchnames.
+            label groupId = readLabel(IStringStream(line.substr(8,8))());
+
+            if (groupId == ansaId && ansaType == "PSHELL")
+            {
+                groupIdToName.insert(groupId, ansaName);
+                Info<< "group " << groupId << " => " << ansaName << endl;
+            }
+        }
+        else if (cmd == "GRID")
+        {
+            label index = readLabel(IStringStream(line.substr(8,8))());
+            scalar x = parseNASCoord(line.substr(24, 8));
+            scalar y = parseNASCoord(line.substr(32, 8));
+            scalar z = parseNASCoord(line.substr(40, 8));
+
+            pointId.append(index);
+            pointLst.append(point(x, y, z));
+        }
+        else if (cmd == "GRID*")
+        {
+            // Long format is on two lines with '*' continuation symbol
+            // on start of second line.
+            // Typical line (spaces compacted)
+            // GRID*      126   0 -5.55999875E+02 -5.68730474E+02
+            // *         2.14897901E+02
+
+            label index = readLabel(IStringStream(line.substr(8,16))());
+            scalar x = parseNASCoord(line.substr(40, 16));
+            scalar y = parseNASCoord(line.substr(56, 16));
+
+            is.getLine(line);
+            if (line[0] != '*')
+            {
+                FatalErrorIn
+                    (
+                        "fileFormats::NASfileFormat::NASfileFormat"
+                        "(const fileName&)"
+                    )
+                    << "Expected continuation symbol '*' when reading GRID*"
+                    << " (double precision coordinate) output" << nl
+                    << "Read:" << line << nl
+                    << "File:" << is.name()
+                    << " line:" << is.lineNumber()
+                    << exit(FatalError);
+            }
+            scalar z = parseNASCoord(line.substr(8, 16));
+
+            pointId.append(index);
+            pointLst.append(point(x, y, z));
+        }
+        else if (unhandledCmd.insert(cmd))
+        {
+            Info<< "Unhandled Nastran command " << line << nl
+                << "File:" << is.name()
+                << " line:" << is.lineNumber()
+                << endl;
+        }
+    }
+
+    Info<< "Read faces:" << faceLst.size()
+        << " points:" << pointLst.size()
+        << endl;
+
+
+    // transfer to normal lists
+    points().transfer(pointLst);
+
+    pointId.shrink();
+    faceLst.shrink();
+
+    {
+        // Build inverse mapping (index to point)
+        Map<label> nasToFoamPoint(2*pointId.size());
+        forAll(pointId, i)
+        {
+            nasToFoamPoint.insert(pointId[i], i);
+        }
+        pointId.clearStorage();
+
+
+        // Relabel faces
+        forAll(faceLst, i)
+        {
+            keyedFace& f = faceLst[i];
+            forAll(f, fp)
+            {
+                f[fp] = nasToFoamPoint[f[fp]];
+            }
+        }
+    }
+
+
+    // convert Nastran groupId => name to patchId => name
+    Map<word> regionNames;
+    forAllConstIter(Map<word>, groupIdToName, iter)
+    {
+        Map<label>::const_iterator iter2 = groupIdToPatchId.find(iter.key());
+
+        if (iter2 != groupIdToPatchId.end())
+        {
+            regionNames.insert(iter2.key(), iter());
+        }
+    }
+
+    // transfer to normal lists
+    faces().transfer(faceLst);
+    setPatches(regionNames);
+}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+// ************************************************************************* //
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/nas/NASfileFormat.H b/src/surfMesh/keyedSurface/fileFormats/nas/NASfileFormat.H
new file mode 100644
index 0000000000..7e25a06a76
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/nas/NASfileFormat.H
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::fileFormats::NASfileFormat
+
+Description
+    Nastran surface reader.
+
+    - Uses the Ansa "$ANSA_NAME" or the Hypermesh "$HMNAME COMP" extensions
+      to obtain patch names.
+    - Handles Nastran short and long formats, but not free format.
+    - Properly handles the Nastran compact floating point notation: \n
+    @verbatim
+        GRID          28        10.20269-.030265-2.358-8
+    @endverbatim
+
+SourceFiles
+    NASfileFormat.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef NASfileFormat_H
+#define NASfileFormat_H
+
+#include "Ostream.H"
+#include "OFstream.H"
+#include "keyedSurface.H"
+#include "meshedSurface.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileFormats
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class NASfileFormat Declaration
+\*---------------------------------------------------------------------------*/
+
+class NASfileFormat
+:
+    public keyedSurface
+{
+
+    // Private Member Functions
+
+        //- Do weird things to extract number
+        static scalar parseNASCoord(const string&);
+
+        //- Disallow default bitwise copy construct
+        NASfileFormat(const NASfileFormat&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const NASfileFormat&);
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        NASfileFormat();
+
+        //- Construct from file name
+        NASfileFormat(const fileName&, const bool triangulate=false);
+
+    // Selectors
+
+        //- Read file and return keyedSurface
+        static autoPtr<keyedSurface> New
+        (
+            const fileName& fName,
+            const bool triangulate=false
+        )
+        {
+            return autoPtr<keyedSurface>
+            (
+                new NASfileFormat(fName,triangulate)
+            );
+        }
+
+    // Destructor
+
+    // Member Functions
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileFormats
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/obj/OBJfileFormat.C b/src/surfMesh/keyedSurface/fileFormats/obj/OBJfileFormat.C
new file mode 100644
index 0000000000..a1265af853
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/obj/OBJfileFormat.C
@@ -0,0 +1,371 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "OBJfileFormat.H"
+#include "clock.H"
+#include "IFstream.H"
+#include "IStringStream.H"
+#include "addToRunTimeSelectionTable.H"
+#include "addToMemberFunctionSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+namespace Foam
+{
+namespace fileFormats
+{
+
+addNamedToRunTimeSelectionTable
+(
+    keyedSurface,
+    OBJfileFormat,
+    fileExtension,
+    obj
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    keyedSurface,
+    OBJfileFormat,
+    write,
+    fileExtension,
+    obj
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    meshedSurface,
+    OBJfileFormat,
+    write,
+    fileExtension,
+    obj
+);
+
+}
+}
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fileFormats::OBJfileFormat::OBJfileFormat()
+:
+    Foam::keyedSurface()
+{}
+
+
+Foam::fileFormats::OBJfileFormat::OBJfileFormat
+(
+    const fileName& fName,
+    const bool triangulate
+)
+:
+    Foam::keyedSurface()
+{
+    IFstream is(fName);
+
+    if (!is.good())
+    {
+        FatalErrorIn("fileFormats::OBJfileFormat::OBJfileFormat(const fileName&)")
+            << "Cannot read file " << fName
+            << exit(FatalError);
+    }
+
+    DynamicList<point> pointLst;
+    DynamicList<keyedFace>  faceLst;
+    HashTable<label>   groupToPatch;
+
+    // leave faces that didn't have a group in 0
+    label groupID = 0;
+    label maxGroupID = -1;
+
+    while (is.good())
+    {
+        string line = getLineNoComment(is);
+
+        // handle continuations
+        if (line[line.size()-1] == '\\')
+        {
+            line.substr(0, line.size()-1);
+            line += getLineNoComment(is);
+        }
+
+        // Read first word
+        IStringStream lineStream(line);
+        word cmd;
+        lineStream >> cmd;
+
+        if (cmd == "v")
+        {
+            scalar x, y, z;
+            lineStream >> x >> y >> z;
+            pointLst.append(point(x, y, z));
+        }
+        else if (cmd == "g")
+        {
+            word groupName;
+            lineStream >> groupName;
+
+            HashTable<label>::const_iterator findGroup =
+                groupToPatch.find(groupName);
+
+            if (findGroup != groupToPatch.end())
+            {
+                groupID = findGroup();
+            }
+            else
+            {
+                // special treatment if any initial faces were not in a group
+                if (maxGroupID == -1 && faceLst.size())
+                {
+                    groupToPatch.insert("patch0", 0);
+                    maxGroupID = 0;
+                }
+                groupID = ++maxGroupID;
+                groupToPatch.insert(groupName, groupID);
+            }
+        }
+        else if (cmd == "f")
+        {
+            DynamicList<label> verts;
+
+            // Assume 'f' is followed by space.
+            string::size_type endNum = 1;
+
+            while (true)
+            {
+                string::size_type startNum = line.find_first_not_of(' ', endNum);
+
+                if (startNum == string::size_type(string::npos))
+                {
+                    break;
+                }
+
+                endNum = line.find(' ', startNum);
+
+                string vertexSpec;
+                if (endNum != string::size_type(string::npos))
+                {
+                    vertexSpec = line.substr(startNum, endNum-startNum);
+                }
+                else
+                {
+                    vertexSpec = line.substr(startNum, line.size() - startNum);
+                }
+
+                string::size_type slashPos = vertexSpec.find('/');
+
+                label vertI = 0;
+                if (slashPos != string::size_type(string::npos))
+                {
+                    IStringStream intStream(vertexSpec.substr(0, slashPos));
+
+                    intStream >> vertI;
+                }
+                else
+                {
+                    IStringStream intStream(vertexSpec);
+
+                    intStream >> vertI;
+                }
+                verts.append(vertI - 1);
+            }
+            verts.shrink();
+
+            if (triangulate && verts.size() > 3)
+            {
+                face fTri(3);
+
+                // simple face triangulation about f[0].
+                // Cannot use face::triangulation since points are incomplete
+                fTri[0] = verts[0];
+                for (label fp1 = 1; fp1 < verts.size() - 1; fp1++)
+                {
+                    label fp2 = (fp1 + 1) % verts.size();
+
+                    fTri[1] = verts[fp1];
+                    fTri[2] = verts[fp2];
+
+                    faceLst.append(keyedFace(fTri, groupID));
+                }
+            }
+            else
+            {
+                faceLst.append
+                (
+                    keyedFace
+                    (
+                        face( xferMoveTo<labelList>(verts) ),
+                        groupID
+                    )
+                );
+            }
+        }
+    }
+
+    // transfer to normal lists
+    points().transfer(pointLst);
+    faces().transfer(faceLst);
+    setPatches(groupToPatch);
+}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::fileFormats::OBJfileFormat::write
+(
+    Ostream& os,
+    const keyedSurface& surf
+)
+{
+    const pointField& pointLst = surf.points();
+    const List<keyedFace>& faceLst = surf.faces();
+
+    labelList faceMap;
+    List<surfacePatch> patchLst = surf.sortedRegions(faceMap);
+
+    os  << "# Wavefront OBJ file written " << clock::dateTime().c_str() << nl
+        << "o " << os.name().lessExt().name() << nl
+        << nl
+        << "# points : " << pointLst.size() << nl
+        << "# faces  : " << faceLst.size() << nl
+        << "# patches: " << patchLst.size() << nl;
+
+    // Print patch names as comment
+    forAll(patchLst, patchI)
+    {
+        os  << "#   " << patchI << "  " << patchLst[patchI].name()
+            << "  (nFaces: " << patchLst[patchI].size() << ")" << nl;
+    }
+
+    os  << nl
+        << "# <points count=\"" << pointLst.size() << "\">" << endl;
+
+    // Write vertex coords
+    forAll(pointLst, ptI)
+    {
+        os  << "v " << pointLst[ptI].x()
+            << ' '  << pointLst[ptI].y()
+            << ' '  << pointLst[ptI].z() << nl;
+    }
+
+    os  << "# </points>" << nl
+        << nl
+        << "# <faces count=\"" << faceLst.size() << "\">" << endl;
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        // Print all faces belonging to this region
+        const surfacePatch& patch = patchLst[patchI];
+
+        os << "g " << patch.name() << endl;
+
+        forAll(patch, patchFaceI)
+        {
+            const face& f = faceLst[faceMap[faceIndex++]];
+
+            os  << 'f';
+            forAll(f, fp)
+            {
+                os << ' ' << f[fp] + 1;
+            }
+            os << endl;
+        }
+    }
+
+    os  << "# </faces>" << endl;
+}
+
+
+void Foam::fileFormats::OBJfileFormat::write
+(
+    Ostream& os,
+    const meshedSurface& surf
+)
+{
+    const pointField& pointLst = surf.points();
+    const List<face>& faceLst = surf.faces();
+    const List<surfacePatch>& patchLst = surf.patches();
+
+    os  << "# Wavefront OBJ file written " << clock::dateTime().c_str() << nl
+        << "o " << os.name().lessExt().name() << nl
+        << nl
+        << "# points : " << pointLst.size() << nl
+        << "# faces  : " << faceLst.size() << nl
+        << "# patches: " << patchLst.size() << nl;
+
+    // Print patch names as comment
+    forAll(patchLst, patchI)
+    {
+        os  << "#   " << patchI << "  " << patchLst[patchI].name()
+            << "  (nFaces: " << patchLst[patchI].size() << ")" << nl;
+    }
+
+    os  << nl
+        << "# <points count=\"" << pointLst.size() << "\">" << endl;
+
+    // Write vertex coords
+    forAll(pointLst, ptI)
+    {
+        os  << "v " << pointLst[ptI].x()
+            << ' '  << pointLst[ptI].y()
+            << ' '  << pointLst[ptI].z() << nl;
+    }
+
+    os  << "# </points>" << nl
+        << nl
+        << "# <faces count=\"" << faceLst.size() << "\">" << endl;
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        const surfacePatch& patch = patchLst[patchI];
+
+        os << "g " << patch.name() << endl;
+
+        forAll(patch, patchFaceI)
+        {
+            const face& f = faceLst[faceIndex++];
+
+            os  << 'f';
+            forAll(f, fp)
+            {
+                os << ' ' << f[fp] + 1;
+            }
+            os << endl;
+        }
+    }
+    os  << "# </faces>" << endl;
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/obj/OBJfileFormat.H b/src/surfMesh/keyedSurface/fileFormats/obj/OBJfileFormat.H
new file mode 100644
index 0000000000..f4b0a1678a
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/obj/OBJfileFormat.H
@@ -0,0 +1,139 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::fileFormats::OBJfileFormat
+
+Description
+    Provide a means of reading/writing Alias/Wavefront OBJ format.
+
+    Does not handle negative face indices.
+
+SourceFiles
+    OBJfileFormat.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef OBJfileFormat_H
+#define OBJfileFormat_H
+
+#include "Ostream.H"
+#include "OFstream.H"
+#include "keyedSurface.H"
+#include "meshedSurface.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileFormats
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class OBJfileFormat Declaration
+\*---------------------------------------------------------------------------*/
+
+class OBJfileFormat
+:
+    public keyedSurface
+{
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        OBJfileFormat(const OBJfileFormat&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const OBJfileFormat&);
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        OBJfileFormat();
+
+        //- Construct from file name
+        OBJfileFormat(const fileName&, const bool triangulate=false);
+
+    // Selectors
+
+        //- Read file and return keyedSurface
+        static autoPtr<keyedSurface> New
+        (
+            const fileName& fName,
+            const bool triangulate = false
+        )
+        {
+            return autoPtr<keyedSurface>
+            (
+                new OBJfileFormat(fName, triangulate)
+            );
+        }
+
+    // Destructor
+
+    // Member Functions
+
+        // Write
+
+        //- Write keyedSurface
+        static void write(Ostream&, const keyedSurface&);
+
+        //- Write keyedSurface
+        static void write(const fileName& fName, const keyedSurface& surf)
+        {
+            write(OFstream(fName)(), surf);
+        }
+
+        //- Write meshedSurface
+        static void write(Ostream&, const meshedSurface&);
+
+        //- Write meshedSurface
+        static void write(const fileName& fName, const meshedSurface& surf)
+        {
+            write(OFstream(fName)(), surf);
+        }
+
+        //- Write object
+        virtual void write(Ostream& os) const
+        {
+            write(os, *this);
+        }
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileFormats
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/off/OFFfileFormat.C b/src/surfMesh/keyedSurface/fileFormats/off/OFFfileFormat.C
new file mode 100644
index 0000000000..8220e3b8fd
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/off/OFFfileFormat.C
@@ -0,0 +1,326 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "OFFfileFormat.H"
+#include "clock.H"
+#include "IFstream.H"
+#include "IStringStream.H"
+#include "addToRunTimeSelectionTable.H"
+#include "addToMemberFunctionSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+namespace Foam
+{
+namespace fileFormats
+{
+
+addNamedToRunTimeSelectionTable
+(
+    keyedSurface,
+    OFFfileFormat,
+    fileExtension,
+    off
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    keyedSurface,
+    OFFfileFormat,
+    write,
+    fileExtension,
+    off
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    meshedSurface,
+    OFFfileFormat,
+    write,
+    fileExtension,
+    off
+);
+
+}
+}
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fileFormats::OFFfileFormat::OFFfileFormat()
+:
+    keyedSurface()
+{}
+
+
+Foam::fileFormats::OFFfileFormat::OFFfileFormat
+(
+    const fileName& fName,
+    const bool triangulate
+)
+:
+    keyedSurface()
+{
+    IFstream is(fName);
+
+    if (!is.good())
+    {
+        FatalErrorIn("fileFormats::OFFfileFormat(const fileName&)")
+            << "Cannot read file " << fName
+            << exit(FatalError);
+    }
+
+    // Read header
+    string hdr = getLineNoComment(is);
+    if (hdr != "OFF")
+    {
+        FatalErrorIn("fileFormats::OFFfileFormat(const fileName&)")
+            << "OFF file " << fName
+            << " does not start with 'OFF'"
+            << exit(FatalError);
+    }
+
+
+    // get dimensions
+    label nPoints, nEdges, nElems;
+
+    string line = getLineNoComment(is);
+    {
+        IStringStream lineStream(line);
+        lineStream >> nPoints >> nElems >> nEdges;
+    }
+
+    // Read points
+    pointField pointLst(nPoints);
+    forAll(pointLst, pointI)
+    {
+        scalar x, y, z;
+        line = getLineNoComment(is);
+        {
+            IStringStream lineStream(line);
+            lineStream >> x >> y >> z;
+        }
+        pointLst[pointI] = point(x, y, z);
+    }
+
+    // Read faces - ignore optional region information
+    // use a DynamicList for possible on-the-fly triangulation
+    DynamicList<keyedFace> faceLst(nElems);
+
+    forAll(faceLst, faceI)
+    {
+        line = getLineNoComment(is);
+        {
+            IStringStream lineStream(line);
+
+            label nVerts;
+            lineStream >> nVerts;
+
+            face f(nVerts);
+
+            forAll(f, fp)
+            {
+                lineStream >> f[fp];
+            }
+
+            if (triangulate && f.size() > 3)
+            {
+                face fTri(3);
+
+                // simple face triangulation about f[0].
+                // cannot use face::triangulation since points are incomplete
+                fTri[0] = f[0];
+                for (label fp1 = 1; fp1 < f.size() - 1; fp1++)
+                {
+                    label fp2 = (fp1 + 1) % f.size();
+
+                    fTri[1] = f[fp1];
+                    fTri[2] = f[fp2];
+
+                    faceLst.append(keyedFace(fTri, 0));
+                }
+            }
+            else
+            {
+                faceLst.append(keyedFace(f, 0));
+            }
+        }
+    }
+
+    // no region information
+    points().transfer(pointLst);
+    faces().transfer(faceLst);
+    setPatches(0);
+}
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+
+void Foam::fileFormats::OFFfileFormat::write
+(
+    Ostream& os,
+    const keyedSurface& surf
+)
+{
+    const pointField& pointLst = surf.points();
+    const List<keyedFace>& faceLst = surf.faces();
+
+    labelList faceMap;
+    List<surfacePatch> patchLst = surf.sortedRegions(faceMap);
+
+    // Write header
+    os  << "OFF" << endl
+        << "# Geomview OFF file written " << clock::dateTime().c_str() << nl
+        << nl
+        << "# points : " << pointLst.size() << nl
+        << "# faces  : " << faceLst.size() << nl
+        << "# patches: " << patchLst.size() << nl;
+
+    // Print patch names as comment
+    forAll(patchLst, patchI)
+    {
+        os  << "#   " << patchI << "  " << patchLst[patchI].name()
+            << "  (nFaces: " << patchLst[patchI].size() << ")" << nl;
+    }
+
+    os  << nl
+        << "# nPoints  nFaces  nEdges" << nl
+        << pointLst.size() << ' ' << faceLst.size() << ' ' << 0 << nl;
+
+    os  << nl
+        << "# <points count=\"" << pointLst.size() << "\">" << endl;
+
+    // Write vertex coords
+    forAll(pointLst, ptI)
+    {
+        os  << pointLst[ptI].x() << ' '
+            << pointLst[ptI].y() << ' '
+            << pointLst[ptI].z() << " #" << ptI << endl;
+    }
+
+    os  << "# </points>" << nl
+        << nl
+        << "# <faces count=\"" << faceLst.size() << "\">" << endl;
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        os << "# <patch name=\"" << patchLst[patchI].name() << "\">" << endl;
+
+        forAll(patchLst[patchI], patchFaceI)
+        {
+            const face& f = faceLst[faceMap[faceIndex++]];
+
+            os  << f.size();
+            forAll(f, fp)
+            {
+                os << ' ' << f[fp];
+            }
+
+            // add optional region information
+            os << ' ' << patchI << endl;
+        }
+        os << "# </patch>" << endl;
+    }
+    os  << "# </faces>" << endl;
+}
+
+
+void Foam::fileFormats::OFFfileFormat::write
+(
+    Ostream& os,
+    const meshedSurface& surf
+)
+{
+    const pointField& pointLst = surf.points();
+    const List<face>& faceLst = surf.faces();
+    const List<surfacePatch>& patchLst = surf.patches();
+
+    // Write header
+    os  << "OFF" << endl
+        << "# Geomview OFF file written " << clock::dateTime().c_str() << nl
+        << nl
+        << "# points : " << pointLst.size() << nl
+        << "# faces  : " << faceLst.size() << nl
+        << "# patches: " << patchLst.size() << nl;
+
+    // Print patch names as comment
+    forAll(patchLst, patchI)
+    {
+        os  << "#   " << patchI << "  " << patchLst[patchI].name()
+            << "  (nFaces: " << patchLst[patchI].size() << ")" << nl;
+    }
+
+    os  << nl
+        << "# nPoints  nFaces  nEdges" << nl
+        << pointLst.size() << ' ' << faceLst.size() << ' ' << 0 << nl;
+
+    os  << nl
+        << "# <points count=\"" << pointLst.size() << "\">" << endl;
+
+    // Write vertex coords
+    forAll(pointLst, ptI)
+    {
+        os  << pointLst[ptI].x() << ' '
+            << pointLst[ptI].y() << ' '
+            << pointLst[ptI].z() << " #" << ptI << endl;
+    }
+
+    os  << "# </points>" << nl
+        << nl
+        << "# <faces count=\"" << faceLst.size() << "\">" << endl;
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        os << "# <patch name=\"" << patchLst[patchI].name() << "\">" << endl;
+
+        forAll(patchLst[patchI], patchFaceI)
+        {
+            const face& f = faceLst[faceIndex++];
+
+            os  << f.size();
+            forAll(f, fp)
+            {
+                os << ' ' << f[fp];
+            }
+
+            // add optional region information
+            os << ' ' << patchI << endl;
+        }
+        os << "# </patch>" << endl;
+    }
+    os  << "# </faces>" << endl;
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/off/OFFfileFormat.H b/src/surfMesh/keyedSurface/fileFormats/off/OFFfileFormat.H
new file mode 100644
index 0000000000..22e42769fd
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/off/OFFfileFormat.H
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::fileFormats::OFFfileFormat
+
+Description
+    Provide a means of reading/writing Geomview OFF polyList format.
+
+
+See Also
+    The <a href="http://www.geoview.org">Geoview</a>
+    file format information:
+    http://www.geomview.org/docs/html/OFF.html#OFF
+
+Note
+    When reading, the optional @a colorspec is ignored.
+    When writing, it is set to the region number (integer).
+
+SourceFiles
+    OFFfileFormat.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef OFFfileFormat_H
+#define OFFfileFormat_H
+
+#include "Ostream.H"
+#include "OFstream.H"
+#include "keyedSurface.H"
+#include "meshedSurface.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileFormats
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class OFFfileFormat Declaration
+\*---------------------------------------------------------------------------*/
+
+class OFFfileFormat
+:
+    public keyedSurface
+{
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        OFFfileFormat(const OFFfileFormat&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const OFFfileFormat&);
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        OFFfileFormat();
+
+        //- Construct from file name
+        OFFfileFormat(const fileName&, const bool triangulate=false);
+
+    // Selectors
+
+        //- Read file and return keyedSurface
+        static autoPtr<keyedSurface> New
+        (
+            const fileName& fName,
+            const bool triangulate=false
+        )
+        {
+            return autoPtr<keyedSurface>
+            (
+                new OFFfileFormat(fName,triangulate)
+            );
+        }
+
+    // Destructor
+
+    // Member Functions
+
+        // Write
+
+        //- Write keyedSurface
+        static void write(Ostream&, const keyedSurface&);
+
+        //- Write keyedSurface
+        static void write(const fileName& fName, const keyedSurface& surf)
+        {
+            write(OFstream(fName)(), surf);
+        }
+
+        //- Write meshedSurface
+        static void write(Ostream&, const meshedSurface&);
+
+        //- Write meshedSurface
+        static void write(const fileName& fName, const meshedSurface& surf)
+        {
+            write(OFstream(fName)(), surf);
+        }
+
+        //- Write object
+        virtual void write(Ostream& os) const
+        {
+            write(os, *this);
+        }
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileFormats
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/smesh/SMESHfileFormat.C b/src/surfMesh/keyedSurface/fileFormats/smesh/SMESHfileFormat.C
new file mode 100644
index 0000000000..decf8d3a61
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/smesh/SMESHfileFormat.C
@@ -0,0 +1,185 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "SMESHfileFormat.H"
+#include "clock.H"
+#include "IStringStream.H"
+#include "addToRunTimeSelectionTable.H"
+#include "addToMemberFunctionSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+namespace Foam
+{
+namespace fileFormats
+{
+
+addNamedToMemberFunctionSelectionTable
+(
+    keyedSurface,
+    SMESHfileFormat,
+    write,
+    fileExtension,
+    smesh
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    meshedSurface,
+    SMESHfileFormat,
+    write,
+    fileExtension,
+    smesh
+);
+
+}
+}
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+Foam::fileFormats::SMESHfileFormat::SMESHfileFormat()
+:
+    keyedSurface()
+{}
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void
+Foam::fileFormats::SMESHfileFormat::write
+(
+    Ostream& os,
+    const keyedSurface& surf
+)
+{
+    const pointField& pointLst= surf.points();
+    const List<keyedFace>& faceLst = surf.faces();
+
+    labelList faceMap;
+    List<surfacePatch> patchLst = surf.sortedRegions(faceMap);
+
+    os << "# tetgen .smesh file written " << clock::dateTime().c_str() << nl;
+    os << "# <points count=\"" << pointLst.size() << "\">" << endl;
+    os << pointLst.size() << " 3" << nl;    // 3: dimensions
+
+    // Write vertex coords
+    forAll(pointLst, ptI)
+    {
+        os  << ptI
+            << ' ' << pointLst[ptI].x()
+            << ' ' << pointLst[ptI].y()
+            << ' ' << pointLst[ptI].z() << nl;
+    }
+    os  << "# </points>" << nl
+        << nl
+        << "# <faces count=\"" << faceLst.size() << "\">" << endl;
+
+    os  << faceLst.size() << " 1" << endl;   // one attribute: region number
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        forAll(patchLst[patchI], patchFaceI)
+        {
+            const face& f = faceLst[faceMap[faceIndex++]];
+
+            os  << f.size();
+            forAll(f, fp)
+            {
+                os << ' ' << f[fp];
+            }
+            os << ' ' << patchI << endl;
+        }
+    }
+
+    os  << "# </faces>" << nl
+        << nl
+        << "# no holes or regions:" << nl
+        << '0' << nl        // holes
+        << '0' << endl;     // regions
+}
+
+
+void
+Foam::fileFormats::SMESHfileFormat::write
+(
+    Ostream& os,
+    const meshedSurface& surf
+)
+{
+    const pointField& pointLst= surf.points();
+    const List<face>& faceLst = surf.faces();
+    const List<surfacePatch>& patchLst = surf.patches();
+
+    os << "# tetgen .smesh file written " << clock::dateTime().c_str() << nl;
+    os << "# <points count=\"" << pointLst.size() << "\">" << endl;
+    os << pointLst.size() << " 3" << nl;    // 3: dimensions
+
+    // Write vertex coords
+    forAll(pointLst, ptI)
+    {
+        os  << ptI
+            << ' ' << pointLst[ptI].x()
+            << ' ' << pointLst[ptI].y()
+            << ' ' << pointLst[ptI].z() << nl;
+    }
+    os  << "# </points>" << nl
+        << nl
+        << "# <faces count=\"" << faceLst.size() << "\">" << endl;
+
+    os  << faceLst.size() << " 1" << endl;   // one attribute: region number
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        forAll(patchLst[patchI], patchFaceI)
+        {
+            const face& f = faceLst[faceIndex++];
+
+            os  << f.size();
+            forAll(f, fp)
+            {
+                os << ' ' << f[fp];
+            }
+            os << ' ' << patchI << endl;
+        }
+    }
+
+    os  << "# </faces>" << nl
+        << nl
+        << "# no holes or regions:" << nl
+        << '0' << nl        // holes
+        << '0' << endl;     // regions
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/smesh/SMESHfileFormat.H b/src/surfMesh/keyedSurface/fileFormats/smesh/SMESHfileFormat.H
new file mode 100644
index 0000000000..6e034e25ca
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/smesh/SMESHfileFormat.H
@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::fileFormats::SMESHfileFormat
+
+Description
+    Provide a means of writing tetgen SMESH format.
+
+    Tetgen http://tetgen.berlios.de
+
+See Also
+    File format information:
+    http://tetgen.berlios.de/fformats.smesh.html
+
+SourceFiles
+    SMESHfileFormat.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef SMESHfileFormat_H
+#define SMESHfileFormat_H
+
+#include "IFstream.H"
+#include "OFstream.H"
+#include "Ostream.H"
+#include "keyedSurface.H"
+#include "meshedSurface.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileFormats
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class SMESHfileFormat Declaration
+\*---------------------------------------------------------------------------*/
+
+class SMESHfileFormat
+:
+    public keyedSurface
+{
+    // Private data
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        SMESHfileFormat(const SMESHfileFormat&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const SMESHfileFormat&);
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        SMESHfileFormat();
+
+    // Selectors
+
+    // Destructor
+
+    // Member Functions
+
+        //- Write keyedSurface
+        static void write(Ostream&, const keyedSurface&);
+
+        //- Write meshedSurface
+        static void write(Ostream&, const meshedSurface&);
+
+        //- Write keyedSurface
+        static void write(const fileName& fName, const keyedSurface& surf)
+        {
+            write(OFstream(fName)(), surf);
+        }
+
+        //- Write meshedSurface
+        static void write(const fileName& fName, const meshedSurface& surf)
+        {
+            write(OFstream(fName)(), surf);
+        }
+
+
+        //- Write object
+        virtual void write(Ostream& os) const
+        {
+            write(os, *this);
+        }
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileFormats
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/starcd/STARCDfileFormat.C b/src/surfMesh/keyedSurface/fileFormats/starcd/STARCDfileFormat.C
new file mode 100644
index 0000000000..61f7502a5a
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/starcd/STARCDfileFormat.C
@@ -0,0 +1,478 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "STARCDfileFormat.H"
+#include "clock.H"
+#include "OSspecific.H"
+#include "IStringStream.H"
+#include "addToRunTimeSelectionTable.H"
+#include "addToMemberFunctionSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+namespace Foam
+{
+namespace fileFormats
+{
+
+addNamedToRunTimeSelectionTable
+(
+    keyedSurface,
+    STARCDfileFormat,
+    fileExtension,
+    inp
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    keyedSurface,
+    STARCDfileFormat,
+    write,
+    fileExtension,
+    inp
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    meshedSurface,
+    STARCDfileFormat,
+    write,
+    fileExtension,
+    inp
+);
+
+}
+}
+
+//! @cond localScope
+const int starcdShellShape = 3;
+const int starcdShellType  = 4;
+//! @endcond localScope
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+bool Foam::fileFormats::STARCDfileFormat::readHeader
+(
+    IFstream& is,
+    const word& signature
+)
+{
+    if (!is.good())
+    {
+        FatalErrorIn("fileFormats::STARCDfileFormat::readHeader()")
+            << "cannot read " << signature  << "  " << is.name()
+            << abort(FatalError);
+    }
+
+    word header;
+    label majorVersion;
+
+    string line;
+
+    is.getLine(line);
+    IStringStream(line)() >> header;
+
+    is.getLine(line);
+    IStringStream(line)() >> majorVersion;
+
+    // add other checks ...
+    if (header != signature)
+    {
+        Info<< "header mismatch " << signature << "  " << is.name()
+            << endl;
+    }
+
+    return true;
+}
+
+
+void Foam::fileFormats::STARCDfileFormat::writeHeader
+(
+    Ostream& os,
+    const char* filetype
+)
+{
+    os  << "PROSTAR_" << filetype << nl
+        << 4000
+        << " " << 0
+        << " " << 0
+        << " " << 0
+        << " " << 0
+        << " " << 0
+        << " " << 0
+        << " " << 0
+        << endl;
+}
+
+
+void Foam::fileFormats::STARCDfileFormat::writePoints
+(
+    Ostream& os,
+    const pointField& pointLst
+)
+{
+    writeHeader(os, "VERTEX");
+
+    // Set the precision of the points data to 10
+    os.precision(10);
+
+    // force decimal point for Fortran input
+    os.setf(std::ios::showpoint);
+
+    forAll(pointLst, ptI)
+    {
+        os
+            << ptI + 1 << " "
+            << pointLst[ptI].x() << " "
+            << pointLst[ptI].y() << " "
+            << pointLst[ptI].z() << nl;
+    }
+    os.flush();
+}
+
+
+inline void Foam::fileFormats::STARCDfileFormat::writeShell
+(
+    Ostream& os,
+    const face& f,
+    const label cellId,
+    const label cellTableId
+)
+{
+    os
+        << cellId                // includes 1 offset
+        << " " << starcdShellShape  // 3(shell)
+        << " " << f.size()
+        << " " << cellTableId
+        << " " << starcdShellType;  // 4(shell)
+
+    // primitives have <= 8 vertices, but prevent overrun anyhow
+    // indent following lines for ease of reading
+    label count = 0;
+    forAll(f, fp)
+    {
+        if ((count % 8) == 0)
+        {
+            os
+                << nl
+                << "  " << cellId;
+        }
+        os  << " " << f[fp] + 1;
+        count++;
+    }
+    os  << endl;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fileFormats::STARCDfileFormat::STARCDfileFormat()
+:
+    Foam::keyedSurface()
+{}
+
+
+// .vrt file format:
+/*---------------------------------------------------------------------------*\
+Line 1:
+  PROSTAR_VERTEX [newline]
+
+Line 2:
+  <version> 0 0 0 0 0 0 0 [newline]
+
+Body:
+  <vertexId>  <x>  <y>  <z> [newline]
+
+\*---------------------------------------------------------------------------*/
+
+Foam::fileFormats::STARCDfileFormat::STARCDfileFormat
+(
+    const fileName& fName,
+    const bool triangulation
+)
+:
+    Foam::keyedSurface()
+{
+    fileName baseName = fName.lessExt();
+    autoPtr<IFstream> isPtr;
+
+
+    DynamicList<point> pointLst;
+    // STAR-CD index of points
+    DynamicList<label> pointId;
+
+    //
+    // read .vrt file
+    //
+    isPtr.reset(new IFstream(baseName + ".vrt"));
+
+    if (!isPtr().good())
+    {
+        FatalErrorIn
+        (
+            "fileFormats::STARCDfileFormat::STARCDfileFormat(const fileName&)"
+        )
+            << "Cannot read file " << (baseName + ".vrt")
+            << exit(FatalError);
+    }
+
+    readHeader(isPtr(), "PROSTAR_VERTEX");
+
+    label lineLabel;
+
+    while ((isPtr() >> lineLabel).good())
+    {
+        pointId.append(lineLabel);
+        scalar x, y, z;
+
+        isPtr() >> x >> y >> z;
+
+        pointLst.append(point(x, y, z));
+    }
+
+    // transfer to normal lists
+    points().transfer(pointLst);
+
+    // Build inverse mapping (index to point)
+    pointId.shrink();
+    Map<label> mapToFoamPointId(2*pointId.size());
+    forAll(pointId, i)
+    {
+        mapToFoamPointId.insert(pointId[i], i);
+    }
+    pointId.clear();
+
+
+    DynamicList<keyedFace> faceLst;
+
+    // From face cellTableId to patchId
+    Map<label> cellTableToPatchId;
+    label nPatches = 0;
+
+
+    //
+    // read .cel file
+    //
+    isPtr.reset(new IFstream(baseName + ".cel"));
+
+    if (!isPtr().good())
+    {
+        FatalErrorIn
+        (
+            "fileFormats::STARCDfileFormat::STARCDfileFormat(const fileName&)"
+        )
+            << "Cannot read file " << (baseName + ".cel")
+            << exit(FatalError);
+    }
+
+    readHeader(isPtr(), "PROSTAR_CELL");
+
+    label shapeId, nLabels, cellTableId, typeId;
+    labelList starLabels(64);
+
+    while ((isPtr() >> lineLabel).good())
+    {
+        isPtr() >> shapeId >> nLabels >> cellTableId >> typeId;
+
+        if (nLabels > starLabels.size())
+        {
+            starLabels.setSize(nLabels);
+        }
+        starLabels = -1;
+
+        // read indices - max 8 per line
+        for (label i = 0; i < nLabels; ++i)
+        {
+            if ((i % 8) == 0)
+            {
+               isPtr() >> lineLabel;
+            }
+            isPtr() >> starLabels[i];
+        }
+
+        if (typeId == starcdShellType)
+        {
+            // Convert groupID into patchID
+            Map<label>::const_iterator iter =
+                cellTableToPatchId.find(cellTableId);
+
+            label patchI;
+            if (iter == cellTableToPatchId.end())
+            {
+                patchI = nPatches++;
+
+                cellTableToPatchId.insert(cellTableId, patchI);
+            }
+            else
+            {
+                patchI = iter();
+            }
+
+
+            // convert orig vertex id to point label
+            for (label i=0; i < nLabels; ++i)
+            {
+                starLabels[i] = mapToFoamPointId[starLabels[i]];
+            }
+
+            if (triangulation && nLabels > 3)
+            {
+                face f
+                (
+                    SubList<label>(starLabels, nLabels)
+                );
+
+                faceList triFaces(f.nTriangles(points()));
+                label nTri = 0;
+                f.triangles(points(), nTri, triFaces);
+
+                forAll(triFaces, faceI)
+                {
+                    faceLst.append
+                    (
+                        keyedFace
+                        (
+                            triFaces[faceI],
+                            patchI
+                        )
+                    );
+                }
+            }
+            else
+            {
+                faceLst.append
+                (
+                    keyedFace
+                    (
+                        face(SubList<label>(starLabels, nLabels)),
+                        patchI
+                    )
+                );
+            }
+        }
+    }
+
+    mapToFoamPointId.clear();
+
+    // convert cellTable_N patchId => name
+    Map<word> regionNames;
+    forAllConstIter(Map<label>, cellTableToPatchId, iter)
+    {
+        regionNames.insert
+        (
+            iter(),
+            "cellTable_" + Foam::name(iter.key())
+        );
+    }
+
+    // transfer to normal lists
+    faces().transfer(faceLst);
+
+    setPatches(regionNames);
+}
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+
+void Foam::fileFormats::STARCDfileFormat::write
+(
+    const fileName& fName,
+    const keyedSurface& surf
+)
+{
+    const List<keyedFace>& faceLst = surf.faces();
+
+    fileName baseName = fName.lessExt();
+    autoPtr<OFstream> osPtr;
+
+    osPtr.reset(new OFstream(baseName + ".vrt"));
+    writePoints(osPtr(), surf.points());
+
+
+    labelList faceMap;
+    List<surfacePatch> patchLst = surf.sortedRegions(faceMap);
+
+
+    osPtr.reset(new OFstream(baseName + ".cel"));
+    writeHeader(osPtr(), "CELL");
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        const surfacePatch& patch = patchLst[patchI];
+
+        forAll(patch, patchFaceI)
+        {
+            const face& f = faceLst[faceMap[faceIndex++]];
+
+            writeShell(osPtr(), f, faceIndex, patchI + 1);
+        }
+    }
+}
+
+
+
+void Foam::fileFormats::STARCDfileFormat::write
+(
+    const fileName& fName,
+    const meshedSurface& surf
+)
+{
+    const List<face>& faceLst = surf.faces();
+    const List<surfacePatch>& patchLst = surf.patches();
+
+
+    fileName baseName = fName.lessExt();
+    autoPtr<OFstream> osPtr;
+
+    osPtr.reset(new OFstream(baseName + ".vrt"));
+    writePoints(osPtr(), surf.points());
+
+
+    osPtr.reset(new OFstream(baseName + ".cel"));
+    writeHeader(osPtr(), "CELL");
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        const surfacePatch& patch = patchLst[patchI];
+
+        forAll(patch, patchFaceI)
+        {
+            const face& f = faceLst[faceIndex++];
+            writeShell(osPtr(), f, faceIndex, patchI + 1);
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/starcd/STARCDfileFormat.H b/src/surfMesh/keyedSurface/fileFormats/starcd/STARCDfileFormat.H
new file mode 100644
index 0000000000..f1a8e5a30c
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/starcd/STARCDfileFormat.H
@@ -0,0 +1,149 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::fileFormats::STARCDfileFormat
+
+Description
+    Read/write the surface shells from pro-STAR vrt/cel files.
+
+Note
+    Uses the extension @a .inp (input) to denote the format.
+
+See Also
+    Foam::meshReaders::STARCD
+
+SourceFiles
+    STARCDfileFormat.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef STARCDfileFormat_H
+#define STARCDfileFormat_H
+
+#include "STLtriangle.H"
+#include "IFstream.H"
+#include "Ostream.H"
+#include "OFstream.H"
+#include "keyedSurface.H"
+#include "meshedSurface.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileFormats
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class STARCDfileFormat Declaration
+\*---------------------------------------------------------------------------*/
+
+class STARCDfileFormat
+:
+    public keyedSurface
+{
+    // Private data
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        STARCDfileFormat(const STARCDfileFormat&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const STARCDfileFormat&);
+
+
+        static bool readHeader(IFstream&, const word&);
+
+        static void writeHeader(Ostream&, const char* filetype);
+
+        static void writePoints(Ostream&, const pointField&);
+
+        static inline void writeShell
+        (
+            Ostream&,
+            const face&,
+            const label cellId,
+            const label cellTableId
+        );
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        STARCDfileFormat();
+
+        //- Construct from file name
+        STARCDfileFormat(const fileName&, const bool triangulate=true);
+
+    // Selectors
+
+        //- Read file and return keyedSurface
+        static autoPtr<keyedSurface> New
+        (
+            const fileName& fName,
+            const bool triangulate=true
+        )
+        {
+            return autoPtr<keyedSurface>
+            (
+                new STARCDfileFormat(fName, triangulate)
+            );
+        }
+
+    // Destructor
+
+    // Member Functions
+
+        // Write
+
+        //- Write keyedSurface
+        static void write(const fileName&, const keyedSurface&);
+
+        //- Write meshedSurface
+        static void write(const fileName&, const meshedSurface&);
+
+        //- Write to Ostream as one large file - not really useful
+        virtual void write(Ostream&) const
+        {
+            notImplemented("fileFormats::STARCDfileFormat::write(Ostream&)");
+        }
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileFormats
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/stl/STLfileFormat.C b/src/surfMesh/keyedSurface/fileFormats/stl/STLfileFormat.C
new file mode 100644
index 0000000000..6a3db12c10
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/stl/STLfileFormat.C
@@ -0,0 +1,590 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "STLfileFormat.H"
+#include "clock.H"
+#include "OSspecific.H"
+#include "addToRunTimeSelectionTable.H"
+#include "addToMemberFunctionSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+namespace Foam
+{
+namespace fileFormats
+{
+
+addNamedToRunTimeSelectionTable
+(
+    keyedSurface,
+    STLfileFormat,
+    fileExtension,
+    stl
+);
+
+addNamedToRunTimeSelectionTable
+(
+    keyedSurface,
+    STLfileFormat,
+    fileExtension,
+    stlb
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    keyedSurface,
+    STLfileFormat,
+    write,
+    fileExtension,
+    stl
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    keyedSurface,
+    STLfileFormat,
+    write,
+    fileExtension,
+    stlb
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    meshedSurface,
+    STLfileFormat,
+    write,
+    fileExtension,
+    stl
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    meshedSurface,
+    STLfileFormat,
+    write,
+    fileExtension,
+    stlb
+);
+
+}
+}
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+
+// check binary by getting the header and number of facets
+// this seems to work better than the old token-based method
+// - some programs (eg, pro-STAR) have 'solid' as the first word in
+//   the binary header.
+// - using wordToken can cause an abort if non-word (binary) content
+//   is detected ... this is not exactly what we want.
+bool Foam::fileFormats::STLfileFormat::detectBINARY
+(
+    const fileName& fName
+)
+{
+    off_t fileSize = Foam::size(fName);
+
+    IFstream ifs(fName, IOstream::BINARY);
+    istream& is = ifs.stdStream();
+
+    // Read the STL header
+    char header[headerSize];
+    is.read(header, headerSize);
+
+    // Check that stream is OK, if not this may be an ASCII file
+    if (!is.good())
+    {
+        return false;
+    }
+
+    // Read the number of triangles in the STl file
+    // (note: read as int so we can check whether >2^31)
+    int nTris;
+    is.read(reinterpret_cast<char*>(&nTris), sizeof(unsigned int));
+
+    // Check that stream is OK and number of triangles is positive,
+    // if not this maybe an ASCII file
+    //
+    // Also compare the file size with that expected from the number of tris
+    // If the comparison is not sensible then it may be an ASCII file
+    if
+    (
+        !is
+     || nTris < 0
+     || nTris < (fileSize - headerSize)/50
+     || nTris > (fileSize - headerSize)/25
+    )
+    {
+        return false;
+    }
+
+    // looks like it might be BINARY
+    return true;
+}
+
+
+#undef DEBUG_STLBINARY
+
+bool Foam::fileFormats::STLfileFormat::readBINARY
+(
+    IFstream& ifs,
+    const off_t fileSize
+)
+{
+    istream& is = ifs.stdStream();
+
+    // Read the STL header
+    char header[headerSize];
+    is.read(header, headerSize);
+
+    // Check that stream is OK, if not this may be an ASCII file
+    if (!is.good())
+    {
+        FatalErrorIn("fileFormats::STLfileFormat::readBINARY(Istream&)")
+            << "problem reading header, perhaps file is not binary "
+            << exit(FatalError);
+    }
+
+    // Read the number of triangles in the STl file
+    // (note: read as int so we can check whether >2^31)
+    int nTris;
+    is.read(reinterpret_cast<char*>(&nTris), sizeof(unsigned int));
+
+    // Check that stream is OK and number of triangles is positive,
+    // if not this maybe an ASCII file
+    //
+    // Also compare the file size with that expected from the number of tris
+    // If the comparison is not sensible then it may be an ASCII file
+    if
+    (
+        !is
+     || nTris < 0
+     || nTris < (fileSize - headerSize)/50
+     || nTris > (fileSize - headerSize)/25
+    )
+    {
+        FatalErrorIn("fileFormats::STLfileFormat::readBINARY(Istream&)")
+            << "problem reading number of triangles, perhaps file is not binary"
+            << exit(FatalError);
+    }
+
+#ifdef DEBUG_STLBINARY
+    Info<< "# " << nTris << " facets" << endl;
+    label prevRegion = -1;
+#endif
+
+
+    pointField  pointLst(3*nTris);
+    List<keyedFace> faceLst(nTris);
+
+    label maxRegionId = 0;
+
+    label pointI = 0;
+    forAll(faceLst, faceI)
+    {
+        // Read an STL triangle
+        STLtriangle stlTri(is);
+
+        // Set the rawPoints to the vertices of the STL triangle
+        // and set the point labels of the face
+        face f(3);
+
+        pointLst[pointI] = stlTri.a();
+        f[0] = pointI++;
+
+        pointLst[pointI] = stlTri.b();
+        f[1] = pointI++;
+
+        pointLst[pointI] = stlTri.c();
+        f[2] = pointI++;
+
+        if (maxRegionId < stlTri.region())
+        {
+            maxRegionId = stlTri.region();
+        }
+
+        // interprete colour as a region
+        faceLst[faceI] = keyedFace(f, stlTri.region());
+
+#ifdef DEBUG_STLBINARY
+        if
+        (
+            prevRegion != stlTri.region()
+        )
+        {
+            if (prevRegion != -1)
+            {
+                Info<< "endsolid region" << prevRegion << nl;
+            }
+            prevRegion = stlTri.region();
+
+            Info<< "solid region" << prevRegion << nl;
+        }
+
+        Info<< "  facet normal " << stlTri.normal() << nl;
+        Info<< "    outer loop" << nl;
+        Info<< "      vertex " << stlTri.a() << nl;
+        Info<< "      vertex " << stlTri.b() << nl;
+        Info<< "      vertex " << stlTri.c() << nl;
+        Info<< "    outer loop" << nl;
+        Info<< "  endfacet" << endl;
+#endif
+    }
+#ifdef DEBUG_STLBINARY
+    Info<< "endsolid region" << prevRegion << nl;
+#endif
+
+    points().transfer(pointLst);
+    faces().transfer(faceLst);
+    setPatches(maxRegionId);
+    stitchFaces(SMALL);
+
+    return true;
+}
+
+
+inline void Foam::fileFormats::STLfileFormat::writeShell
+(
+    Ostream& os,
+    const pointField& pointLst,
+    const face& f,
+    const vector& norm
+)
+{
+    // simple triangulation about f[0].
+    // better triangulation should have been done before
+    const point& p0 = pointLst[f[0]];
+    for (label fp1 = 1; fp1 < f.size() - 1; ++fp1)
+    {
+        label fp2 = (fp1 + 1) % f.size();
+
+        const point& p1 = pointLst[f[fp1]];
+        const point& p2 = pointLst[f[fp2]];
+
+        // write STL triangle
+        os  << "  facet normal "
+            << norm.x() << ' ' << norm.y() << ' ' << norm.z() << nl
+            << "    outer loop\n"
+            << "       vertex "
+            << p0.x() << ' ' << p0.y() << ' ' << p0.z() << nl
+            << "       vertex "
+            << p1.x() << ' ' << p1.y() << ' ' << p1.z() << nl
+            << "       vertex "
+            << p2.x() << ' ' << p2.y() << ' ' << p2.z() << nl
+            << "    endloop\n"
+            << "  endfacet" << endl;
+    }
+}
+
+
+inline void Foam::fileFormats::STLfileFormat::writeShell
+(
+    ostream& os,
+    const pointField& pointLst,
+    const face& f,
+    const vector& norm,
+    const label patchI
+)
+{
+    // simple triangulation about f[0].
+    // better triangulation should have been done before
+    const point& p0 = pointLst[f[0]];
+    for (label fp1 = 1; fp1 < f.size() - 1; ++fp1)
+    {
+        label fp2 = (fp1 + 1) % f.size();
+
+        STLtriangle stlTri
+        (
+            norm,
+            p0,
+            pointLst[f[fp1]],
+            pointLst[f[fp2]],
+            patchI
+        );
+
+        stlTri.write(os);
+    }
+}
+
+
+
+
+// write sorted:
+void Foam::fileFormats::STLfileFormat::writeASCII
+(
+    Ostream& os,
+    const keyedSurface& surf
+)
+{
+    const pointField& pointLst = surf.points();
+    const List<keyedFace>& faceLst = surf.faces();
+    const vectorField& normLst = surf.faceNormals();
+
+    labelList faceMap;
+    List<surfacePatch> patchLst = surf.sortedRegions(faceMap);
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        // Print all faces belonging to this region
+        const surfacePatch& patch = patchLst[patchI];
+
+        os << "solid " << patch.name() << endl;
+
+        forAll(patch, patchFaceI)
+        {
+            const label faceI = faceMap[faceIndex++];
+            writeShell(os, pointLst, faceLst[faceI], normLst[faceI]);
+        }
+
+        os << "endsolid " << patch.name() << endl;
+    }
+}
+
+
+
+// write sorted:
+void Foam::fileFormats::STLfileFormat::writeASCII
+(
+    Ostream& os,
+    const meshedSurface& surf
+)
+{
+    const pointField& pointLst = surf.points();
+    const List<face>& faceLst = surf.faces();
+    const List<surfacePatch>& patchLst = surf.patches();
+    const vectorField& normLst = surf.faceNormals();
+
+    // force triangulation, but just do the cheapest form possible
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        // Print all faces belonging to this region
+        const surfacePatch& patch = patchLst[patchI];
+
+        os << "solid " << patch.name() << endl;
+
+        forAll(patch, patchFaceI)
+        {
+            const label faceI = faceIndex++;
+            writeShell(os, pointLst, faceLst[faceI], normLst[faceI]);
+        }
+
+        os << "endsolid " << patch.name() << endl;
+    }
+}
+
+
+// write unsorted:
+void Foam::fileFormats::STLfileFormat::writeBINARY
+(
+    ostream& os,
+    const keyedSurface& surf
+)
+{
+    const pointField& pointLst = surf.points();
+    const List<keyedFace>& faceLst = surf.faces();
+    const vectorField& normLst = surf.faceNormals();
+
+    // Write the STL header
+    string header("STL binary file", headerSize);
+
+    // clear possible trailing junk
+    for (label i = header.size(); i < headerSize; ++i)
+    {
+        header[i] = 0;
+    }
+    os.write(header.c_str(), headerSize);
+
+    // force triangulation, but just do the cheapest form possible
+    unsigned int nTris = 0;
+    forAll(faceLst, faceI)
+    {
+        nTris += faceLst[faceI].size() - 2;
+    }
+
+    os.write(reinterpret_cast<char*>(&nTris), sizeof(unsigned int));
+
+    forAll(faceLst, faceI)
+    {
+        writeShell
+        (
+            os,
+            pointLst,
+            faceLst[faceI],
+            normLst[faceI],
+            faceLst[faceI].key()
+        );
+    }
+}
+
+
+void Foam::fileFormats::STLfileFormat::writeBINARY
+(
+    ostream& os,
+    const meshedSurface& surf
+)
+{
+    const pointField& pointLst = surf.points();
+    const List<face>& faceLst = surf.faces();
+    const surfacePatchList& patchLst = surf.patches();
+    const vectorField& normLst = surf.faceNormals();
+
+    // Write the STL header
+    string header("STL binary file", headerSize);
+    os.write(header.c_str(), headerSize);
+
+    // force triangulation, but just do the cheapest form possible
+
+    unsigned int nTris = 0;
+    forAll(faceLst, faceI)
+    {
+        nTris += faceLst[faceI].size() - 2;
+    }
+
+    os.write(reinterpret_cast<char*>(&nTris), sizeof(unsigned int));
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        forAll(patchLst[patchI], patchFaceI)
+        {
+            writeShell
+            (
+                os,
+                pointLst,
+                faceLst[faceIndex],
+                normLst[faceIndex],
+                patchI
+            );
+
+            ++faceIndex;
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fileFormats::STLfileFormat::STLfileFormat()
+:
+    Foam::keyedSurface()
+{}
+
+
+Foam::fileFormats::STLfileFormat::STLfileFormat
+(
+    const fileName& fName,
+    const bool
+)
+:
+    Foam::keyedSurface()
+{
+    off_t fileSize = Foam::size(fName);
+
+    // auto-detect ascii/binary
+    if (detectBINARY(fName))
+    {
+        readBINARY(IFstream(fName, IOstream::BINARY)(), fileSize);
+    }
+    else
+    {
+        readASCII(IFstream(fName)(), fileSize);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+
+void Foam::fileFormats::STLfileFormat::write
+(
+    Ostream& os,
+    const keyedSurface& surf
+)
+{
+    writeASCII(os, surf);
+}
+
+
+void Foam::fileFormats::STLfileFormat::write
+(
+    Ostream& os,
+    const meshedSurface& surf
+)
+{
+    writeASCII(os, surf);
+}
+
+
+void Foam::fileFormats::STLfileFormat::write
+(
+    const fileName& fName,
+    const keyedSurface& surf
+)
+{
+    const word ext = fName.ext();
+
+    // handle 'stlb' as binary directly
+    if (ext == "stlb")
+    {
+        std::ofstream ofs(fName.c_str(), std::ios::binary);
+        writeBINARY(ofs, surf);
+    }
+    else
+    {
+        writeASCII(OFstream(fName)(), surf);
+    }
+}
+
+
+void Foam::fileFormats::STLfileFormat::write
+(
+    const fileName& fName,
+    const meshedSurface& surf
+)
+{
+    const word ext = fName.ext();
+
+    // handle 'stlb' as binary directly
+    if (ext == "stlb")
+    {
+        std::ofstream ofs(fName.c_str(), std::ios::binary);
+        writeBINARY(ofs, surf);
+    }
+    else
+    {
+        writeASCII(OFstream(fName)(), surf);
+    }
+}
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/stl/STLfileFormat.H b/src/surfMesh/keyedSurface/fileFormats/stl/STLfileFormat.H
new file mode 100644
index 0000000000..69553d0cba
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/stl/STLfileFormat.H
@@ -0,0 +1,177 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::fileFormats::STLfileFormat
+
+Description
+    Provide a means of reading/writing STL files (ASCII and binary).
+
+SourceFiles
+    STLfileFormat.C
+    STLfileFormatASCII.L
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef STLfileFormat_H
+#define STLfileFormat_H
+
+#include "STLtriangle.H"
+#include "IFstream.H"
+#include "Ostream.H"
+#include "OFstream.H"
+#include "keyedSurface.H"
+#include "meshedSurface.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileFormats
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class STLfileFormat Declaration
+\*---------------------------------------------------------------------------*/
+
+class STLfileFormat
+:
+    public keyedSurface
+{
+    // Private data
+
+        //- The number of bytes in the STL binary header
+        static const int headerSize=80;
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        STLfileFormat(const STLfileFormat&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const STLfileFormat&);
+
+        bool detectBINARY(const fileName&);
+
+        bool readASCII(IFstream&, const off_t);
+        bool readBINARY(IFstream&, const off_t);
+
+        //- write face in ASCII
+        static inline void writeShell
+        (
+            Ostream&,
+            const pointField&,
+            const face&,
+            const vector& norm
+        );
+
+        //- write face in BINARY
+        static inline void writeShell
+        (
+            ostream&,
+            const pointField&,
+            const face&,
+            const vector&,
+            const label patchI
+        );
+
+
+        //- Write keySurface
+        static void writeASCII(Ostream&, const keyedSurface&);
+
+        //- Write keyedSurface
+        static void writeBINARY(ostream&, const keyedSurface&);
+
+        //- Write meshedSurface
+        static void writeASCII(Ostream&, const meshedSurface&);
+
+        //- Write meshedSurface
+        static void writeBINARY(ostream&, const meshedSurface&);
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        STLfileFormat();
+
+        //- Construct from file name
+        STLfileFormat(const fileName&, const bool triangulate=true);
+
+    // Selectors
+
+        //- Read file and return keyedSurface
+        static autoPtr<keyedSurface> New
+        (
+            const fileName& fName,
+            const bool triangulate=true
+        )
+        {
+            return autoPtr<keyedSurface>
+            (
+                new STLfileFormat(fName,triangulate)
+            );
+        }
+
+    // Destructor
+
+    // Member Functions
+
+        // Write
+
+        //- Write keyedSurface
+        //  The ASCII output is sorted by patch, the binary output is unsorted
+        static void write(Ostream&, const keyedSurface&);
+
+        //- Write keyedSurface
+        //  The ASCII output is sorted by patch, the binary output is unsorted
+        static void write(const fileName&, const keyedSurface&);
+
+        //- Write meshedSurface
+        static void write(Ostream&, const meshedSurface&);
+
+        //- Write meshedSurface
+        static void write(const fileName&, const meshedSurface&);
+
+        //- Write object
+        virtual void write(Ostream& os) const
+        {
+            write(os, *this);
+        }
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileFormats
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/stl/STLfileFormatASCII.L b/src/surfMesh/keyedSurface/fileFormats/stl/STLfileFormatASCII.L
new file mode 100644
index 0000000000..57801dee8d
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/stl/STLfileFormatASCII.L
@@ -0,0 +1,426 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+%{
+
+#undef yyFlexLexer
+
+ /* ------------------------------------------------------------------------ *\
+   ------ local definitions
+ \* ------------------------------------------------------------------------ */
+
+#include "STLfileFormat.H"
+
+using namespace Foam;
+
+// Dummy yyFlexLexer::yylex() to keep the linker happy. It is not called
+//! @cond dummy
+int yyFlexLexer::yylex()
+{
+    FatalErrorIn("yyFlexLexer::yylex()")
+        << "Should not have called this function"
+        << abort(FatalError);
+    return 0;
+}
+//! @endcond dummy
+
+// Dummy yywrap to keep yylex happy at compile time.
+// It is called by yylex but is not used as the mechanism to change file.
+// See <<EOF>>
+//! @cond dummy
+#if YY_FLEX_SUBMINOR_VERSION < 34
+extern "C" int yywrap()
+#else
+int yyFlexLexer::yywrap()
+#endif
+{
+    return 1;
+}
+//! @endcond dummy
+
+
+//- A lexer for parsing STL ASCII files.
+//  Returns DynamicList(s) of points and facets (regionIds).
+//  Since the facets appear within a solid/endsolid grouping,
+//  they are always within a region
+class STLASCIILexer
+:
+    public yyFlexLexer
+{
+    // Private data
+
+        short groupID_;      // current region
+        short maxGroupID_;   // max region
+        label lineNo_;
+        word  startError_;
+
+        DynamicList<point> points_;
+        DynamicList<label> facets_;
+        HashTable<label> groupToPatch_;
+
+public:
+
+    // Constructors
+
+        //- From input stream and the approximate number of vertices in the STL
+        STLASCIILexer(istream* is, const label approxNpoints);
+
+
+    // Member Functions
+
+        //- The lexer function itself
+        int lex();
+
+    // Access
+
+        //- A list of points corresponding to a pointField
+        DynamicList<point>& points()
+        {
+            return points_;
+        }
+
+        //- A list of facet IDs (region IDs)
+        //  corresponds to the number of triangles
+        DynamicList<label>& facets()
+        {
+            return facets_;
+        }
+
+        //- region names
+        const HashTable<label>& groupToPatch() const
+        {
+            return groupToPatch_;
+        }
+
+};
+
+
+STLASCIILexer::STLASCIILexer(istream* is, const label approxNpoints)
+:
+    yyFlexLexer(is),
+    groupID_(-1),
+    maxGroupID_(-1),
+    lineNo_(1),
+    points_(approxNpoints),
+    facets_(approxNpoints)
+{}
+
+
+ /* ------------------------------------------------------------------------ *\
+   ------ cppLexer::yylex()
+ \* ------------------------------------------------------------------------ */
+
+#define YY_DECL int STLASCIILexer::lex()
+
+%}
+
+one_space             [ \t\f\r]
+space                 {one_space}*
+some_space            {one_space}+
+cspace                ","{space}
+
+alpha                 [_A-Za-z]
+digit                 [0-9]
+dec_digit             [0-9]
+octal_digit           [0-7]
+hex_digit             [0-9a-fA-F]
+
+identifier            {alpha}({alpha}|{digit})*
+integer               {dec_digit}+
+label                 [1-9]{dec_digit}*
+zeroLabel             {digit}*
+signedInteger         [-+]?{integer}
+
+word                  ([[:alnum:]]|[[:punct:]])*
+string                {word}({some_space}{word})*
+
+exponent_part         [eE][-+]?{digit}+
+fractional_constant   [-+]?(({digit}*"."{digit}+)|({digit}+"."?))
+
+double                (({fractional_constant}{exponent_part}?)|({digit}+{exponent_part}))
+float                 {double}
+
+x                     {float}
+y                     {float}
+z                     {float}
+
+solid                 {space}("solid"|"SOLID"){space}
+color                 {space}("color"|"COLOR"){some_space}{float}{some_space}{float}{some_space}{float}{space}
+facet                 {space}("facet"|"FACET"){space}
+normal                {space}("normal"|"NORMAL"){space}
+point                 {space}{x}{some_space}{y}{some_space}{z}{space}
+outerloop             {space}("outer"{some_space}"loop")|("OUTER"{some_space}"LOOP"){space}
+vertex                {space}("vertex"|"VERTEX"){space}
+endloop               {space}("endloop"|"ENDLOOP"){space}
+endfacet              {space}("endfacet"|"ENDFACET"){space}
+endsolid              {space}("endsolid"|"ENDSOLID")({some_space}{word})*
+
+
+ /* ------------------------------------------------------------------------ *\
+                      -----  Exclusive start states -----
+ \* ------------------------------------------------------------------------ */
+
+%option stack
+
+%x readSolidName
+%x readFacet
+%x readNormal
+%x readVertices
+%x readVertex
+%x stlError
+
+%%
+
+%{
+    // End of read character pointer returned by strtof
+    // char* endPtr;
+
+    STLpoint normal;
+    STLpoint vertex;
+    label cmpt = 0;   // component index used for reading vertex
+
+    static const char* stateNames[7] =
+    {
+        "reading solid",
+        "reading solid name",
+        "reading facet",
+        "reading normal",
+        "reading vertices",
+        "reading vertex",
+        "error"
+    };
+
+    static const char* stateExpects[7] =
+    {
+        "'solid', 'color', 'facet' or 'endsolid'",
+        "<string>",
+        "'normal', 'outer loop' or 'endfacet'",
+        "<float> <float> <float>",
+        "'vertex' or 'endloop'",
+        "<float> <float> <float>",
+        ""
+    };
+%}
+
+
+ /* ------------------------------------------------------------------------ *\
+                            ------ Start Lexing ------
+ \* ------------------------------------------------------------------------ */
+
+ /*                      ------ Reading control header ------                */
+
+{solid} {
+        BEGIN(readSolidName);
+    }
+
+<readSolidName>{string} {
+        word group(Foam::string::validate<word>(YYText()));
+
+        HashTable<label>::const_iterator findGroup =
+            groupToPatch_.find(group);
+
+        if (findGroup != groupToPatch_.end())
+        {
+            groupID_ = findGroup();
+        }
+        else
+        {
+            groupID_ = ++maxGroupID_;
+            groupToPatch_.insert(group, groupID_);
+        }
+        BEGIN(INITIAL);
+    }
+
+<readSolidName>{space}\n {
+        word group("solid");
+
+        HashTable<label>::const_iterator findGroup =
+            groupToPatch_.find(group);
+
+        if (findGroup != groupToPatch_.end())
+        {
+            groupID_ = findGroup();
+        }
+        else
+        {
+            groupID_ = ++maxGroupID_;
+            groupToPatch_.insert(group, groupID_);
+        }
+
+        lineNo_++;
+        BEGIN(INITIAL);
+    }
+
+{color} {
+    }
+
+{facet} {
+        BEGIN(readFacet);
+    }
+
+<readFacet>{normal} {
+        BEGIN(readNormal);
+    }
+
+<readNormal>{point} {
+        /*
+         skip reading normals:
+         normal.x() = strtof(YYText(), &endPtr);
+         normal.y() = strtof(endPtr, &endPtr);
+         normal.z() = strtof(endPtr, &endPtr);
+         normals_.append(normal);
+         */
+        BEGIN(readFacet);
+    }
+
+<readFacet>{outerloop} {
+        BEGIN(readVertices);
+    }
+
+<readVertices>{vertex} {
+        BEGIN(readVertex);
+    }
+
+<readVertex>{space}{signedInteger}{space} {
+        vertex[cmpt++] = atol(YYText());
+
+        if (cmpt == 3)
+        {
+            cmpt = 0;
+            points_.append(vertex);
+            BEGIN(readVertices);
+        }
+    }
+
+<readVertex>{space}{float}{space} {
+        vertex[cmpt++] = atof(YYText());
+
+        if (cmpt == 3)
+        {
+            cmpt = 0;
+            points_.append(vertex);
+            BEGIN(readVertices);
+        }
+    }
+
+<readVertices>{endloop} {
+        BEGIN(readFacet);
+    }
+
+<readFacet>{endfacet} {
+        facets_.append(groupID_);
+        BEGIN(INITIAL);
+    }
+
+{endsolid} {
+    }
+
+
+ /* ------------------ Ignore remaining space and \n s. -------------------- */
+
+<*>{space} {}
+<*>\n      { lineNo_++; }
+
+
+ /* ------------------- Any other characters are errors -------------------- */
+
+<*>. {
+        startError_ = YYText();
+        yy_push_state(stlError);
+    }
+
+
+ /* ---------------------------- Error handler ----------------------------- */
+
+<stlError>.* {
+        yy_pop_state();
+        FatalErrorIn
+        (
+            "fileFormats::STLfileFormat::readASCII(const fileName& STLfileName)"
+        )   << "while " << stateNames[YY_START] << " on line " << lineNo_ << nl
+            << "    expected " << stateExpects[YY_START]
+            << " but found '" << startError_.c_str() << YYText() << "'"
+            << exit(FatalError);
+    }
+
+
+ /*  ------------------------ On EOF terminate ----------------------------  */
+
+<<EOF>> {
+            yyterminate();
+    }
+%%
+
+
+//
+// member function
+//
+bool
+Foam::fileFormats::STLfileFormat::readASCII
+(
+    IFstream& ifs,
+    const off_t fileSize
+)
+{
+    // Create the lexer with the approximate number of vertices in the STL
+    // from the file size
+    STLASCIILexer lexer(&ifs.stdStream(), fileSize/400);
+    while (lexer.lex() != 0) {}
+
+    DynamicList<point>& pointLst = lexer.points();
+    DynamicList<label>& facetsLst = lexer.facets();
+
+    // transfer to normal list
+    points().transfer(pointLst);
+
+    // make our triangles
+    facetsLst.shrink();
+    List<keyedFace> faceLst(facetsLst.size());
+
+    face fTri(3);
+    label ptI = 0;
+    forAll(facetsLst, faceI)
+    {
+        fTri[0] = ptI++;
+        fTri[1] = ptI++;
+        fTri[2] = ptI++;
+
+        faceLst[faceI] = keyedFace(fTri, facetsLst[faceI]);
+    }
+    facetsLst.clearStorage();
+
+    // transfer to normal list
+    faces().transfer(faceLst);
+    setPatches(lexer.groupToPatch());
+    stitchFaces(SMALL);
+
+    return true;
+}
+
+
+ /* ------------------------------------------------------------------------ *\
+    ------ End of STLfileFormatASCII.L
+ \* ------------------------------------------------------------------------ */
diff --git a/src/surfMesh/keyedSurface/fileFormats/stl/STLpoint.H b/src/surfMesh/keyedSurface/fileFormats/stl/STLpoint.H
new file mode 100644
index 0000000000..c9d32b14c0
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/stl/STLpoint.H
@@ -0,0 +1,93 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::STLpoint
+
+Description
+    A vertex point representation for STL files.
+
+SourceFiles
+    STLpointI.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef STLpoint_H
+#define STLpoint_H
+
+#include "point.H"
+#include "Istream.H"
+#include "Ostream.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class STLpoint Declaration
+\*---------------------------------------------------------------------------*/
+
+class STLpoint
+:
+    public Vector<float>
+{
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        inline STLpoint();
+
+        //- Construct from components
+        inline STLpoint(float x, float y, float z);
+
+        //- Construct from point
+        inline STLpoint(const point&);
+
+        //- Construct from istream
+        inline STLpoint(Istream&);
+
+
+    // Member Operators
+
+        inline operator point() const;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "STLpointI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/stl/STLpointI.H b/src/surfMesh/keyedSurface/fileFormats/stl/STLpointI.H
new file mode 100644
index 0000000000..d320c44b8d
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/stl/STLpointI.H
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::STLpoint::STLpoint()
+{}
+
+inline Foam::STLpoint::STLpoint(float x, float y, float z)
+:
+    Vector<float>(x, y, z)
+{}
+
+inline Foam::STLpoint::STLpoint(const point& pt)
+:
+    Vector<float>(float(pt.x()), float(pt.y()), float(pt.z()))
+{}
+
+inline Foam::STLpoint::STLpoint(Istream& is)
+:
+    Vector<float>(is)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+inline Foam::STLpoint::operator point() const
+{
+    return point(x(), y(), z());
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/stl/STLtriangle.H b/src/surfMesh/keyedSurface/fileFormats/stl/STLtriangle.H
new file mode 100644
index 0000000000..828a64c8ff
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/stl/STLtriangle.H
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::STLtriangle
+
+Description
+    A triangle representation for STL files.
+
+SourceFiles
+    STLtriangleI.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef STLtriangle_H
+#define STLtriangle_H
+
+#include "STLpoint.H"
+#include "Istream.H"
+#include "Ostream.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class STLtriangle Declaration
+\*---------------------------------------------------------------------------*/
+
+class STLtriangle
+{
+    // Private data
+
+        typedef unsigned short STLregion;
+
+        STLpoint normal_, a_, b_, c_;
+
+        STLregion region_;
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        inline STLtriangle();
+
+        //- Construct from components
+        inline STLtriangle
+        (
+            const STLpoint& normal,
+            const STLpoint& a,
+            const STLpoint& b,
+            const STLpoint& c,
+            unsigned short region
+        );
+
+        //- Construct from istream (read binary)
+        inline STLtriangle(istream&);
+
+
+    // Member Functions
+
+        // Access
+
+            inline const STLpoint& normal() const;
+            inline const STLpoint& a() const;
+            inline const STLpoint& b() const;
+            inline const STLpoint& c() const;
+            inline unsigned short region() const;
+
+        // Read
+
+            //- Read from istream (binary)
+            inline void read(istream&);
+
+        // Write
+
+            //- Write to ostream (binary)
+            inline void write(ostream&);
+
+
+    // Ostream operator
+
+        inline friend Ostream& operator<<(Ostream&, const STLtriangle&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "STLtriangleI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/stl/STLtriangleI.H b/src/surfMesh/keyedSurface/fileFormats/stl/STLtriangleI.H
new file mode 100644
index 0000000000..e8d3bbc949
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/stl/STLtriangleI.H
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::STLtriangle::STLtriangle()
+{}
+
+
+inline Foam::STLtriangle::STLtriangle
+(
+    const STLpoint& normal,
+    const STLpoint& a,
+    const STLpoint& b,
+    const STLpoint& c,
+    unsigned short region
+)
+:
+    normal_(normal),
+    a_(a),
+    b_(b),
+    c_(c),
+    region_(region)
+{}
+
+
+inline Foam::STLtriangle::STLtriangle(istream& is)
+{
+    read(is);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline const Foam::STLpoint& Foam::STLtriangle::normal() const
+{
+    return normal_;
+}
+
+inline const Foam::STLpoint& Foam::STLtriangle::a() const
+{
+    return a_;
+}
+
+inline const Foam::STLpoint& Foam::STLtriangle::b() const
+{
+    return b_;
+}
+
+inline const Foam::STLpoint& Foam::STLtriangle::c() const
+{
+    return c_;
+}
+
+inline unsigned short Foam::STLtriangle::region() const
+{
+    return region_;
+}
+
+
+inline void Foam::STLtriangle::read(istream& is)
+{
+    is.read(reinterpret_cast<char*>(this), 4*sizeof(STLpoint));
+    is.read(reinterpret_cast<char*>(&region_), sizeof(STLregion));
+}
+
+
+inline void Foam::STLtriangle::write(ostream& os)
+{
+    os.write(reinterpret_cast<char*>(this), 4*sizeof(STLpoint));
+    os.write(reinterpret_cast<char*>(&region_), sizeof(STLregion));
+}
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+inline Foam::Ostream& Foam::operator<<(Ostream& os, const STLtriangle& t)
+{
+    os  << t.normal_ << token::SPACE
+        << t.a_ << token::SPACE
+        << t.b_ << token::SPACE
+        << t.c_ << token::SPACE
+        << t.region_;
+
+    return os;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/tri/TRIfileFormat.C b/src/surfMesh/keyedSurface/fileFormats/tri/TRIfileFormat.C
new file mode 100644
index 0000000000..39d74fa06f
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/tri/TRIfileFormat.C
@@ -0,0 +1,287 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "TRIfileFormat.H"
+#include "clock.H"
+#include "IFstream.H"
+#include "IOmanip.H"
+#include "IStringStream.H"
+#include "addToRunTimeSelectionTable.H"
+#include "addToMemberFunctionSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+namespace Foam
+{
+namespace fileFormats
+{
+
+addNamedToRunTimeSelectionTable
+(
+    keyedSurface,
+    TRIfileFormat,
+    fileExtension,
+    tri
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    keyedSurface,
+    TRIfileFormat,
+    write,
+    fileExtension,
+    tri
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    meshedSurface,
+    TRIfileFormat,
+    write,
+    fileExtension,
+    tri
+);
+
+}
+}
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+inline void Foam::fileFormats::TRIfileFormat::writeShell
+(
+    Ostream& os,
+    const pointField& pointLst,
+    const face& f,
+    const label patchI
+)
+{
+    // simple triangulation about f[0].
+    // better triangulation should have been done before
+    const point& p0 = pointLst[f[0]];
+    for (label fp1 = 1; fp1 < f.size() - 1; ++fp1)
+    {
+        label fp2 = (fp1 + 1) % f.size();
+
+        const point& p1 = pointLst[f[fp1]];
+        const point& p2 = pointLst[f[fp2]];
+
+        os  << p0.x() << ' ' << p0.y() << ' ' << p0.z() << ' '
+            << p1.x() << ' ' << p1.y() << ' ' << p1.z() << ' '
+            << p2.x() << ' ' << p2.y() << ' ' << p2.z() << ' '
+            // region as colour
+            << "0x" << hex << patchI << dec << endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fileFormats::TRIfileFormat::TRIfileFormat()
+:
+    Foam::keyedSurface()
+{}
+
+
+Foam::fileFormats::TRIfileFormat::TRIfileFormat
+(
+    const fileName& fName,
+    const bool triangulate
+)
+:
+    Foam::keyedSurface()
+{
+    IFstream is(fName);
+
+    if (!is.good())
+    {
+        FatalErrorIn("fileFormats::TRIfileFormat(const fileName&)")
+            << "Cannot read file " << fName
+            << exit(FatalError);
+    }
+
+    // uses similar structure as STL, just some points
+    DynamicList<point> pointLst;
+    DynamicList<label> facetsLst;
+    HashTable<label>   groupToPatch;
+
+    // leave faces that didn't have a group in 0
+    label nUngrouped = 0;
+    label groupID = 0;
+    label maxGroupID = -1;
+
+    while (is.good())
+    {
+        string line = getLineNoComment(is);
+
+        // handle continuations ?
+        //          if (line[line.size()-1] == '\\')
+        //          {
+        //              line.substr(0, line.size()-1);
+        //              line += getLineNoComment(is);
+        //          }
+
+        IStringStream lineStream(line);
+
+        point p
+        (
+            readScalar(lineStream),
+            readScalar(lineStream),
+            readScalar(lineStream)
+        );
+
+        if (!lineStream) break;
+
+        pointLst.append(p);
+        pointLst.append
+        (
+            point
+            (
+                readScalar(lineStream),
+                readScalar(lineStream),
+                readScalar(lineStream)
+            )
+        );
+        pointLst.append
+        (
+            point
+            (
+                readScalar(lineStream),
+                readScalar(lineStream),
+                readScalar(lineStream)
+            )
+        );
+
+        // Region/colour in .tri file starts with 0x. Skip.
+        // ie, instead of having 0xFF, skip 0 and leave xFF to
+        // get read as a word and name it "patchFF"
+
+        char zero;
+        lineStream >> zero;
+
+        word rawName(lineStream);
+        word groupName("patch" + rawName(1, rawName.size()-1));
+
+        HashTable<label>::const_iterator findGroup =
+            groupToPatch.find(groupName);
+
+        if (findGroup != groupToPatch.end())
+        {
+            groupID = findGroup();
+        }
+        else
+        {
+            // special treatment if any initial faces were not in a group
+            if (maxGroupID == -1 && facetsLst.size())
+            {
+                groupToPatch.insert("patch0", 0);
+                nUngrouped = facetsLst.size();
+                maxGroupID = 0;
+            }
+            groupID = ++maxGroupID;
+            groupToPatch.insert(groupName, groupID);
+        }
+
+        facetsLst.append(groupID);
+    }
+
+    // transfer to normal list
+    points().transfer(pointLst);
+
+    // make our triangles
+    facetsLst.shrink();
+    List<keyedFace> faceLst(facetsLst.size());
+
+    face fTri(3);
+    label ptI = 0;
+    forAll(facetsLst, faceI)
+    {
+        fTri[0] = ptI++;
+        fTri[1] = ptI++;
+        fTri[2] = ptI++;
+
+        faceLst[faceI] = keyedFace(fTri, facetsLst[faceI]);
+    }
+    facetsLst.clearStorage();
+
+    faces().transfer(faceLst);
+    setPatches(groupToPatch);
+    stitchFaces(SMALL);
+}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::fileFormats::TRIfileFormat::write
+(
+    Ostream& os,
+    const keyedSurface& surf
+)
+{
+    const pointField& pointLst = surf.points();
+    const List<keyedFace>& faceLst = surf.faces();
+
+    labelList faceMap;
+    List<surfacePatch> patchLst = surf.sortedRegions(faceMap);
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        forAll(patchLst[patchI], patchFaceI)
+        {
+            const face& f = faceLst[faceMap[faceIndex++]];
+            writeShell(os, pointLst, f, patchI);
+        }
+    }
+}
+
+
+void Foam::fileFormats::TRIfileFormat::write
+(
+    Ostream& os,
+    const meshedSurface& surf
+)
+{
+    const pointField& pointLst = surf.points();
+    const List<face>& faceLst = surf.faces();
+    const List<surfacePatch>& patchLst = surf.patches();
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        forAll(patchLst[patchI], patchFaceI)
+        {
+            const face& f = faceLst[faceIndex++];
+            writeShell(os, pointLst, f, patchI);
+        }
+    }
+}
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/tri/TRIfileFormat.H b/src/surfMesh/keyedSurface/fileFormats/tri/TRIfileFormat.H
new file mode 100644
index 0000000000..b6fe1009fb
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/tri/TRIfileFormat.H
@@ -0,0 +1,145 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::fileFormats::TRIfileFormat
+
+Description
+    Provide a means of reading/writing .tri format.
+
+SourceFiles
+    TRIfileFormat.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef TRIfileFormat_H
+#define TRIfileFormat_H
+
+#include "Ostream.H"
+#include "OFstream.H"
+#include "keyedSurface.H"
+#include "meshedSurface.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileFormats
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class TRIfileFormat Declaration
+\*---------------------------------------------------------------------------*/
+
+class TRIfileFormat
+:
+    public keyedSurface
+{
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        TRIfileFormat(const TRIfileFormat&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const TRIfileFormat&);
+
+        static inline void writeShell
+        (
+            Ostream&,
+            const pointField&,
+            const face&,
+            const label patchI
+        );
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        TRIfileFormat();
+
+        //- Construct from file name
+        TRIfileFormat(const fileName&, const bool triangulate=true);
+
+    // Selectors
+
+        //- Read file and return keyedSurface
+        static autoPtr<keyedSurface> New
+        (
+            const fileName& fName,
+            const bool triangulate=true
+        )
+        {
+            return autoPtr<keyedSurface>
+            (
+                new TRIfileFormat(fName, triangulate)
+            );
+        }
+
+    // Destructor
+
+    // Member Functions
+
+        // Write
+
+        //- Write keyedSurface
+        static void write(Ostream&, const keyedSurface&);
+
+        //- Write keyedSurface
+        static void write(const fileName& fName, const keyedSurface& surf)
+        {
+            write(OFstream(fName)(), surf);
+        }
+
+        //- Write meshedSurface
+        static void write(Ostream&, const meshedSurface&);
+
+        //- Write meshedSurface
+        static void write(const fileName& fName, const meshedSurface& surf)
+        {
+            write(OFstream(fName)(), surf);
+        }
+
+        //- Write object
+        virtual void write(Ostream& os) const
+        {
+            write(os, *this);
+        }
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileFormats
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/vtk/VTKfileFormat.C b/src/surfMesh/keyedSurface/fileFormats/vtk/VTKfileFormat.C
new file mode 100644
index 0000000000..8c11d056b8
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/vtk/VTKfileFormat.C
@@ -0,0 +1,233 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "VTKfileFormat.H"
+#include "clock.H"
+#include "IFstream.H"
+#include "IStringStream.H"
+#include "addToRunTimeSelectionTable.H"
+#include "addToMemberFunctionSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileFormats
+{
+
+addNamedToMemberFunctionSelectionTable
+(
+    keyedSurface,
+    VTKfileFormat,
+    write,
+    fileExtension,
+    vtk
+);
+
+addNamedToMemberFunctionSelectionTable
+(
+    meshedSurface,
+    VTKfileFormat,
+    write,
+    fileExtension,
+    vtk
+);
+
+}
+}
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::fileFormats::VTKfileFormat::writeHead
+(
+    Ostream& os,
+    const pointField& pointLst
+)
+{
+    // Write header
+    os  << "# vtk DataFile Version 2.0" << nl
+        << "surface written " << clock::dateTime().c_str() << nl
+        << "ASCII" << nl
+        << nl
+        << "DATASET POLYDATA" << nl;
+
+    // Write vertex coords
+    os  << "POINTS " << pointLst.size() << " float" << nl;
+    forAll(pointLst, ptI)
+    {
+        os  << pointLst[ptI].x() << ' '
+            << pointLst[ptI].y() << ' '
+            << pointLst[ptI].z() << nl;
+    }
+}
+
+
+void Foam::fileFormats::VTKfileFormat::writeTail
+(
+    Ostream& os,
+    const List<surfacePatch>& patchLst
+)
+{
+    label nFaces = 0;
+    forAll(patchLst, patchI)
+    {
+        nFaces += patchLst[patchI].size();
+    }
+
+    // Print region numbers
+    os  << nl
+        << "CELL_DATA " << nFaces << nl
+        << "FIELD attributes 1" << nl
+        << "region 1 " << nFaces << " float" << nl;
+
+
+    forAll(patchLst, patchI)
+    {
+        forAll(patchLst[patchI], patchFaceI)
+        {
+            if (patchFaceI)
+            {
+                if ((patchFaceI % 20) == 0)
+                {
+                    os  << nl;
+                }
+                else
+                {
+                    os  << ' ';
+                }
+            }
+            os  << patchI + 1;
+        }
+        os  << nl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fileFormats::VTKfileFormat::VTKfileFormat()
+:
+    Foam::keyedSurface()
+{}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::fileFormats::VTKfileFormat::write
+(
+    Ostream& os,
+    const keyedSurface& surf
+)
+{
+    const pointField& pointLst = surf.points();
+    const List<keyedFace>& faceLst = surf.faces();
+
+    labelList faceMap;
+    List<surfacePatch> patchLst = surf.sortedRegions(faceMap);
+
+    writeHead(os, pointLst);
+
+    label nNodes = 0;
+    forAll(faceLst, faceI)
+    {
+        nNodes += faceLst[faceI].size();
+    }
+
+    os  << nl
+        << "POLYGONS " << faceLst.size() << ' '
+        << faceLst.size() + nNodes << nl;
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        forAll(patchLst[patchI], patchFaceI)
+        {
+            const face& f = faceLst[faceMap[faceIndex++]];
+
+            os  << f.size();
+            forAll(f, fp)
+            {
+                os  << ' ' << f[fp];
+            }
+            os  << ' ' << nl;
+        }
+    }
+
+    // Print region numbers
+    writeTail(os, patchLst);
+}
+
+
+void Foam::fileFormats::VTKfileFormat::write
+(
+    Ostream& os,
+    const meshedSurface& surf
+)
+{
+    const pointField& pointLst = surf.points();
+    const List<face>& faceLst = surf.faces();
+    const List<surfacePatch>& patchLst = surf.patches();
+
+    writeHead(os, pointLst);
+
+    label nNodes = 0;
+    forAll(faceLst, faceI)
+    {
+        nNodes += faceLst[faceI].size();
+    }
+
+    os  << nl
+        << "POLYGONS " << faceLst.size() << ' '
+        << faceLst.size() + nNodes << nl;
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        forAll(patchLst[patchI], patchFaceI)
+        {
+            const face& f = faceLst[faceIndex++];
+
+            os  << f.size();
+            forAll(f, fp)
+            {
+                os  << ' ' << f[fp];
+            }
+            os  << ' ' << nl;
+        }
+    }
+
+    // Print region numbers
+    writeTail(os, patchLst);
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/fileFormats/vtk/VTKfileFormat.H b/src/surfMesh/keyedSurface/fileFormats/vtk/VTKfileFormat.H
new file mode 100644
index 0000000000..b1b241336b
--- /dev/null
+++ b/src/surfMesh/keyedSurface/fileFormats/vtk/VTKfileFormat.H
@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::fileFormats::VTKfileFormat
+
+Description
+    Provide a means of writing VTK legacy format.
+
+SourceFiles
+    VTKfileFormat.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef VTKfileFormat_H
+#define VTKfileFormat_H
+
+#include "Ostream.H"
+#include "OFstream.H"
+#include "keyedSurface.H"
+#include "meshedSurface.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileFormats
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class VTKfileFormat Declaration
+\*---------------------------------------------------------------------------*/
+
+class VTKfileFormat
+:
+    public keyedSurface
+{
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        VTKfileFormat(const VTKfileFormat&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const VTKfileFormat&);
+
+        static void writeHead(Ostream&, const pointField&);
+        static void writeTail(Ostream&, const List<surfacePatch>&);
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        VTKfileFormat();
+
+    // Selectors
+
+    // Destructor
+
+    // Member Functions
+
+        // Write
+
+        //- Write keyedSurface
+        static void write(Ostream&, const keyedSurface&);
+
+        //- Write keyedSurface
+        static void write(const fileName& fName, const keyedSurface& surf)
+        {
+            write(OFstream(fName)(), surf);
+        }
+
+        //- Write meshedSurface
+        static void write(Ostream&, const meshedSurface&);
+
+        //- Write meshedSurface
+        static void write(const fileName& fName, const meshedSurface& surf)
+        {
+            write(OFstream(fName)(), surf);
+        }
+
+        //- Write object
+        virtual void write(Ostream& os) const
+        {
+            write(os, *this);
+        }
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileFormats
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/keyedSurface.C b/src/surfMesh/keyedSurface/keyedSurface.C
new file mode 100644
index 0000000000..99565c70b5
--- /dev/null
+++ b/src/surfMesh/keyedSurface/keyedSurface.C
@@ -0,0 +1,1112 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "keyedSurface.H"
+#include "meshedSurface.H"
+#include "demandDrivenData.H"
+#include "IFstream.H"
+#include "OFstream.H"
+#include "Time.H"
+#include "boundBox.H"
+#include "SortableList.H"
+#include "polyBoundaryMesh.H"
+#include "polyMesh.H"
+#include "primitivePatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+defineTypeNameAndDebug(keyedSurface, 0);
+defineRunTimeSelectionTable(keyedSurface, fileExtension);
+defineMemberFunctionSelectionTable
+(
+    keyedSurface,
+    write,
+    fileExtension
+);
+}
+
+Foam::word Foam::keyedSurface::defaultGeometricType("empty");
+
+//  File extension for 'native' raw format
+//! @cond localscope
+const char * const nativeExt = "ftr";
+//! @endcond localscope
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::fileName Foam::keyedSurface::triSurfInstance(const Time& d)
+{
+    fileName foamName(d.caseName() + "." + nativeExt);
+
+    // Search back through the time directories list to find the time
+    // closest to and lower than current time
+
+    instantList ts = d.times();
+    label i;
+
+    for (i=ts.size()-1; i>=0; i--)
+    {
+        if (ts[i].value() <= d.timeOutputValue())
+        {
+            break;
+        }
+    }
+
+    // Noting that the current directory has already been searched
+    // for mesh data, start searching from the previously stored time directory
+
+    if (i>=0)
+    {
+        for (label j=i; j>=0; j--)
+        {
+            if (file(d.path()/ts[j].name()/typeName/foamName))
+            {
+                if (debug)
+                {
+                    Pout<< " keyedSurface::triSurfInstance(const Time& d)"
+                        << "reading " << foamName
+                        << " from " << ts[j].name()/typeName
+                        << endl;
+                }
+
+                return ts[j].name();
+            }
+        }
+    }
+
+    if (debug)
+    {
+        Pout<< " keyedSurface::triSurfInstance(const Time& d)"
+            << "reading " << foamName
+            << " from constant/" << endl;
+    }
+
+    return "constant";
+}
+
+
+Foam::fileName Foam::keyedSurface::triSurfName(const Time& d)
+{
+    fileName foamName(d.caseName() + "." + nativeExt);
+
+    // Search back through the time directories list to find the time
+    // closest to and lower than current time
+
+    instantList ts = d.times();
+    label i;
+
+    for (i=ts.size()-1; i>=0; i--)
+    {
+        if (ts[i].value() <= d.timeOutputValue())
+        {
+            break;
+        }
+    }
+
+    // Noting that the current directory has already been searched
+    // for mesh data, start searching from the previously stored time directory
+
+    if (i>=0)
+    {
+        for (label j=i; j>=0; j--)
+        {
+            fileName testName(d.path()/ts[j].name()/typeName/foamName);
+
+            if (file(testName))
+            {
+                if (debug)
+                {
+                    Pout<< " keyedSurface::triSurfName(const Time& d)"
+                        << "reading " << foamName
+                        << " from " << ts[j].name()/typeName
+                        << endl;
+                }
+
+                return testName;
+            }
+        }
+    }
+
+    if (debug)
+    {
+        Pout<< " keyedSurface::triSurfName(const Time& d)"
+            << "reading " << foamName
+            << " from constant/" << endl;
+    }
+
+    return d.path()/"constant"/typeName/foamName;
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::string Foam::keyedSurface::getLineNoComment(IFstream& is)
+{
+    string line;
+    do
+    {
+        is.getLine(line);
+    }
+    while ((line.size() == 0 || line[0] == '#') && is.good());
+
+    return line;
+}
+
+
+void Foam::keyedSurface::setPatches(const label maxPatch)
+{
+    geoPatches_.setSize(maxPatch+1);
+
+    forAll(geoPatches_, patchI)
+    {
+        geoPatches_[patchI] = geometricSurfacePatch
+        (
+            defaultGeometricType,
+            "patch" + ::Foam::name(patchI),
+            patchI
+        );
+    }
+}
+
+
+void Foam::keyedSurface::setPatches()
+{
+    label maxPatch = 0;
+    const List<keyedFace>& faceLst = faces();
+
+    // find the max region that occurs
+    forAll(faceLst, faceI)
+    {
+        const label regId = faceLst[faceI].key();
+
+        if (maxPatch < regId)
+        {
+            maxPatch = regId;
+        }
+    }
+
+    setPatches(maxPatch);
+}
+
+
+
+void Foam::keyedSurface::setPatches
+(
+    const Map<word>& regionNames,
+    const label maxPatchHint
+)
+{    
+    label maxPatch = maxPatchHint;
+
+    // determine max patch ID if required
+    if (maxPatchHint < 0)
+    {
+        maxPatch = 0;
+        forAllConstIter(Map<word>, regionNames, iter)
+        {
+            if (maxPatch < iter.key())
+            {
+                maxPatch = iter.key();
+            }
+        }
+    }
+
+
+    // Info<< "setPatches with maxPatch: " << maxPatch << endl;
+
+    geoPatches_.setSize(maxPatch+1);
+
+    forAll(geoPatches_, patchI)
+    {
+        Map<word>::const_iterator findPatch = regionNames.find(patchI);
+        word patchName;
+
+        if (findPatch != regionNames.end())
+        {
+            patchName = findPatch();
+        }
+        else
+        {
+            patchName = "patch" + ::Foam::name(patchI);
+        }
+
+        geoPatches_[patchI] = geometricSurfacePatch
+        (
+            defaultGeometricType,
+            patchName,
+            patchI
+        );
+    }
+}
+
+
+void Foam::keyedSurface::setPatches
+(
+    const HashTable<label>& groupToPatch
+)
+{
+    // determine max patch Id
+    label maxPatch = 0;
+    Map<word> regionNames;
+
+    forAllConstIter(HashTable<label>, groupToPatch, iter)
+    {
+        regionNames.insert(iter(), iter.key());
+        if (maxPatch < iter())
+        {
+            maxPatch = iter();
+        }
+    }
+
+    setPatches(regionNames, maxPatch);
+}
+
+
+// Read triangles, points from Istream
+bool Foam::keyedSurface::read(Istream& is)
+{
+    is  >> geoPatches_ >> points() >> faces();
+
+    return true;
+}
+
+#if 0
+// Read from file in given format
+bool Foam::keyedSurface::read(const fileName& name, const word& ext)
+{
+    if (ext == "gz")
+    {
+        fileName unzipName = name.lessExt();
+
+        return read(unzipName, unzipName.ext());
+    }
+}
+#endif
+
+
+// Returns patch info.
+// Sets faceMap to the indexing according to patch numbers.
+// Patch numbers start at 0.
+Foam::surfacePatchList
+Foam::keyedSurface::sortedRegions
+(
+    const List<keyedFace>& faceLst,
+    const Map<word>& patchNames,
+    labelList& faceMap
+)
+{
+    // determine sort order according to region numbers
+
+    // std::sort() really seems to mix up the order.
+    // Assuming that we have relatively fewer regions compared to the
+    // number of items, just do it ourselves
+
+    // step 1: get region sizes and store (regionId => patchI)
+    Map<label> regionLookup;
+    forAll(faceLst, faceI)
+    {
+        const label regId = faceLst[faceI].key();
+
+        Map<label>::iterator iter = regionLookup.find(regId);
+        if (iter == regionLookup.end())
+        {
+            regionLookup.insert(regId, 1);
+        }
+        else
+        {
+            iter()++;
+        }
+    }
+
+    // step 2: assign start/size (and name) to the newPatches
+    // re-use the lookup to map (regionId => patchI)
+    surfacePatchList surfPatches(regionLookup.size());
+    label patchStart = 0;
+    label patchI = 0;
+    forAllIter(Map<label>, regionLookup, iter)
+    {
+        label regId = iter.key();
+
+        word patchName;
+        Map<word>::const_iterator iter2 = patchNames.find(regId);
+        if (iter2 == patchNames.end())
+        {
+            patchName = word("patch") + ::Foam::name(patchI);
+        }
+        else
+        {
+            patchName = iter2();
+        }
+
+        surfPatches[patchI] = surfacePatch
+        (
+            defaultGeometricType,
+            patchName,
+            0,           // initialize with zero size
+            patchStart,
+            patchI
+        );
+
+        // increment the start for the next patch
+        // and save the (regionId => patchI) mapping
+        patchStart += iter();
+        iter() = patchI++;
+    }
+
+    // step 3: build the re-ordering
+    faceMap.setSize(faceLst.size());
+
+    forAll(faceLst, faceI)
+    {
+        label patchI = regionLookup[faceLst[faceI].key()];
+
+        faceMap[faceI] =
+            surfPatches[patchI].start() + surfPatches[patchI].size()++;
+    }
+
+    // with reordered faces
+    return surfPatches;
+}
+
+
+// Returns patch info.
+// Sets faceMap to the indexing according to patch numbers.
+// Patch numbers start at 0.
+Foam::surfacePatchList Foam::keyedSurface::sortedRegions
+(
+    const List<label>& regionLst,
+    const Map<word>& patchNames,
+    labelList& faceMap
+)
+{
+    // determine sort order according to region numbers
+
+    // std::sort() really seems to mix up the order.
+    // Assuming that we have relatively fewer regions compared to the
+    // number of items, just do it ourselves
+
+    // step 1: get region sizes and store (regionId => patchI)
+    Map<label> regionLookup;
+    forAll(regionLst, faceI)
+    {
+        const label regId = regionLst[faceI];
+
+        Map<label>::iterator iter = regionLookup.find(regId);
+        if (iter == regionLookup.end())
+        {
+            regionLookup.insert(regId, 1);
+        }
+        else
+        {
+            iter()++;
+        }
+    }
+
+    // step 2: assign start/size (and name) to the newPatches
+    // re-use the lookup to map (regionId => patchI)
+    surfacePatchList surfPatches(regionLookup.size());
+    label patchStart = 0;
+    label patchI = 0;
+    forAllIter(Map<label>, regionLookup, iter)
+    {
+        label regId = iter.key();
+
+        word patchName;
+        Map<word>::const_iterator iter2 = patchNames.find(regId);
+        if (iter2 == patchNames.end())
+        {
+            patchName = word("patch") + ::Foam::name(patchI);
+        }
+        else
+        {
+            patchName = iter2();
+        }
+
+        surfPatches[patchI] = surfacePatch
+        (
+            defaultGeometricType,
+            patchName,
+            0,           // initialize with zero size
+            patchStart,
+            patchI
+        );
+
+        // increment the start for the next patch
+        // and save the (regionId => patchI) mapping
+        patchStart += iter();
+        iter() = patchI++;
+    }
+
+
+    // step 3: build the re-ordering
+    faceMap.setSize(regionLst.size());
+
+    forAll(regionLst, faceI)
+    {
+        label patchI = regionLookup[regionLst[faceI]];
+
+        faceMap[faceI] =
+            surfPatches[patchI].start() + surfPatches[patchI].size()++;
+    }
+
+    // with reordered faces
+    return surfPatches;
+}
+
+
+Foam::surfacePatchList Foam::keyedSurface::sortedRegions
+(
+    labelList& faceMap
+) const
+{
+    // supply some patch names
+    Map<word> patchNames;
+    forAll(geoPatches_, patchI)
+    {
+        patchNames.insert(patchI, geoPatches_[patchI].name());
+    }
+
+    return sortedRegions(faces(), patchNames, faceMap);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::keyedSurface::keyedSurface()
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    geoPatches_()
+{}
+
+
+Foam::keyedSurface::keyedSurface
+(
+    const pointField& pointLst,
+    const List<keyedFace>& faceLst,
+    const geometricSurfacePatchList& patchLst
+)
+:
+    MeshStorage(faceLst, pointLst),
+    geoPatches_(patchLst)
+{}
+
+
+Foam::keyedSurface::keyedSurface
+(
+    const xfer<pointField>& pointLst,
+    const xfer<List<keyedFace> >& faceLst,
+    const xfer<geometricSurfacePatchList>& patchLst
+)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    geoPatches_()
+{
+    points().transfer(pointLst());
+    faces().transfer(faceLst());
+    geoPatches_.transfer(patchLst());
+}
+
+
+Foam::keyedSurface::keyedSurface
+(
+    const xfer<pointField>& pointLst,
+    const xfer<List<keyedFace> >& faceLst,
+    const Map<word>& regionNames
+)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    geoPatches_()
+{
+    faces().transfer(faceLst());
+    points().transfer(pointLst());
+
+    if (&regionNames)
+    {
+        // set patch names from (id => name) mapping
+        setPatches(regionNames);
+    }
+    else 
+    {
+        // find highest region ID and set patch names automatically
+        setPatches();
+    }    
+}
+
+
+Foam::keyedSurface::keyedSurface
+(
+    const xfer<pointField>& pointLst,
+    const xfer<List<keyedFace> >& faceLst,
+    const HashTable<label>& labelToRegion
+)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    geoPatches_()
+{
+    points().transfer(pointLst());
+    faces().transfer(faceLst());
+
+    // set patch names from (name => id) mapping
+    setPatches(labelToRegion);
+}
+
+
+Foam::keyedSurface::keyedSurface
+(
+    const xfer<pointField>& pointLst,
+    const List<face>& faceLst
+)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    geoPatches_()
+{
+    points().transfer(pointLst());
+    faces() = keyedFace::createList(faceLst, 0);
+    // single default patch
+    setPatches(0);
+}
+
+
+
+Foam::keyedSurface::keyedSurface
+(
+    const polyBoundaryMesh& bMesh,
+    const bool useGlobalPoints
+)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    geoPatches_()
+{
+    const polyMesh& mesh = bMesh.mesh();
+    const polyPatchList& bPatches = bMesh;
+    const label nIntFaces = mesh.nInternalFaces();
+
+    geometricSurfacePatchList newPatches(bPatches.size());
+
+    // Get patch for all of outside
+    primitivePatch allBoundary
+    (
+        SubList<face>
+        (
+            mesh.faces(),
+            mesh.nFaces() - nIntFaces,
+            nIntFaces
+        ),
+        mesh.points()
+    );
+
+    List<keyedFace> newFaces(allBoundary.size());
+
+    if (useGlobalPoints)
+    {
+        // copy in the global points
+        points() = mesh.points();
+    }
+    else
+    {
+        // copy in the local points
+        points() = allBoundary.localPoints();
+    }
+
+    // global or local face addressing
+    const List<face>& bfaces =
+    (
+        useGlobalPoints
+      ? allBoundary
+      : allBoundary.localFaces()
+    );
+
+    label faceIndex = 0;
+    forAll(bPatches, patchI)
+    {
+        const polyPatch& p = bPatches[patchI];
+
+        newPatches[patchI] = geometricSurfacePatch
+        (
+            defaultGeometricType,
+            bPatches[patchI].name(),
+            patchI
+        );
+
+        forAll(p, patchFaceI)
+        {
+            newFaces[faceIndex] = keyedFace
+            (
+                bfaces[faceIndex],
+                patchI
+            );
+            faceIndex++;
+        }
+    }
+
+    faces().transfer(newFaces);
+    geoPatches_.transfer(newPatches);
+}
+
+
+Foam::keyedSurface::keyedSurface
+(
+    const meshedSurface& surf
+)
+:
+    MeshStorage(List<keyedFace>(), surf.points()),
+    geoPatches_()
+{
+    const List<face>& origFaces = surf.faces();
+    const surfacePatchList& patchLst = surf.patches();
+
+    List<keyedFace> newFaces(origFaces.size());
+    geometricSurfacePatchList newPatches(patchLst.size());
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        newPatches[patchI] = patchLst[patchI];
+        forAll(patchLst[patchI], patchFaceI)
+        {
+            newFaces[faceIndex] = keyedFace(origFaces[faceIndex], patchI);
+            faceIndex++;
+        }
+    }
+
+    faces().transfer(newFaces);
+    geoPatches_.transfer(newPatches);
+}
+
+
+Foam::keyedSurface::keyedSurface
+(
+    const fileName& fName,
+    const word& ext,
+    const bool triangulate
+)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    geoPatches_()
+{
+    // use selector mechanism
+    autoPtr<keyedSurface> surfPtr = New(fName, ext, triangulate);
+    transfer(surfPtr());
+}
+
+
+Foam::keyedSurface::keyedSurface
+(
+    const fileName& fName,
+    const bool triangulate
+)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    geoPatches_()
+{
+    // use selector mechanism
+    autoPtr<keyedSurface> surfPtr = New(fName, triangulate);
+    transfer(surfPtr());
+}
+
+
+Foam::keyedSurface::keyedSurface(Istream& is)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    geoPatches_()
+{
+    read(is);
+    setPatches();
+}
+
+
+Foam::keyedSurface::keyedSurface(const Time& d)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    geoPatches_()
+{
+    read(IFstream(triSurfName(d))());
+    setPatches();
+}
+
+
+Foam::keyedSurface::keyedSurface(const keyedSurface& surf)
+:
+    MeshStorage(surf.faces(), surf.points()),
+    geoPatches_(surf.geoPatches_)
+{}
+
+
+Foam::keyedSurface::keyedSurface(const xfer<keyedSurface>& surf)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    geoPatches_()
+{
+    transfer(surf());
+}
+
+
+Foam::keyedSurface::keyedSurface(const xfer<meshedSurface>& surf)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    geoPatches_()
+{
+    transfer(surf());
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::keyedSurface::~keyedSurface()
+{
+    // Info<<"~keyedSurface()" << endl;
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+//- Move points
+void Foam::keyedSurface::movePoints(const pointField& newPoints)
+{
+    // Remove all geometry dependent data
+    clearTopology();
+
+    // Adapt for new point position
+    MeshStorage::movePoints(newPoints);
+
+    // Copy new points
+    points() = newPoints;
+}
+
+
+//- scale points
+void Foam::keyedSurface::scalePoints(const scalar& scaleFactor)
+{
+    // avoid bad scaling
+    if (scaleFactor > 0 && scaleFactor != 1.0)
+    {
+        // Remove all geometry dependent data
+        clearTopology();
+
+        // Adapt for new point position
+        MeshStorage::movePoints(pointField());
+
+        points() *= scaleFactor;
+    }
+}
+
+
+
+Foam::keyedSurface Foam::keyedSurface::subsetMesh
+(
+    const boolList& include,
+    labelList& pointMap,
+    labelList& faceMap
+) const
+{
+    const pointField& locPoints = localPoints();
+    const List<FaceType>& locFaces = localFaces();
+
+    // Fill pointMap, faceMap
+    subsetMap(include, pointMap, faceMap);
+
+    // Create compact coordinate list and forward mapping array
+    pointField newPoints(pointMap.size());
+    labelList oldToNew(locPoints.size());
+    forAll(pointMap, pointI)
+    {
+        newPoints[pointI] = locPoints[pointMap[pointI]];
+        oldToNew[pointMap[pointI]] = pointI;
+    }
+
+    // Renumber face node labels and compact
+    List<FaceType> newFaces(faceMap.size());
+
+    forAll(faceMap, faceI)
+    {
+        // Get old vertex labels
+        const FaceType& oldFace = locFaces[faceMap[faceI]];
+
+        newFaces[faceI] = FaceType(oldFace);
+
+        // Renumber labels for face
+        FaceType& f = newFaces[faceI];
+        forAll(f, fp)
+        {
+            f[fp] = oldToNew[oldFace[fp]];
+        }
+    }
+
+    // Construct an empty subsurface and fill
+    keyedSurface subSurf;
+
+    // transfer
+    subSurf.points().transfer(newPoints);
+    subSurf.faces().transfer(newFaces);
+
+    // copy
+    subSurf.geoPatches_ = geoPatches_;
+
+    return subSurf;
+}
+
+
+void Foam::keyedSurface::transfer(keyedSurface& surf)
+{
+    clearOut();
+    faces().transfer(surf.faces());
+    points().transfer(surf.points());
+    geoPatches_.transfer(surf.geoPatches_);
+    surf.clearOut();
+}
+
+
+void Foam::keyedSurface::transfer(meshedSurface& surf)
+{
+    clearOut();
+    points().transfer(surf.points());
+
+    const List<face>& origFaces = surf.faces();
+    List<keyedFace> newFaces(origFaces.size());
+
+    const surfacePatchList& patchLst = surf.patches();
+    geometricSurfacePatchList newPatches(patchLst.size());
+
+    label faceIndex = 0;
+    forAll(patchLst, patchI)
+    {
+        newPatches[patchI] = patchLst[patchI];
+
+        forAll(patchLst[patchI], patchFaceI)
+        {
+            newFaces[faceIndex] = keyedFace(origFaces[faceIndex], patchI);
+            faceIndex++;
+        }
+    }
+
+    faces().transfer(newFaces);
+    geoPatches_.transfer(newPatches);
+    surf.faces().clear();
+    surf.clearOut();
+}
+
+
+bool Foam::keyedSurface::canRead(const word& ext, const bool verbose)
+{
+    // FIXME: this looks horrible, but I don't have my STL docs here
+
+    // perhaps we got sent an entire name
+    word fExt(ext);
+
+    string::size_type dot = fExt.find_last_of(".");
+    if (dot != string::npos)
+    {
+        fExt = fExt.substr(dot+1);
+    }
+
+    fileExtensionConstructorTable::iterator cstrIter =
+        fileExtensionConstructorTablePtr_->find(fExt);
+
+    // handle 'native' format directly
+    if (fExt == nativeExt)
+    {
+        return true;
+    }
+
+    // would be nice to have information about which format this actually is
+    if (cstrIter == fileExtensionConstructorTablePtr_->end())
+    {
+        if (verbose)
+        {
+            const wordList& known = fileExtensionConstructorTablePtr_->toc();
+
+            Info<<"Unknown file extension for reading: " << fExt << nl;
+            // compact output:
+            Info<<"Valid types: ( " << nativeExt;
+            forAll(known, i)
+            {
+                Info<<" " << known[i];
+            }
+            Info<<" )" << endl;
+        }
+        return false;
+    }
+
+    return true;
+}
+
+
+bool Foam::keyedSurface::canWrite(const word& ext, const bool verbose)
+{
+    // perhaps we got sent an entire name
+    word fExt(ext);
+
+    // FIXME: this looks horrible, but I don't have STL docs here
+    string::size_type dot = ext.find_last_of(".");
+    if (dot != string::npos)
+    {
+        fExt = ext.substr(dot+1);
+    }
+
+    // handle 'native' format directly
+    if (fExt == nativeExt)
+    {
+        return true;
+    }
+
+    writefileExtensionMemberFunctionTable::iterator mfIter =
+        writefileExtensionMemberFunctionTablePtr_->find(fExt);
+
+    if (mfIter == writefileExtensionMemberFunctionTablePtr_->end())
+    {
+        if (verbose)
+        {
+            const wordList& known =
+                writefileExtensionMemberFunctionTablePtr_->toc();
+
+            Info<<"Unknown file extension for writing: " << fExt << nl;
+            // compact output:
+            Info<<"Valid types: ( " << nativeExt;
+            forAll(known, i)
+            {
+                Info<<" " << known[i];
+            }
+            Info<<" )" << endl;
+        }
+
+        return false;
+    }
+
+    return true;
+}
+
+
+
+#if 0
+void Foam::keyedSurface::write
+(
+    const fileName& fName,
+    const bool sorted
+) const
+{
+    write(fName, fName.ext(), sorted);
+}
+#endif
+
+
+void Foam::keyedSurface::write
+(
+    const fileName& fName,
+    const keyedSurface& surf
+)
+{
+    if (debug)
+    {
+        Info<< "keyedSurface::write(const fileName&, const keyedSurface&) : "
+               "writing keyedSurface to " << fName
+            << endl;
+    }
+
+    const word ext = fName.ext();
+
+    // handle 'native' format directly
+    if (ext == nativeExt)
+    {
+        surf.write(OFstream(fName)());
+    }
+    else
+    {
+        writefileExtensionMemberFunctionTable::iterator mfIter =
+            writefileExtensionMemberFunctionTablePtr_->find(ext);
+
+        if (mfIter == writefileExtensionMemberFunctionTablePtr_->end())
+        {
+            FatalErrorIn
+            (
+                "keyedSurface::write(const fileName&)"
+            )   << "Unknown file extension " << ext << nl << nl
+                << "Valid types are :" << endl
+                << writefileExtensionMemberFunctionTablePtr_->toc()
+                << exit(FatalError);
+        }
+
+        mfIter()(fName, surf);
+    }
+}
+
+
+
+void Foam::keyedSurface::write(Ostream& os) const
+{
+    os << geoPatches_ << endl;
+
+    // Note: Write with global point numbering
+    os << points() << nl << faces() << endl;
+
+    // Check state of Ostream
+    os.check("keyedSurface::write(Ostream&)");
+}
+
+
+void Foam::keyedSurface::write(const Time& d) const
+{
+    write(OFstream(triSurfName(d))());
+}
+
+
+void Foam::keyedSurface::writeStats(Ostream& os) const
+{
+    os  << "Faces        : " << size() << endl
+        << "Edges        : " << nEdges() << endl
+        << "Vertices     : " << nPoints() << endl
+        << "Bounding Box : " << boundBox(localPoints(), false) << endl;
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+void Foam::keyedSurface::operator=(const keyedSurface& surf)
+{
+    clearOut();
+    faces()  = surf.faces();
+    points() = surf.points();
+    geoPatches_ = surf.geoPatches_;
+}
+
+
+// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const keyedSurface& surf)
+{
+    surf.write(os);
+    return os;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/keyedSurface.H b/src/surfMesh/keyedSurface/keyedSurface.H
new file mode 100644
index 0000000000..6cbf08458a
--- /dev/null
+++ b/src/surfMesh/keyedSurface/keyedSurface.H
@@ -0,0 +1,461 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::keyedSurface
+
+Description
+    A surface geometry mesh, in which the patch information is conveyed by
+    the 'key' attached to each face.
+
+    This form of surface description is particularly useful for reading in
+    surface meshes from third-party formats (eg, obj, stl, gts, etc.). It
+    can also be particularly useful for situations in which the surface
+    many be adjusted in an arbitrary manner without worrying about needed
+    to adjust the patch information (eg, surface refinement).
+
+See Also
+    The Foam::meshedSurface - which is organized as a surface mesh, but
+    with independent patch information.
+
+SourceFiles
+    keyedSurface.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef keyedSurface_H
+#define keyedSurface_H
+
+#include "pointField.H"
+#include "PrimitivePatchExtra.H"
+#include "boolList.H"
+#include "geometricSurfacePatchList.H"
+#include "surfacePatchList.H"
+#include "face.H"
+#include "Keyed.H"
+#include "xfer.H"
+#include "runTimeSelectionTables.H"
+#include "memberFunctionSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class Time;
+class IFstream;
+class meshedSurface;
+class polyBoundaryMesh;
+
+/*---------------------------------------------------------------------------*\
+                      Class keyedSurface Declaration
+\*---------------------------------------------------------------------------*/
+
+class keyedSurface
+:
+    public PrimitivePatchExtra<Keyed<face>, ::Foam::List, pointField, point>
+{
+    friend class meshedSurface;
+
+protected:
+
+    // Protected Member Data
+
+        //- Typedef if this type has not already been defined
+        typedef Keyed<face> keyedFace;
+
+        //- Typedef for similar code in keyedSurface and meshedSurface
+        typedef keyedFace FaceType;
+
+private:
+
+    // Private Member Data
+
+    // Private typedefs
+
+        typedef PrimitivePatchExtra
+        <
+            FaceType,
+            ::Foam::List,
+            pointField,
+            point
+        >
+        MeshStorage;
+
+    // Private data
+
+        //- Patch information (face ordering nFaces/startFace only used
+        //  during reading and writing)
+        geometricSurfacePatchList geoPatches_;
+
+    // Private member functions
+
+        //- Read in Foam format
+        bool read(Istream&);
+
+        //- Generic read routine. Chooses reader based on extension.
+        //? bool read(const fileName&, const word& ext);
+
+protected:
+
+    // Static protected functions
+
+        //- Read non-comment line
+        static string getLineNoComment(IFstream&);
+
+    // Protected Member functions
+
+        //- Sets default patch names based on the maximum patch number
+        void setPatches(const label maxPatch);
+
+        //- Finds maximum patch number and sets default patch names
+        void setPatches();
+
+        //- Sets patch names from hashed values (id -> name)
+        void setPatches
+        (
+            const Map<word>& regionNames,
+            const label maxPatch = -1
+        );
+
+        //- Sets patch names from hashed values (name -> id)
+        void setPatches(const HashTable<label>& groupToPatch);
+
+        //- Join the faces by removing duplicate points.
+        //  Returns true if any points merged
+        bool stitchFaces(const scalar tol=SMALL, const bool verbose=false);
+
+
+        //- Return non-const access to global points
+        pointField& points()
+        {
+            return const_cast<pointField&>(MeshStorage::points());
+        }
+
+        //- Return non-const access to the faces
+        List<FaceType>& faces()
+        {
+            return static_cast<List<FaceType> &>(*this);
+        }
+
+public:
+
+        //- Runtime type information
+        ClassName("keyedSurface");
+
+        //- Return the default geometric patch type (usually "empty")
+        static word defaultGeometricType;
+
+    // Static
+
+        //- Name of keyedSurface directory to use.
+        static fileName triSurfInstance(const Time&);
+
+        //- Name of keyedSurface directory to use.
+        static fileName triSurfName(const Time&);
+
+
+    // Constructors
+
+        //- Construct null
+        keyedSurface();
+
+        //- Construct from components (points, labelled faces, patches).
+        keyedSurface
+        (
+            const pointField&,
+            const List<keyedFace>&,
+            const geometricSurfacePatchList&
+        );
+
+        //- Construct by transferring components
+        //  (points, labelled faces, patches.
+        keyedSurface
+        (
+            const xfer<pointField>&,
+            const xfer<List<keyedFace> >&,
+            const xfer<geometricSurfacePatchList>&
+        );
+
+        //- Construct by transferring points and labelled faces
+        //  With region names per map or set to default.
+        keyedSurface
+        (
+            const xfer<pointField>&,
+            const xfer<List<keyedFace> >&,
+            const Map<word>& regionNames = Map<word>::null()
+        );
+
+        //- Construct by transferring points and labelled faces
+        //  with patch-names from hash
+        keyedSurface
+        (
+            const xfer<pointField>&,
+            const xfer<List<keyedFace> >&,
+            const HashTable<label>& labelToRegion
+        );
+
+        //- Construct by transferring points, copying unlabelled faces.
+        //  Set single default patch.
+        keyedSurface
+        (
+            const xfer<pointField>&,
+            const List<face>&
+        );
+
+        //- Construct from a boundary mesh with local points/faces
+        keyedSurface
+        (
+            const polyBoundaryMesh&,
+            const bool globalPoints=false
+        );
+
+        //- Construct from a meshedSurface
+        keyedSurface(const meshedSurface&);
+
+        //- Construct from file name (uses extension to determine type)
+        keyedSurface
+        (
+            const fileName&,
+            const bool triangulate=false
+        );
+
+        //- Construct from file name (uses extension to determine type)
+        keyedSurface
+        (
+            const fileName&,
+            const word&,
+            const bool triangulate=false
+        );
+
+        //- Construct from Istream
+        keyedSurface(Istream&);
+
+        //- Construct from objectRegistry
+        keyedSurface(const Time&);
+
+        //- Construct as copy
+        keyedSurface(const keyedSurface&);
+
+        //- Construct by transferring the contents from a keyedSurface
+        keyedSurface(const xfer<keyedSurface>&);
+
+        //- Construct by transferring the contents from a meshedSurface
+        keyedSurface(const xfer<meshedSurface>&);
+
+
+    // Declare run-time constructor selection table
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            keyedSurface,
+            fileExtension,
+            (
+                const fileName& fName,
+                const bool triangulate
+            ),
+            (fName, triangulate)
+        );
+
+    // Selectors
+
+        //- Select constructed from filename (implicit extension)
+        static autoPtr<keyedSurface> New
+        (
+            const fileName& fName,
+            const bool triangulate=false
+        );
+
+        //- Select constructed from filename (explicit extension)
+        static autoPtr<keyedSurface> New
+        (
+            const fileName& fName,
+            const word& ext,
+            const bool triangulate=false
+        );
+
+    // Destructor
+
+        ~keyedSurface();
+
+
+    // Member Function Selectors
+
+        declareMemberFunctionSelectionTable
+        (
+            void,
+            keyedSurface,
+            write,
+            fileExtension,
+            (
+                const fileName& fName,
+                const keyedSurface& surf
+            ),
+            (fName, surf)
+        );
+
+        //- Write to file
+        static void write(const fileName&, const keyedSurface&);
+
+        //- Can we read this file format?
+        static bool canRead(const word& ext, const bool verbose=false);
+
+        //- Can we write this file format?
+        static bool canWrite(const word& ext, const bool verbose=false);
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return the number of points
+            label nPoints() const
+            {
+                return points().size();
+            }
+
+            //- Return the number of faces
+            label nFaces() const
+            {
+                return faces().size();
+            }
+
+            //- The surface size is the number of faces
+            label size() const
+            {
+                return nFaces();
+            }
+
+            //- Return const access to global points
+            const pointField& points() const
+            {
+                return MeshStorage::points();
+            }
+
+            //- Return const access to the faces
+            const List<FaceType>& faces() const
+            {
+                return static_cast<const List<FaceType> &>(*this);
+            }
+
+            const geometricSurfacePatchList& geoPatches() const
+            {
+                return geoPatches_;
+            }
+
+            geometricSurfacePatchList& geoPatches()
+            {
+                return geoPatches_;
+            }
+
+            //- Determine the sort order from the face regions.
+            //  Returns patch list and sets faceMap to index within faceLst
+            static surfacePatchList sortedRegions
+            (
+                const List<keyedFace>& faceLst,
+                const Map<word>& patchNames,
+                labelList& faceMap
+            );
+
+            //- Determine the sort order from the region list.
+            //  Returns patch list and sets faceMap to indices within faceLst
+            static surfacePatchList sortedRegions
+            (
+                const List<label>& regionLst,
+                const Map<word>& patchNames,
+                labelList& faceMap
+            );
+
+            //- Sort faces according to region.
+            //  Returns patch list and sets faceMap to index within faces()
+            surfacePatchList sortedRegions(labelList& faceMap) const;
+
+        // Edit
+
+            //- Move points
+            virtual void movePoints(const pointField&);
+
+            //- Scale points. A non-positive factor is ignored
+            virtual void scalePoints(const scalar&);
+
+            void checkFaces(const bool verbose);
+
+            //- Remove invalid faces
+            void cleanup(const bool verbose);
+
+            //- Return new surface. Returns pointMap, faceMap from
+            //  subsetMeshMap
+            keyedSurface subsetMesh
+            (
+                const boolList& include,
+                labelList& pointMap,
+                labelList& faceMap
+            ) const;
+
+            //- Transfer the contents of the argument and annull the argument
+            void transfer(keyedSurface&);
+
+            //- Transfer the contents of the argument and annull the argument
+            void transfer(meshedSurface&);
+
+        // Write
+
+            //- Write to Ostream in simple FOAM format
+            virtual void write(Ostream&) const;
+
+            //- Generic write routine. Chooses writer based on extension.
+            virtual void write(const fileName& fName) const
+            {
+                write(fName, *this);
+            }
+
+            //- Write to database
+            void write(const Time&) const;
+
+            //- Write some statistics
+            void writeStats(Ostream&) const;
+
+    // Friend Functions
+
+    // Member operators
+
+        void operator=(const keyedSurface&);
+
+
+    // Ostream Operator
+
+        friend Ostream& operator<<(Ostream&, const keyedSurface&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/keyedSurfaceCleanup.C b/src/surfMesh/keyedSurface/keyedSurfaceCleanup.C
new file mode 100644
index 0000000000..b44e3aaa5d
--- /dev/null
+++ b/src/surfMesh/keyedSurface/keyedSurfaceCleanup.C
@@ -0,0 +1,235 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "keyedSurface.H"
+#include "mergePoints.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+// Remove badly degenerate faces, double faces.
+void Foam::keyedSurface::cleanup(const bool verbose)
+{
+    // merge points (already done for STL, TRI)
+    stitchFaces(SMALL, verbose);
+
+    checkFaces(verbose);
+    checkEdges(verbose);
+}
+
+
+bool Foam::keyedSurface::stitchFaces(const scalar tol, const bool verbose)
+{
+    pointField& pointLst = points();
+
+    // Merge points
+    labelList  pointMap(pointLst.size());
+    pointField newPoints(pointLst.size());
+
+    bool hasMerged = mergePoints(pointLst, tol, verbose, pointMap, newPoints);
+
+    if (!hasMerged)
+    {
+        return false;
+    }
+
+    if (verbose)
+    {
+        Info<< "keyedSurface::stitchFaces : Renumbering all faces"
+            << endl;
+    }
+
+    // Set the coordinates to the merged ones
+    pointLst.transfer(newPoints);
+
+    List<FaceType>& faceLst = faces();
+
+    // Reset the point labels to the unique points array
+    label newFaceI = 0;
+    forAll (faceLst, faceI)
+    {
+        FaceType& f = faceLst[faceI];
+        forAll (f, fp)
+        {
+            f[fp] = pointMap[f[fp]];
+        }
+
+        if (f.collapse() >= 3)
+        {
+            if (newFaceI != faceI)
+            {
+                faceLst[newFaceI] = f;
+            }
+            newFaceI++;
+        }
+        else if (verbose)
+        {
+            Pout<< "keyedSurface::stitchFaces : "
+                << "Removing collapsed face " << faceI << endl
+                << "    vertices   :" << f << endl;
+        }
+    }
+
+    if (newFaceI != faceLst.size())
+    {
+        if (verbose)
+        {
+            Pout<< "keyedSurface::stitchFaces : "
+                << "Removed " << faceLst.size() - newFaceI
+                << " faces" << endl;
+        }
+        faceLst.setSize(newFaceI);
+    }
+
+    // Merging points might have changed geometric factors
+    clearOut();
+
+    return true;
+}
+
+
+// Remove badly degenerate faces and double faces.
+void Foam::keyedSurface::checkFaces(const bool verbose)
+{
+    // Simple check on indices ok.
+    const label maxPointI = points().size() - 1;
+
+    List<FaceType>& faceLst = faces();
+
+    // Phase 0: detect badly labelled faces
+    forAll (faceLst, faceI)
+    {
+        const FaceType& f = faceLst[faceI];
+
+        forAll (f, fp)
+        {
+            if (f[fp] < 0 || f[fp] > maxPointI)
+            {
+                FatalErrorIn("keyedSurface::checkFaces(bool)")
+                    << "face " << f
+                    << " uses point indices outside point range 0.."
+                    << maxPointI
+                    << exit(FatalError);
+            }
+        }
+    }
+
+    // Two phase process
+    //   1. mark invalid faces
+    //   2. pack
+    // Done to keep numbering constant in phase 1
+    const labelListList& fFaces = faceFaces();
+    label newFaceI = 0;
+
+    forAll (faceLst, faceI)
+    {
+        FaceType& f = faceLst[faceI];
+
+        // avoid degenerate faces
+        if (f.collapse() >= 3)
+        {
+            // duplicate face check
+            bool okay = true;
+            const labelList& neighbours = fFaces[faceI];
+
+            // Check if faceNeighbours use same points as this face.
+            // Note: discards normal information - sides of baffle are merged.
+            forAll (neighbours, neighI)
+            {
+                if (neighbours[neighI] <= faceI)
+                {
+                    // lower numbered faces already checked
+                    continue;
+                }
+
+                const face& nei = faceLst[neighbours[neighI]];
+
+                if (f == nei)
+                {
+                    okay = false;
+
+                    if (verbose)
+                    {
+                        WarningIn
+                        (
+                            "keyedSurface::checkFaces(bool verbose)"
+                        )   << "faces share the same vertices:\n"
+                            << "    face 1 :" << faceI << endl;
+                        // printFace(Warning, "    ", f, points());
+
+                        Warning
+                            << endl
+                            << "    face 2 :"
+                            << neighbours[neighI] << endl;
+                        // printFace(Warning, "    ", nei, points());
+                    }
+
+                    break;
+                }
+            }
+
+            if (okay)
+            {
+                if (newFaceI != faceI)
+                {
+                    faceLst[newFaceI] = f;
+                }
+                newFaceI++;
+            }
+        }
+        else if (verbose)
+        {
+            WarningIn
+            (
+                "keyedSurface::checkFaces(bool verbose)"
+            )   << "face " << faceI
+                << " does not at least three unique vertices:\n";
+            // printFace(Warning, "    ", f, points());
+        }
+    }
+
+    if (newFaceI < faceLst.size())
+    {
+        if (verbose)
+        {
+            WarningIn
+            (
+                "keyedSurface::checkFaces(bool verbose)"
+            )   << "Removed " << faceLst.size() - newFaceI
+                << " illegal faces." << endl;
+        }
+        faceLst.setSize(newFaceI);
+
+        // Topology can change because of renumbering
+        clearOut();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/src/surfMesh/keyedSurface/newKeyedSurface.C b/src/surfMesh/keyedSurface/newKeyedSurface.C
new file mode 100644
index 0000000000..286cb83162
--- /dev/null
+++ b/src/surfMesh/keyedSurface/newKeyedSurface.C
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "keyedSurface.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+
+Foam::autoPtr<Foam::keyedSurface>
+Foam::keyedSurface::New
+(
+    const fileName& fName,
+    const word& ext,
+    const bool triangulate
+)
+{
+    if (debug)
+    {
+        Info<< "keyedSurface::New"
+            "(const fileName&, const word&, const bool) : "
+            "constructing keyedSurface"
+            << endl;
+    }
+
+    fileExtensionConstructorTable::iterator cstrIter =
+        fileExtensionConstructorTablePtr_->find(ext);
+
+    if (cstrIter == fileExtensionConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "keyedSurface::New(const fileName&, const word&, const bool) : "
+            "constructing keyedSurface"
+        )   << "Unknown file extension " << ext << nl << nl
+            << "Valid types are :" << nl
+            << fileExtensionConstructorTablePtr_->toc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<keyedSurface>(cstrIter()(fName, triangulate));
+}
+
+
+Foam::autoPtr<Foam::keyedSurface>
+Foam::keyedSurface::New
+(
+    const fileName& fName,
+    const bool triangulate
+)
+{
+    const word ext = fName.ext();
+
+    if (debug)
+    {
+        Info<< "keyedSurface::New(const fileName&, const bool) : "
+               "constructing keyedSurface"
+            << endl;
+    }
+
+    // TODO:
+    // if (ext == "gz")
+    // {
+    //    fileName unzipName = fName.lessExt();
+    //
+    //    return New(unzipName, unzipName.ext(), ext);
+    // }
+
+    return New(fName, ext, triangulate);
+}
+
+// ************************************************************************* //
diff --git a/src/surfMesh/meshedSurface/meshedSurface.C b/src/surfMesh/meshedSurface/meshedSurface.C
new file mode 100644
index 0000000000..047b866180
--- /dev/null
+++ b/src/surfMesh/meshedSurface/meshedSurface.C
@@ -0,0 +1,988 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "meshedSurface.H"
+#include "keyedSurface.H"
+#include "demandDrivenData.H"
+#include "IFstream.H"
+#include "OFstream.H"
+#include "Time.H"
+#include "boundBox.H"
+#include "SortableList.H"
+#include "ListOps.H"
+#include "polyBoundaryMesh.H"
+#include "polyMesh.H"
+// #include "surfMesh.H"
+#include "primitivePatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+defineTypeNameAndDebug(meshedSurface, 0);
+
+defineMemberFunctionSelectionTable
+(
+    meshedSurface,
+    write,
+    fileExtension
+);
+
+}
+
+Foam::word Foam::meshedSurface::defaultGeometricType("empty");
+//  File extension for 'native' raw format
+//! @cond localscope
+const char * const nativeExt = "ftr";
+//! @endcond localscope
+
+// * * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * //
+
+Foam::fileName Foam::meshedSurface::triSurfInstance(const Time& d)
+{
+    fileName foamName(d.caseName() + "." + nativeExt);
+
+    // Search back through the time directories list to find the time
+    // closest to and lower than current time
+
+    instantList ts = d.times();
+    label i;
+
+    for (i=ts.size()-1; i>=0; i--)
+    {
+        if (ts[i].value() <= d.timeOutputValue())
+        {
+            break;
+        }
+    }
+
+    // Noting that the current directory has already been searched
+    // for mesh data, start searching from the previously stored time directory
+
+    if (i>=0)
+    {
+        for (label j=i; j>=0; j--)
+        {
+            if (file(d.path()/ts[j].name()/typeName/foamName))
+            {
+                if (debug)
+                {
+                    Pout<< " meshedSurface::triSurfInstance(const Time& d)"
+                        << "reading " << foamName
+                        << " from " << ts[j].name()/typeName
+                        << endl;
+                }
+
+                return ts[j].name();
+            }
+        }
+    }
+
+    if (debug)
+    {
+        Pout<< " meshedSurface::triSurfInstance(const Time& d)"
+            << "reading " << foamName
+            << " from constant/" << endl;
+    }
+
+    return "constant";
+}
+
+
+Foam::fileName Foam::meshedSurface::triSurfName(const Time& d)
+{
+    fileName foamName(d.caseName() + "." + nativeExt);
+
+    // Search back through the time directories list to find the time
+    // closest to and lower than current time
+
+    instantList ts = d.times();
+    label i;
+
+    for (i=ts.size()-1; i>=0; i--)
+    {
+        if (ts[i].value() <= d.timeOutputValue())
+        {
+            break;
+        }
+    }
+
+    // Noting that the current directory has already been searched
+    // for mesh data, start searching from the previously stored time directory
+
+    if (i>=0)
+    {
+        for (label j=i; j>=0; j--)
+        {
+            fileName testName(d.path()/ts[j].name()/typeName/foamName);
+
+            if (file(testName))
+            {
+                if (debug)
+                {
+                    Pout<< " meshedSurface::triSurfName(const Time& d)"
+                        << "reading " << foamName
+                        << " from " << ts[j].name()/typeName
+                        << endl;
+                }
+
+                return testName;
+            }
+        }
+    }
+
+    if (debug)
+    {
+        Pout<< " meshedSurface::triSurfName(const Time& d)"
+            << "reading " << foamName
+            << " from constant/" << endl;
+    }
+
+    return d.path()/"constant"/typeName/foamName;
+}
+
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::meshedSurface::onePatch()
+{
+    // set single default patch
+    patches_.setSize(1);
+    patches_[0] = surfacePatch
+    (
+        defaultGeometricType,
+        "patch0",
+        size(),         // patch size
+        0,              // patch start
+        0               // patch index
+    );
+}
+
+
+void Foam::meshedSurface::checkPatches()
+{
+    // extra safety, ensure we have at some patches,
+    // and they cover all the faces
+    // fix start silently
+    if (patches_.size() > 1)
+    {
+        label count = 0;
+        forAll(patches_, patchI)
+        {
+            patches_[patchI].start() = count;
+            count += patches_[patchI].size();
+        }
+
+        if (count < size())
+        {
+            WarningIn
+            (
+                "meshedSurface::checkPatches()\n"
+            )
+                << "more nFaces " << size()
+                << " than patches " << count
+                << " ... extending final patch"
+                << endl;
+
+            patches_[patches_.size()-1].size() += count - size();
+        }
+        else if (count > size())
+        {
+            FatalErrorIn
+            (
+                "meshedSurface::checkPatches()\n"
+            )
+                << "more patches " << count
+                << " than nFaces " << size()
+                << exit(FatalError);
+        }
+    }
+    else if (patches_.size() == 1)
+    {
+        // like onePatch, but preserve the name
+        patches_[0].start() = 0;
+        patches_[0].size() = size();
+        if (!patches_[0].name().size())
+        {
+            patches_[0].name() = "patch0";
+        }
+    }
+    else
+    {
+        onePatch();
+    }
+}
+
+
+// Read triangles, points from Istream
+bool Foam::meshedSurface::read(Istream& is)
+{
+    is  >> patches_ >> points() >> faces();
+
+    return true;
+}
+
+#if 0
+// Read from file in given format
+bool Foam::meshedSurface::read(const fileName& name, const word& ext)
+{
+    if (ext == "gz")
+    {
+        fileName unzipName = name.lessExt();
+
+        return read(unzipName, unzipName.ext());
+    }
+}
+#endif
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::meshedSurface::meshedSurface()
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    patches_()
+{}
+
+
+Foam::meshedSurface::meshedSurface
+(
+    const pointField& pointLst,
+    const List<FaceType>& faceLst,
+    const surfacePatchList& patchLst
+)
+:
+    MeshStorage(faceLst, pointLst),
+    patches_(patchLst)
+{}
+
+
+Foam::meshedSurface::meshedSurface
+(
+    const xfer<pointField>& pointLst,
+    const xfer<List<FaceType> >& faceLst,
+    const xfer<surfacePatchList>& patchLst
+)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    patches_(patchLst)
+{
+    faces().transfer(faceLst());
+    points().transfer(pointLst());
+}
+
+
+Foam::meshedSurface::meshedSurface
+(
+    const xfer<pointField>& pointLst,
+    const xfer<List<FaceType> >& faceLst,
+    const List<label>& patchSizes,
+    const List<word>& patchNames,
+    const List<word>& patchTypes
+)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    patches_()
+{
+    points().transfer(pointLst());
+    faces().transfer(faceLst());
+
+    surfacePatchList newPatches(patchSizes.size());
+
+    label start = 0;
+    forAll(newPatches, patchI)
+    {
+        newPatches[patchI] = surfacePatch
+        (
+            defaultGeometricType,
+            patchNames[patchI],
+            patchSizes[patchI],
+            start,
+            patchI
+        );
+
+        start += patchSizes[patchI];
+    }
+
+    patches_.transfer(newPatches);
+}
+
+
+Foam::meshedSurface::meshedSurface
+(
+    const xfer<pointField>& pointLst,
+    const xfer<List<FaceType> >& faceLst,
+    const List<label>& regionLst,
+    const Map<word>& regionNames
+)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    patches_()
+{
+    points().transfer(pointLst());
+    faces().transfer(faceLst());
+
+    const List<FaceType>& unsortedFaces = faces();
+
+    if (regionLst.size() == 0)
+    {
+        onePatch();
+    }
+    else if (regionLst.size() != unsortedFaces.size())
+    {
+        FatalErrorIn
+        (
+            "meshedSurface::meshedSurface(\n"
+            "(\n"
+            "    const pointField&,\n"
+            "    const List<FaceType>&,\n"
+            "    const List<label>& regionLst,\n"
+            "    const Map<word>& regionNames\n"
+            " )\n"
+        )
+            << "size mismatch : regionLst.size() != faceLst.size()"
+            << exit(FatalError);
+    }
+    else
+    {
+        labelList faceMap;
+        surfacePatchList newPatches = keyedSurface::sortedRegions
+        (
+            regionLst,
+            regionNames,
+            faceMap
+        );
+        patches_.transfer(newPatches);
+
+        // this is somewhat like ListOps reorder and/or IndirectList
+        List<FaceType> newFaces(unsortedFaces.size());
+        forAll(newFaces, faceI)
+        {
+            newFaces[faceI] = unsortedFaces[faceMap[faceI]];
+        }
+        faceMap.clear();
+
+        faces().transfer(newFaces);
+    }
+}
+
+
+Foam::meshedSurface::meshedSurface
+(
+    const xfer<pointField>& pointLst,
+    const xfer<List<FaceType> >& faceLst
+)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    patches_()
+{
+    faces().transfer(faceLst());
+    points().transfer(pointLst());
+
+    onePatch();
+}
+
+
+Foam::meshedSurface::meshedSurface
+(
+    const xfer<pointField>& pointLst,
+    const List<keyedFace>& faceLst,
+    const Map<word>& regionNames
+)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    patches_()
+{
+    points().transfer(pointLst());
+
+    labelList faceMap;
+    surfacePatchList newPatches = keyedSurface::sortedRegions
+    (
+        faceLst,
+        regionNames,
+        faceMap
+    );
+    patches_.transfer(newPatches);
+
+    // this is somewhat like ListOps reorder and/or IndirectList
+    List<FaceType> newFaces(faceLst.size());
+    forAll(newFaces, faceI)
+    {
+        newFaces[faceI] = faceLst[faceMap[faceI]];
+    }
+
+    faces().transfer(newFaces);
+}
+
+
+Foam::meshedSurface::meshedSurface
+(
+    const xfer<pointField>& pointLst,
+    const List<keyedFace>& faceLst,
+    const HashTable<label>& nameToRegionMapping
+)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    patches_()
+{
+    points().transfer(pointLst());
+
+    Map<word> regionNames;
+    forAllConstIter(HashTable<label>, nameToRegionMapping, iter)
+    {
+        regionNames.insert(iter(), iter.key());
+    }
+
+
+    labelList faceMap;
+    surfacePatchList newPatches = keyedSurface::sortedRegions
+    (
+        faceLst,
+        regionNames,
+        faceMap
+    );
+    patches_.transfer(newPatches);
+
+    List<FaceType> newFaces(faceLst.size());
+
+    // this is somewhat like ListOps reorder and/or IndirectList
+    forAll(newFaces, faceI)
+    {
+        newFaces[faceI] = faceLst[faceMap[faceI]];
+    }
+
+    faces().transfer(newFaces);
+}
+
+
+Foam::meshedSurface::meshedSurface
+(
+    const polyBoundaryMesh& bMesh,
+    const bool useGlobalPoints
+)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    patches_()
+{
+    const polyMesh& mesh = bMesh.mesh();
+    const polyPatchList& bPatches = bMesh;
+    const label nIntFaces = mesh.nInternalFaces();
+
+    // Get patch for all of outside
+    primitivePatch allBoundary
+    (
+        SubList<FaceType>
+        (
+            mesh.faces(),
+            mesh.nFaces() - nIntFaces,
+            nIntFaces
+        ),
+        mesh.points()
+    );
+
+    if (useGlobalPoints)
+    {
+        // copy in the global points and the global face addressing
+        points() = mesh.points();
+        faces() = allBoundary;
+    }
+    else
+    {
+        // copy in the local points and the local face addressing
+        points() = allBoundary.localPoints();
+        faces() = allBoundary.localFaces();
+    }
+
+    // create patch list
+    surfacePatchList newPatches(bPatches.size());
+
+    label startFaceI = 0;
+    forAll(bPatches, patchI)
+    {
+        const polyPatch& p = bPatches[patchI];
+
+        newPatches[patchI] = surfacePatch
+        (
+            defaultGeometricType,
+            p.name(),
+            p.size(),
+            startFaceI,
+            patchI
+        );
+
+        startFaceI += p.size();
+    }
+
+    patches_.transfer(newPatches);
+}
+
+
+#if 0
+// in preparation
+Foam::meshedSurface::meshedSurface
+(
+    const surfMesh& sMesh
+)
+:
+    MeshStorage(List<FaceType>(sMesh.faces()), sMesh.points()),
+    patches_()
+{
+    const surfPatchList& sPatches = sMesh.boundaryMesh();
+
+    // create patch list
+    surfacePatchList newPatches(sPatches.size());
+
+    label startFaceI = 0;
+    forAll(sPatches, patchI)
+    {
+        const surfPatch& p = sPatches[patchI];
+
+        newPatches[patchI] = surfacePatch
+        (
+            defaultGeometricType,
+            p.name(),
+            p.size(),
+            startFaceI,
+            patchI
+        );
+
+        startFaceI += p.size();
+    }
+
+    patches_.transfer(newPatches);
+}
+#endif
+
+
+Foam::meshedSurface::meshedSurface
+(
+    const keyedSurface& surf
+)
+:
+    MeshStorage(List<FaceType>(), surf.points()),
+    patches_()
+{
+    labelList faceMap;
+    surfacePatchList newPatches = surf.sortedRegions(faceMap);
+    patches_.transfer(newPatches);
+
+    const List<keyedFace>& origFaces = surf.faces();
+    List<FaceType> newFaces(origFaces.size());
+
+    // this is somewhat like ListOps reorder and/or IndirectList
+    forAll(newFaces, faceI)
+    {
+        newFaces[faceI] = origFaces[faceMap[faceI]];
+    }
+
+    faces().transfer(newFaces);
+}
+
+
+Foam::meshedSurface::meshedSurface
+(
+    const fileName& fName,
+    const word& ext,
+    const bool triangulate
+)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    patches_()
+{
+    // use selector mechanism
+    autoPtr<meshedSurface> surfPtr = New(fName, ext, triangulate);
+    transfer(surfPtr());
+}
+
+Foam::meshedSurface::meshedSurface
+(
+    const fileName& fName,
+    const bool triangulate
+)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    patches_()
+{
+    // use selector mechanism
+    autoPtr<meshedSurface> surfPtr = New(fName, triangulate);
+    transfer(surfPtr());
+}
+
+
+Foam::meshedSurface::meshedSurface(Istream& is)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    patches_()
+{
+    read(is);
+    // setDefaultPatches();
+}
+
+
+Foam::meshedSurface::meshedSurface(const Time& d)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    patches_()
+{
+    read(IFstream(triSurfName(d))());
+    // setDefaultPatches();
+}
+
+
+Foam::meshedSurface::meshedSurface(const meshedSurface& surf)
+:
+    MeshStorage(surf.faces(), surf.points()),
+    patches_(surf.patches_)
+{}
+
+
+Foam::meshedSurface::meshedSurface(const xfer<keyedSurface>& surf)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    patches_()
+{
+    transfer(surf());
+}
+
+
+Foam::meshedSurface::meshedSurface(const xfer<meshedSurface>& surf)
+:
+    MeshStorage(List<FaceType>(), pointField()),
+    patches_()
+{
+    transfer(surf());
+}
+
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::meshedSurface::~meshedSurface()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+
+//- Move points
+void Foam::meshedSurface::movePoints(const pointField& newPoints)
+{
+    // Remove all geometry dependent data
+    clearTopology();
+
+    // Adapt for new point position
+    MeshStorage::movePoints(newPoints);
+
+    // Copy new points
+    points() = newPoints;
+}
+
+//- scale points
+void Foam::meshedSurface::scalePoints(const scalar& scaleFactor)
+{
+    // avoid bad scaling
+    if (scaleFactor > 0 && scaleFactor != 1.0)
+    {
+        // Remove all geometry dependent data
+        clearTopology();
+
+        // Adapt for new point position
+        MeshStorage::movePoints(pointField());
+
+        points() *= scaleFactor;
+    }
+}
+
+
+
+Foam::meshedSurface Foam::meshedSurface::subsetMesh
+(
+    const boolList& include,
+    labelList& pointMap,
+    labelList& faceMap
+) const
+{
+    const pointField& locPoints = localPoints();
+    const List<FaceType>& locFaces = localFaces();
+
+    // Fill pointMap, faceMap
+    subsetMap(include, pointMap, faceMap);
+
+    // Create compact coordinate list and forward mapping array
+    pointField newPoints(pointMap.size());
+    labelList oldToNew(locPoints.size());
+    forAll(pointMap, pointI)
+    {
+        newPoints[pointI] = locPoints[pointMap[pointI]];
+        oldToNew[pointMap[pointI]] = pointI;
+
+    }
+
+    // create a new patch list
+    surfacePatchList newPatches(patches_);
+    forAll(newPatches, patchI)
+    {
+        newPatches[patchI].size() = 0;
+    }
+
+    // Renumber face node labels and compact
+    List<FaceType> newFaces(faceMap.size());
+
+    forAll(faceMap, faceI)
+    {
+        // Get old vertex labels
+        label origFaceI = faceMap[faceI];
+        const FaceType& oldFace = locFaces[origFaceI];
+
+        newFaces[faceI] = FaceType(oldFace);
+
+        // Renumber labels for face
+        FaceType& f = newFaces[faceI];
+        forAll(f, fp)
+        {
+            f[fp] = oldToNew[oldFace[fp]];
+        }
+
+        // adjust patch sizes
+        forAllReverse (newPatches, patchI)
+        {
+            if
+            (
+                origFaceI >= patches_[patchI].start()
+             && patches_[patchI].size()
+            )
+            {
+                newPatches[patchI].size()++;
+                break;
+            }
+        }
+    }
+
+    // adjust patch start
+    label startFaceI = 0;
+    forAll(newPatches, patchI)
+    {
+        newPatches[patchI].start() = startFaceI;
+        startFaceI += newPatches[patchI].size();
+    }
+
+    // Construct an empty subsurface and fill
+    meshedSurface subSurf;
+
+    subSurf.patches_.transfer(newPatches);
+    subSurf.points().transfer(newPoints);
+    subSurf.faces().transfer(newFaces);
+
+    return subSurf;
+}
+
+
+void Foam::meshedSurface::transfer(meshedSurface& surf)
+{
+    clearOut();
+    faces().transfer(surf.faces());
+    points().transfer(surf.points());
+    patches_.transfer(surf.patches_);
+    surf.clearOut();
+}
+
+
+void Foam::meshedSurface::transfer(keyedSurface& surf)
+{
+    clearOut();
+    points().transfer(surf.points());
+
+    labelList faceMap;
+    surfacePatchList newPatches = surf.sortedRegions(faceMap);
+    patches_.transfer(newPatches);
+
+    const List<keyedFace>& origFaces = surf.faces();
+    List<FaceType> newFaces(origFaces.size());
+
+    // this is somewhat like ListOps reorder and/or IndirectList
+    forAll(newFaces, faceI)
+    {
+        newFaces[faceI] = origFaces[faceMap[faceI]];
+    }
+
+    faces().transfer(newFaces);
+    surf.faces().clear();
+    surf.clearOut();
+}
+
+
+bool Foam::meshedSurface::canRead(const word& ext, const bool verbose)
+{
+    return keyedSurface::canRead(ext, verbose);
+}
+
+
+bool Foam::meshedSurface::canWrite(const word& ext, const bool verbose)
+{
+    // perhaps we got sent an entire name
+    word fExt(ext);
+
+    // FIXME: this looks horrible, but I don't have STL docs here
+    string::size_type dot = ext.find_last_of(".");
+    if (dot != string::npos)
+    {
+        fExt = ext.substr(dot+1);
+    }
+
+    // handle 'native' format directly
+    if (fExt == nativeExt)
+    {
+        return true;
+    }
+
+    writefileExtensionMemberFunctionTable::iterator mfIter =
+        writefileExtensionMemberFunctionTablePtr_->find(fExt);
+
+    if (mfIter == writefileExtensionMemberFunctionTablePtr_->end())
+    {
+        if (verbose)
+        {
+            const wordList& known =
+                writefileExtensionMemberFunctionTablePtr_->toc();
+
+            Info<<"Unknown file extension for writing: " << fExt << nl;
+            // compact output:
+            Info<<"Valid types: ( " << nativeExt;
+            forAll(known, i)
+            {
+                Info<<" " << known[i];
+            }
+            Info<<" )" << endl;
+        }
+
+        return false;
+    }
+
+    return true;
+}
+
+
+void Foam::meshedSurface::write
+(
+    const fileName& fName,
+    const meshedSurface& surf
+)
+{
+    if (debug)
+    {
+        Info<< "meshedSurface::write(const fileName&, const meshedSurface&) : "
+               "writing meshedSurface to " << fName
+            << endl;
+    }
+
+    const word ext = fName.ext();
+
+    // handle 'native' format directly
+    if (ext == nativeExt)
+    {
+        surf.write(OFstream(fName)());
+    }
+    else
+    {
+        writefileExtensionMemberFunctionTable::iterator mfIter =
+            writefileExtensionMemberFunctionTablePtr_->find(ext);
+
+        if (mfIter == writefileExtensionMemberFunctionTablePtr_->end())
+        {
+            FatalErrorIn
+            (
+                "meshedSurface::write(const fileName&)"
+            )   << "Unknown file extension " << ext << nl << nl
+                << "Valid types are :" << endl
+                << writefileExtensionMemberFunctionTablePtr_->toc()
+                << exit(FatalError);
+        }
+
+        mfIter()(fName, surf);
+    }
+}
+
+
+void Foam::meshedSurface::write(Ostream& os) const
+{
+    // quick-hack
+    os << patches_.size() << nl << token::BEGIN_LIST;
+    forAll(patches_, patchI)
+    {
+        patches_[patchI].writeDict(os);
+    }
+    os << token::END_LIST;
+
+    // Note: Write with global point numbering
+    os << points() << nl << faces() << endl;
+
+    // Check state of Ostream
+    os.check("meshedSurface::write(Ostream&)");
+}
+
+
+void Foam::meshedSurface::write(const Time& d) const
+{
+    write(OFstream(triSurfName(d))());
+}
+
+
+void Foam::meshedSurface::writeStats(Ostream& os) const
+{
+    os  << "Faces        : " << size() << endl
+        << "Edges        : " << nEdges() << endl
+        << "Vertices     : " << nPoints() << endl
+        << "Bounding Box : " << boundBox(localPoints(), false) << endl;
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+void Foam::meshedSurface::operator=(const meshedSurface& surf)
+{
+    clearOut();
+    faces()  = surf.faces();
+    points() = surf.points();
+    patches_ = surf.patches_;
+}
+
+// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const meshedSurface& surf)
+{
+    surf.write(os);
+    return os;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/src/surfMesh/meshedSurface/meshedSurface.H b/src/surfMesh/meshedSurface/meshedSurface.H
new file mode 100644
index 0000000000..c9efb9d167
--- /dev/null
+++ b/src/surfMesh/meshedSurface/meshedSurface.H
@@ -0,0 +1,437 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::meshedSurface
+
+Description
+    A surface geometry mesh with patch information, not to be confused
+    with a similarily named surfaceMesh, which actually refers to
+    the cell faces of a volume mesh!
+
+   The meshedSurface is intended to surfaces from a variety of sources.
+   - A set of points and faces without any patch information.
+   - A set of points and faces with randomly sorted patch information.
+     This could arise, for example, from reading external file formats
+     such as STL, etc.
+
+SourceFiles
+    meshedSurface.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef meshedSurface_H
+#define meshedSurface_H
+
+#include "pointField.H"
+#include "PrimitivePatchExtra.H"
+#include "boolList.H"
+#include "geometricSurfacePatchList.H"
+#include "surfacePatchList.H"
+#include "face.H"
+#include "Keyed.H"
+#include "xfer.H"
+#include "runTimeSelectionTables.H"
+#include "memberFunctionSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class Time;
+class keyedSurface;
+class polyBoundaryMesh;
+class surfMesh;
+
+/*---------------------------------------------------------------------------*\
+                      Class meshedSurface Declaration
+\*---------------------------------------------------------------------------*/
+
+class meshedSurface
+:
+    public PrimitivePatchExtra<face, ::Foam::List, pointField, point>
+{
+    friend class keyedSurface;
+
+protected:
+
+    // Protected Member Data
+
+        //- Typedef if this type has not already been defined
+        typedef Keyed<face> keyedFace;
+
+        //- Typedef for similar code in keyedSurface and meshedSurface
+        typedef face FaceType;
+
+private:
+
+    // Private Member Data
+
+    // Private typedefs
+
+        typedef PrimitivePatchExtra
+        <
+            FaceType,
+            ::Foam::List,
+            pointField,
+            point
+        >
+        MeshStorage;
+
+    // Private data
+
+        //- Patch information (face ordering nFaces/startFace only used
+        //  during reading and writing)
+        surfacePatchList patches_;
+
+    // Private member functions
+
+        //- set a single patch
+        void onePatch();
+
+        //- basic sanity check on patches
+        void checkPatches();
+
+        //- Read in Foam format
+        bool read(Istream&);
+
+
+    // Static private functions
+
+public:
+
+    // Protected Member Data
+
+    // Protected Member functions
+
+        //- Return non-const access to global points
+        pointField& points()
+        {
+            return const_cast<pointField&>(MeshStorage::points());
+        }
+
+        //- Return non-const access to the faces
+        List<FaceType>& faces()
+        {
+            return static_cast<List<FaceType> &>(*this);
+        }
+
+public:
+
+        //- Runtime type information
+        ClassName("meshedSurface");
+
+        //- Return the default geometric patch type (usually "empty")
+        static word defaultGeometricType;
+
+
+    // Static
+
+        //- Name of meshedSurface directory to use.
+        static fileName triSurfInstance(const Time&);
+
+        //- Name of meshedSurface directory to use.
+        static fileName triSurfName(const Time&);
+
+
+
+    // Constructors
+
+        //- Construct null
+        meshedSurface();
+
+        //- Construct from components (points, faces and patches).
+        meshedSurface
+        (
+            const pointField&,
+            const List<face>&,
+            const surfacePatchList&
+        );
+
+        //- Construct by transferring components
+        //- (points, faces and patches).
+        meshedSurface
+        (
+            const xfer<pointField>&,
+            const xfer<List<face> >&,
+            const xfer<surfacePatchList>&
+        );
+
+        //- Construct from points, faces, and patch information
+        meshedSurface
+        (
+            const xfer<pointField>&,
+            const xfer<List<face> >&,
+            const List<label>& patchSizes,
+            const List<word>& patchNames,
+            const List<word>& patchTypes
+        );
+   
+        //- Construct from points, faces, a list of (unsorted) region Ids
+        //  and with the names of the regions.
+        meshedSurface
+        (
+            const xfer<pointField>&,
+            const xfer<List<face> >&,
+            const List<label>& regionIds,
+            const Map<word>& regionNames
+        );
+
+        //- Construct by transferring points, faces
+        //  with a single default patch
+        meshedSurface
+        (
+            const xfer<pointField>&,
+            const xfer<List<face> >&
+        );
+
+        //- Construct by transferring points and copying labelled faces
+        //  With region names per map or set to default.
+        meshedSurface
+        (
+            const xfer<pointField>&,
+            const List<keyedFace>&,
+            const Map<word>& regionNames
+        );
+
+        //- Construct by transferring points and labelled faces
+        //- with patch-names from hash
+        meshedSurface
+        (
+            const xfer<pointField>&,
+            const List<keyedFace>&,
+            const HashTable<label>& nameToRegionMapping
+        );
+
+        //- Construct from a boundary mesh with local points/faces
+        meshedSurface
+        (
+            const polyBoundaryMesh&,
+            const bool globalPoints=false
+        );
+
+        //- Construct from a keyedSurface
+        meshedSurface(const keyedSurface&);
+
+        //- Construct from a surfMesh
+        meshedSurface(const surfMesh&);
+
+        //- Construct by transferring the contents from a keyedSurface
+        meshedSurface(const xfer<keyedSurface>&);
+
+        //- Construct by transferring the contents from a meshedSurface
+        meshedSurface(const xfer<meshedSurface>&);
+
+
+        //- Construct from file name (uses extension to determine type)
+        meshedSurface
+        (
+            const fileName&,
+            const bool triangulate=false
+        );
+
+        //- Construct from file name (uses extension to determine type)
+        meshedSurface
+        (
+            const fileName&,
+            const word&,
+            const bool triangulate=false
+        );
+
+        //- Construct from Istream
+        meshedSurface(Istream&);
+
+        //- Construct from objectRegistry
+        meshedSurface(const Time&);
+
+        //- Construct as copy
+        meshedSurface(const meshedSurface&);
+
+    // Selectors
+
+        //- Select constructed from filename (implicit extension)
+        static autoPtr<meshedSurface> New
+        (
+            const fileName&,
+            const bool triangulate=false
+        );
+
+        //- Select constructed from filename (explicit extension)
+        static autoPtr<meshedSurface> New
+        (
+            const fileName&,
+            const word&,
+            const bool triangulate=false
+        );
+
+
+    // Destructor
+
+        ~meshedSurface();
+
+
+    // Member Function Selectors
+
+        declareMemberFunctionSelectionTable
+        (
+            void,
+            meshedSurface,
+            write,
+            fileExtension,
+            (
+                const fileName& fName,
+                const meshedSurface& surf
+            ),
+            (fName, surf)
+        );
+
+        //- Write to file
+        static void write(const fileName&, const meshedSurface&);
+
+        //- Can we read this file format?
+        static bool canRead(const word& ext, const bool verbose=false);
+
+        //- Can we write this file format?
+        static bool canWrite(const word& ext, const bool verbose=false);
+
+    // Member Functions
+
+    // Access
+
+        //- Return the number of points
+        label nPoints() const
+        {
+            return points().size();
+        }
+
+        //- Return the number of faces
+        label nFaces() const
+        {
+            return faces().size();
+        }
+
+        //- The surface size is the number of faces
+        label size() const
+        {
+            return nFaces();
+        }
+
+        //- Return const access to global points
+        const pointField& points() const
+        {
+            return MeshStorage::points();
+        }
+
+        //- Return const access to the faces
+        const List<FaceType>& faces() const
+        {
+            return static_cast<const List<FaceType> &>(*this);
+        }
+
+        const surfacePatchList& patches() const
+        {
+            return patches_;
+        }
+
+        surfacePatchList& patches()
+        {
+            return patches_;
+        }
+
+    // Edit
+
+        //- Move points
+        virtual void movePoints(const pointField&);
+
+        //- Scale points. A non-positive factor is ignored
+        virtual void scalePoints(const scalar&);
+
+        //- Triangulate the surface, return the number of added faces.
+        //  The patch list will be adjusted accordingly.
+        label triangulate();
+
+        //- Join the faces by removing duplicate points.
+        //  Returns true if any points merged
+        bool stitchFaces(const scalar tol=SMALL, const bool verbose=false);
+
+        //- Check/fix duplicate/degenerate faces
+        void checkFaces(const bool verbose);
+
+        //- Remove invalid faces
+        void cleanup(const bool verbose);
+
+        //- Return new surface.
+        // Returns pointMap, faceMap from subsetMeshMap
+        meshedSurface subsetMesh
+        (
+            const boolList& include,
+            labelList& pointMap,
+            labelList& faceMap
+        ) const;
+
+        //- Transfer the contents of the argument and annull the argument
+        void transfer(meshedSurface&);
+
+        //- Transfer the contents of the argument and annull the argument
+        void transfer(keyedSurface&);
+
+
+    // Write
+
+        //- Write to Ostream in simple FOAM format
+        virtual void write(Ostream&) const;
+
+        //- Generic write routine. Chooses writer based on extension.
+        virtual void write(const fileName& fName) const
+        {
+            write(fName, *this);
+        }
+
+        //- Write to database
+        void write(const Time&) const;
+
+        //- Write some statistics
+        void writeStats(Ostream&) const;
+
+
+    // Member operators
+
+        void operator=(const meshedSurface&);
+
+    // Ostream Operator
+
+        friend Ostream& operator<<(Ostream&, const meshedSurface&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/surfMesh/meshedSurface/meshedSurfaceCleanup.C b/src/surfMesh/meshedSurface/meshedSurfaceCleanup.C
new file mode 100644
index 0000000000..4419576403
--- /dev/null
+++ b/src/surfMesh/meshedSurface/meshedSurfaceCleanup.C
@@ -0,0 +1,330 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "meshedSurface.H"
+#include "mergePoints.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+// Remove badly degenerate faces, double faces.
+void Foam::meshedSurface::cleanup(const bool verbose)
+{
+    // merge points (already done for STL, TRI)
+    stitchFaces(SMALL, verbose);
+
+    checkFaces(verbose);
+    checkEdges(verbose);
+}
+
+
+bool Foam::meshedSurface::stitchFaces(const scalar tol, const bool verbose)
+{
+    pointField& pointLst = points();
+
+    // Merge points
+    labelList pointMap(pointLst.size());
+    pointField newPoints(pointLst.size());
+
+    bool hasMerged = mergePoints(pointLst, tol, verbose, pointMap, newPoints);
+
+    if (!hasMerged)
+    {
+        return false;
+    }
+
+    if (verbose)
+    {
+        Info<< "meshedSurface::stitchFaces : Renumbering all faces"
+            << endl;
+    }
+
+    // Set the coordinates to the merged ones
+    pointLst.transfer(newPoints);
+
+    List<FaceType>& faceLst = faces();
+
+    // ensure we have at some patches, and they cover all the faces
+    checkPatches();
+
+    // Reset the point labels to the unique points array
+    label oldFaceI = 0;
+    label newFaceI = 0;
+    forAll (patches_, patchI)
+    {
+        surfacePatch& surfPatch = patches_[patchI];
+
+        // adjust patch start
+        surfPatch.start() = newFaceI;
+
+        label patchEnd = oldFaceI + surfPatch.size();
+        for (; oldFaceI < patchEnd; ++oldFaceI)
+        {
+            FaceType& f = faceLst[oldFaceI];
+            forAll (f, fp)
+            {
+                f[fp] = pointMap[f[fp]];
+            }
+
+            if (f.collapse() >= 3)
+            {
+                if (newFaceI != oldFaceI)
+                {
+                    faceLst[newFaceI] = f;
+                }
+                newFaceI++;
+            }
+            else if (verbose)
+            {
+                Pout<< "meshedSurface::stitchFaces : "
+                    << "Removing collapsed face " << oldFaceI << endl
+                    << "    vertices   :" << f << endl;
+            }
+        }
+
+        // adjust patch size
+        surfPatch.size() = newFaceI - surfPatch.size();
+    }
+
+    if (newFaceI != faceLst.size())
+    {
+        if (verbose)
+        {
+            Pout<< "meshedSurface::stitchFaces : "
+                << "Removed " << faceLst.size() - newFaceI
+                << " faces" << endl;
+        }
+        faceLst.setSize(newFaceI);
+    }
+
+
+    // Merging points might have changed geometric factors
+    clearOut();
+
+    return true;
+}
+
+
+
+// Remove badly degenerate faces and double faces.
+void Foam::meshedSurface::checkFaces(const bool verbose)
+{
+    // Simple check on indices ok.
+    const label maxPointI = points().size() - 1;
+
+    List<FaceType>& faceLst = faces();
+
+    // Phase 0: detect badly labelled faces
+    forAll (faceLst, faceI)
+    {
+        const FaceType& f = faceLst[faceI];
+
+        forAll (f, fp)
+        {
+            if (f[fp] < 0 || f[fp] > maxPointI)
+            {
+                FatalErrorIn("meshedSurface::checkFaces(bool)")
+                    << "face " << f
+                    << " uses point indices outside point range 0.."
+                    << maxPointI
+                    << exit(FatalError);
+            }
+        }
+    }
+
+    // ensure we have patches, and they cover all the faces
+    checkPatches();
+
+    // Phase 1: find and skip over invalid faces
+    // Phase 2: pack
+    const labelListList& fFaces = faceFaces();
+
+    label oldFaceI = 0;
+    label newFaceI = 0;
+    forAll (patches_, patchI)
+    {
+        surfacePatch& surfPatch = patches_[patchI];
+
+        // correct the patch start
+        surfPatch.start() = newFaceI;
+
+        label patchEnd = oldFaceI + surfPatch.size();
+        for (; oldFaceI < patchEnd; ++oldFaceI)
+        {
+            FaceType& f = faceLst[oldFaceI];
+
+            // 'degenerate' face check
+            if (f.collapse() >= 3)
+            {
+                // duplicate face check
+                bool okay = true;
+                const labelList& neighbours = fFaces[oldFaceI];
+
+                // Check if faceNeighbours use same points as this face.
+                // Note: discards normal information - sides of baffle are merged.
+                forAll (neighbours, neighI)
+                {
+                    if (neighbours[neighI] <= oldFaceI)
+                    {
+                        // lower numbered faces already checked
+                        continue;
+                    }
+
+                    const face& nei = faceLst[neighbours[neighI]];
+
+                    if (f == nei)
+                    {
+                        okay = false;
+
+                        if (verbose)
+                        {
+                            WarningIn
+                            (
+                                "meshedSurface::checkFaces(bool verbose)"
+                            )   << "faces share the same vertices:\n"
+                                << "    face 1 :" << oldFaceI << endl;
+                            // printFace(Warning, "    ", f, points());
+
+                            Warning
+                                << endl
+                                << "    face 2 :"
+                                << neighbours[neighI] << endl;
+                            // printFace(Warning, "    ", nei, points());
+                        }
+
+                        break;
+                    }
+                }
+
+                if (okay)
+                {
+                    if (newFaceI != oldFaceI)
+                    {
+                        faceLst[newFaceI] = f;
+                    }
+                    newFaceI++;
+                }
+            }
+            else if (verbose)
+            {
+                WarningIn
+                (
+                    "meshedSurface::checkFaces(bool verbose)"
+                )   << "face " << oldFaceI
+                    << " has fewer than three unique vertices:\n";
+                // printTriangle(Warning, "    ", f, points());
+            }
+        }
+
+        // adjust patch size
+        surfPatch.size() = newFaceI - surfPatch.start();
+    }
+
+    if (newFaceI < faceLst.size())
+    {
+        if (verbose)
+        {
+            WarningIn
+            (
+                "meshedSurface::checkFaces(bool verbose)"
+            )   << "Removed " << faceLst.size() - newFaceI
+                << " illegal faces." << endl;
+        }
+        faceLst.setSize(newFaceI);
+
+        // Topology can change because of renumbering
+        clearOut();
+    }
+}
+
+
+Foam::label Foam::meshedSurface::triangulate()
+{
+    label nTri = 0;
+
+    List<FaceType>& faceLst = faces();
+
+    // estimate how may triangles are needed
+    forAll (faceLst, faceI)
+    {
+        nTri += faceLst[faceI].size() - 2;
+    }
+
+    // nothing to do
+    if (nTri <= faceLst.size())
+    {
+        return 0;
+    }
+
+    List<FaceType> newFaces(nTri);
+
+    // note the number of *additional* faces
+    nTri -= faceLst.size();
+
+    // Reset the point labels to the unique points array
+    label oldFaceI = 0;
+    label newFaceI = 0;
+    forAll (patches_, patchI)
+    {
+        surfacePatch& surfPatch = patches_[patchI];
+
+        // adjust patch start
+        surfPatch.start() = newFaceI;
+
+        label patchEnd = oldFaceI + surfPatch.size();
+        for (; oldFaceI < patchEnd; ++oldFaceI)
+        {
+            const FaceType& f = faceLst[oldFaceI];
+            FaceType fTri(3);
+
+            // Do simple face triangulation around f[0].
+            // we could also use face::triangulation
+            fTri[0] = f[0];
+            for (label fp = 1; fp < f.size() - 1; ++fp)
+            {
+                label fp1 = (fp + 1) % f.size();
+
+                fTri[1] = f[fp];
+                fTri[2] = f[fp1];
+
+                newFaces[newFaceI++] = fTri;
+            }
+        }
+
+        // adjust patch size
+        surfPatch.size() = newFaceI - surfPatch.start();
+    }
+
+    faceLst.transfer(newFaces);
+
+    return nTri;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/src/surfMesh/meshedSurface/newMeshedSurface.C b/src/surfMesh/meshedSurface/newMeshedSurface.C
new file mode 100644
index 0000000000..a1142e8f04
--- /dev/null
+++ b/src/surfMesh/meshedSurface/newMeshedSurface.C
@@ -0,0 +1,73 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "keyedSurface.H"
+#include "meshedSurface.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+// all input is indirect via keyedSurface
+Foam::autoPtr<Foam::meshedSurface>
+Foam::meshedSurface::New
+(
+    const fileName& fName,
+    const word& ext,
+    const bool triangulate
+)
+{
+    if (debug)
+    {
+        Info<< "meshedSurface::New(const fileName&, const word&, const bool) : "
+               "constructing meshedSurface"
+            << endl;
+    }
+
+    // created indirectly via keyedSurface
+    autoPtr<meshedSurface> surf(new meshedSurface);
+    surf().transfer( keyedSurface::New(fName,ext,triangulate)() );
+
+    return surf;
+}
+
+
+Foam::autoPtr<Foam::meshedSurface>
+Foam::meshedSurface::New
+(
+    const fileName& fName,
+    const bool triangulate
+)
+{
+    if (debug)
+    {
+        Info<< "meshedSurface::New(const fileName&, const bool) : "
+               "constructing meshedSurface"
+            << endl;
+    }
+
+    return New(fName, fName.ext(), triangulate);
+}
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/Make/files b/src/thermophysicalModels/basic/Make/files
index e88b8bf660..4cea8bf57d 100644
--- a/src/thermophysicalModels/basic/Make/files
+++ b/src/thermophysicalModels/basic/Make/files
@@ -2,14 +2,21 @@ basicMixture = mixtures/basicMixture
 basicThermo = basicThermo
 
 $(basicMixture)/basicMixture.C
+$(basicMixture)/basicMixtures.C
 $(basicThermo)/basicThermo.C
 $(basicThermo)/newBasicThermo.C
-$(basicThermo)/basicThermos.C
+
+hThermo/hThermos.C
+eThermo/eThermos.C
 
 derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C
 derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.C
 derivedFvPatchFields/mixedEnthalpy/mixedEnthalpyFvPatchScalarField.C
 
+derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.C
+derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.C
+derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C
+
 derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
 
 LIB = $(FOAM_LIBBIN)/libbasicThermophysicalModels
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
index dffda25d69..e2e92ed434 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
@@ -31,6 +31,9 @@ License
 #include "fixedEnthalpyFvPatchScalarField.H"
 #include "gradientEnthalpyFvPatchScalarField.H"
 #include "mixedEnthalpyFvPatchScalarField.H"
+#include "fixedInternalEnergyFvPatchScalarField.H"
+#include "gradientInternalEnergyFvPatchScalarField.H"
+#include "mixedInternalEnergyFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -74,9 +77,9 @@ wordList basicThermo::hBoundaryTypes()
     return hbt;
 }
 
-void basicThermo::hBoundaryCorrection(volScalarField& h_)
+void basicThermo::hBoundaryCorrection(volScalarField& h)
 {
-    volScalarField::GeometricBoundaryField& hbf = h_.boundaryField();
+    volScalarField::GeometricBoundaryField& hbf = h.boundaryField();
 
     forAll(hbf, patchi)
     {
@@ -93,6 +96,53 @@ void basicThermo::hBoundaryCorrection(volScalarField& h_)
     }
 }
 
+wordList basicThermo::eBoundaryTypes()
+{
+    const volScalarField::GeometricBoundaryField& tbf = T_.boundaryField();
+
+    wordList ebt = tbf.types();
+
+    forAll(tbf, patchi)
+    {
+        if (isA<fixedValueFvPatchScalarField>(tbf[patchi]))
+        {
+            ebt[patchi] = fixedInternalEnergyFvPatchScalarField::typeName;
+        }
+        else if
+        (
+            isA<zeroGradientFvPatchScalarField>(tbf[patchi])
+         || isA<fixedGradientFvPatchScalarField>(tbf[patchi])
+        )
+        {
+            ebt[patchi] = gradientInternalEnergyFvPatchScalarField::typeName;
+        }
+        else if (isA<mixedFvPatchScalarField>(tbf[patchi]))
+        {
+            ebt[patchi] = mixedInternalEnergyFvPatchScalarField::typeName;
+        }
+    }
+
+    return ebt;
+}
+
+void basicThermo::eBoundaryCorrection(volScalarField& e)
+{
+    volScalarField::GeometricBoundaryField& ebf = e.boundaryField();
+
+    forAll(ebf, patchi)
+    {
+        if (isA<gradientInternalEnergyFvPatchScalarField>(ebf[patchi]))
+        {
+            refCast<gradientInternalEnergyFvPatchScalarField>(ebf[patchi])
+                .gradient() = ebf[patchi].fvPatchField::snGrad();
+        }
+        else if (isA<mixedInternalEnergyFvPatchScalarField>(ebf[patchi]))
+        {
+            refCast<mixedInternalEnergyFvPatchScalarField>(ebf[patchi])
+                .refGrad() = ebf[patchi].fvPatchField::snGrad();
+        }
+    }
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.H b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
index 30e8aa65a2..da1cf8ea30 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.H
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
@@ -74,6 +74,9 @@ protected:
         wordList hBoundaryTypes();
         void hBoundaryCorrection(volScalarField& h);
 
+        wordList eBoundaryTypes();
+        void eBoundaryCorrection(volScalarField& e);
+
         //- Construct as copy (not implemented)
         basicThermo(const basicThermo&);
 
@@ -107,9 +110,8 @@ public:
         static autoPtr<basicThermo> New(const fvMesh&);
 
 
-    // Destructor
-
-        virtual ~basicThermo();
+    //- Destructor
+    virtual ~basicThermo();
 
 
     // Member functions
@@ -122,13 +124,13 @@ public:
 
             //- Pressure [Pa]
             //  Non-const access allowed for transport equations
-            volScalarField& p()
+            virtual volScalarField& p()
             {
                 return p_;
             }
 
             //- Pressure [Pa]
-            const volScalarField& p() const
+            virtual const volScalarField& p() const
             {
                 return p_;
             }
@@ -193,23 +195,52 @@ public:
                 return volScalarField::null();
             }
 
+            //- Internal energy for cell-set [J/kg]
+            virtual tmp<scalarField> e
+            (
+                const scalarField& T,
+                const labelList& cells
+            ) const
+            {
+                notImplemented
+                (
+                    "basicThermo::e"
+                    "(const scalarField& T, const labelList& cells) const"
+                );
+                return tmp<scalarField>(NULL);
+            }
+
+            //-Internal energy for patch [J/kg]
+            virtual tmp<scalarField> e
+            (
+                const scalarField& T,
+                const label patchi
+            ) const
+            {
+                notImplemented
+                (
+                    "basicThermo::e"
+                    "(const scalarField& T, const label patchi) const"
+                );
+                return tmp<scalarField>(NULL);
+            }
 
         // Fields derived from thermodynamic state variables
 
             //- Temperature [K]
-            const volScalarField& T() const
+            virtual const volScalarField& T() const
             {
                 return T_;
             }
 
             //- Density [kg/m^3]
-            tmp<volScalarField> rho() const
+            virtual tmp<volScalarField> rho() const
             {
                 return p_*psi();
             }
 
             //- Compressibility [s^2/m^2]
-            const volScalarField& psi() const
+            virtual const volScalarField& psi() const
             {
                 return psi_;
             }
@@ -236,6 +267,21 @@ public:
                 return volScalarField::null();
             }
 
+            //- Heat capacity at constant volume for patch [J/kg/K]
+            virtual tmp<scalarField> Cv
+            (
+                const scalarField& T,
+                const label patchi
+            ) const
+            {
+                notImplemented
+                (
+                    "basicThermo::Cv"
+                    "(const scalarField& T, const label patchi) const"
+                );
+                return tmp<scalarField>(NULL);
+            }
+
             //- Heat capacity at constant volume [J/kg/K]
             virtual tmp<volScalarField> Cv() const
             {
@@ -247,13 +293,13 @@ public:
         // Access to transport state variables
 
             //- Dynamic viscosity of mixture [kg/ms]
-            const volScalarField& mu() const
+            virtual const volScalarField& mu() const
             {
                 return mu_;
             }
 
             //- Thermal diffusivity for enthalpy of mixture [kg/ms]
-            const volScalarField& alpha() const
+            virtual const volScalarField& alpha() const
             {
                 return alpha_;
             }
diff --git a/src/thermophysicalModels/basic/basicThermo/makeBasicThermo.H b/src/thermophysicalModels/basic/basicThermo/makeBasicThermo.H
index e37bfc7b05..13a1bb853c 100644
--- a/src/thermophysicalModels/basic/basicThermo/makeBasicThermo.H
+++ b/src/thermophysicalModels/basic/basicThermo/makeBasicThermo.H
@@ -38,13 +38,6 @@ Description
 
 #define makeBasicThermo(Cthermo,Mixture,Transport,Thermo,EqnOfState)          \
                                                                               \
-typedef Mixture<Transport<specieThermo<Thermo<EqnOfState> > > >               \
-    Mixture##Transport##Thermo##EqnOfState;                                   \
-                                                                              \
-defineTemplateTypeNameAndDebugWithName                                        \
-    (Mixture##Transport##Thermo##EqnOfState,                                  \
-    #Mixture"<"#Transport"<specieThermo<"#Thermo"<"#EqnOfState">>>>", 0)      \
-                                                                              \
 typedef Cthermo<Mixture<Transport<specieThermo<Thermo<EqnOfState> > > > >     \
     Cthermo##Mixture##Transport##Thermo##EqnOfState;                          \
                                                                               \
@@ -60,7 +53,6 @@ addToRunTimeSelectionTable                                                    \
     fvMesh                                                                    \
 )
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.C
new file mode 100644
index 0000000000..1ad0a1c0d5
--- /dev/null
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.C
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "fixedInternalEnergyFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "basicThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(p, iF)
+{}
+
+
+fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField
+(
+    const fixedInternalEnergyFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper)
+{}
+
+
+fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchScalarField(p, iF, dict)
+{}
+
+
+fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField
+(
+    const fixedInternalEnergyFvPatchScalarField& tppsf
+)
+:
+    fixedValueFvPatchScalarField(tppsf)
+{}
+
+
+fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField
+(
+    const fixedInternalEnergyFvPatchScalarField& tppsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(tppsf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void fixedInternalEnergyFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    const basicThermo& thermo = db().lookupObject<basicThermo>
+    (
+        "thermophysicalProperties"
+    );
+    
+    const label patchi = patch().index();
+
+    fvPatchScalarField& Tw = 
+        const_cast<fvPatchScalarField&>(thermo.T().boundaryField()[patchi]);
+    Tw.evaluate();
+    operator==(thermo.e(Tw, patchi));
+
+    fixedValueFvPatchScalarField::updateCoeffs();
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField(fvPatchScalarField, fixedInternalEnergyFvPatchScalarField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.H
new file mode 100644
index 0000000000..ae335ed2ef
--- /dev/null
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.H
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::fixedInternalEnergyFvPatchScalarField
+
+Description
+    A fixed boundary condition for internal energy
+
+SourceFiles
+    fixedInternalEnergyFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fixedInternalEnergyFvPatchScalarField_H
+#define fixedInternalEnergyFvPatchScalarField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                Class fixedInternalEnergyFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class fixedInternalEnergyFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("fixedInternalEnergy");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        fixedInternalEnergyFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        fixedInternalEnergyFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given fixedInternalEnergyFvPatchScalarField
+        // onto a new patch
+        fixedInternalEnergyFvPatchScalarField
+        (
+            const fixedInternalEnergyFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        fixedInternalEnergyFvPatchScalarField
+        (
+            const fixedInternalEnergyFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new fixedInternalEnergyFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        fixedInternalEnergyFvPatchScalarField
+        (
+            const fixedInternalEnergyFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new fixedInternalEnergyFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.C
new file mode 100644
index 0000000000..0479eed1e8
--- /dev/null
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.C
@@ -0,0 +1,132 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "gradientInternalEnergyFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "basicThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedGradientFvPatchScalarField(p, iF)
+{}
+
+
+gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
+(
+    const gradientInternalEnergyFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedGradientFvPatchScalarField(ptf, p, iF, mapper)
+{}
+
+
+gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedGradientFvPatchScalarField(p, iF, dict)
+{}
+
+
+gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
+(
+    const gradientInternalEnergyFvPatchScalarField& tppsf
+)
+:
+    fixedGradientFvPatchScalarField(tppsf)
+{}
+
+
+gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
+(
+    const gradientInternalEnergyFvPatchScalarField& tppsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedGradientFvPatchScalarField(tppsf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void gradientInternalEnergyFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    const basicThermo& thermo = db().lookupObject<basicThermo>
+    (
+        "thermophysicalProperties"
+    );
+    
+    const label patchi = patch().index();
+
+    fvPatchScalarField& Tw = 
+        const_cast<fvPatchScalarField&>(thermo.T().boundaryField()[patchi]);
+
+    Tw.evaluate();
+
+    gradient() = thermo.Cv(Tw, patchi)*Tw.snGrad()
+      + patch().deltaCoeffs()*
+        (
+            thermo.e(Tw, patchi)
+          - thermo.e(Tw, patch().faceCells())
+        );
+
+    fixedGradientFvPatchScalarField::updateCoeffs();
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField(fvPatchScalarField, gradientInternalEnergyFvPatchScalarField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.H
new file mode 100644
index 0000000000..562a7aa0c3
--- /dev/null
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.H
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::gradientInternalEnergyFvPatchScalarField
+
+Description
+    Gradient boundary condition for internal energy
+
+SourceFiles
+    gradientInternalEnergyFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef gradientInternalEnergyFvPatchScalarField_H
+#define gradientInternalEnergyFvPatchScalarField_H
+
+#include "fixedGradientFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+               Class gradientInternalEnergyFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class gradientInternalEnergyFvPatchScalarField
+:
+    public fixedGradientFvPatchScalarField
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("gradientInternalEnergy");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        gradientInternalEnergyFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        gradientInternalEnergyFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given gradientInternalEnergyFvPatchScalarField
+        // onto a new patch
+        gradientInternalEnergyFvPatchScalarField
+        (
+            const gradientInternalEnergyFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        gradientInternalEnergyFvPatchScalarField
+        (
+            const gradientInternalEnergyFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new gradientInternalEnergyFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        gradientInternalEnergyFvPatchScalarField
+        (
+            const gradientInternalEnergyFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new gradientInternalEnergyFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C
new file mode 100644
index 0000000000..83f80b6890
--- /dev/null
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "mixedInternalEnergyFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "basicThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mixedFvPatchScalarField(p, iF)
+{
+    valueFraction() = 0.0;
+    refValue() = 0.0;
+    refGrad() = 0.0;
+}
+
+
+mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField
+(
+    const mixedInternalEnergyFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchScalarField(ptf, p, iF, mapper)
+{}
+
+
+mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    mixedFvPatchScalarField(p, iF, dict)
+{}
+
+
+mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField
+(
+    const mixedInternalEnergyFvPatchScalarField& tppsf
+)
+:
+    mixedFvPatchScalarField(tppsf)
+{}
+
+
+mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField
+(
+    const mixedInternalEnergyFvPatchScalarField& tppsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mixedFvPatchScalarField(tppsf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void mixedInternalEnergyFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    const basicThermo& thermo = db().lookupObject<basicThermo>
+    (
+        "thermophysicalProperties"
+    );
+    
+    const label patchi = patch().index();
+
+    mixedFvPatchScalarField& Tw = refCast<mixedFvPatchScalarField>
+    (
+        const_cast<fvPatchScalarField&>(thermo.T().boundaryField()[patchi])
+    );
+
+    Tw.evaluate();
+
+    valueFraction() = Tw.valueFraction();
+    refValue() = thermo.e(Tw.refValue(), patchi);
+    refGrad() = thermo.Cv(Tw, patchi)*Tw.refGrad()
+      + patch().deltaCoeffs()*
+        (
+            thermo.e(Tw, patchi)
+          - thermo.e(Tw, patch().faceCells())
+        );
+
+    mixedFvPatchScalarField::updateCoeffs();
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField(fvPatchScalarField, mixedInternalEnergyFvPatchScalarField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.H
new file mode 100644
index 0000000000..ac6661d609
--- /dev/null
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.H
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::mixedInternalEnergyFvPatchScalarField
+
+Description
+    Mixed boundary conditions for internal energy
+
+SourceFiles
+    mixedInternalEnergyFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef mixedInternalEnergyFvPatchScalarField_H
+#define mixedInternalEnergyFvPatchScalarField_H
+
+#include "mixedFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+               Class mixedInternalEnergyFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class mixedInternalEnergyFvPatchScalarField
+:
+    public mixedFvPatchScalarField
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("mixedInternalEnergy");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        mixedInternalEnergyFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        mixedInternalEnergyFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given mixedInternalEnergyFvPatchScalarField
+        // onto a new patch
+        mixedInternalEnergyFvPatchScalarField
+        (
+            const mixedInternalEnergyFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        mixedInternalEnergyFvPatchScalarField
+        (
+            const mixedInternalEnergyFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new mixedInternalEnergyFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        mixedInternalEnergyFvPatchScalarField
+        (
+            const mixedInternalEnergyFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new mixedInternalEnergyFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/eThermo/eThermo.C b/src/thermophysicalModels/basic/eThermo/eThermo.C
new file mode 100644
index 0000000000..b4629a1d15
--- /dev/null
+++ b/src/thermophysicalModels/basic/eThermo/eThermo.C
@@ -0,0 +1,343 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "eThermo.H"
+#include "fvMesh.H"
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::eThermo<MixtureType>::eThermo(const fvMesh& mesh)
+:
+    basicThermo(mesh),
+    MixtureType(*this, mesh),
+
+    e_
+    (
+        IOobject
+        (
+            "e",
+            mesh.time().timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh,
+        dimensionSet(0, 2, -2, 0, 0),
+        eBoundaryTypes()
+    )
+{
+    scalarField& eCells = e_.internalField();
+    const scalarField& TCells = T_.internalField();
+
+    forAll(eCells, celli)
+    {
+        eCells[celli] = this->cellMixture(celli).E(TCells[celli]);
+    }
+
+    forAll(e_.boundaryField(), patchi)
+    {
+        e_.boundaryField()[patchi] == e(T_.boundaryField()[patchi], patchi);
+    }
+
+    eBoundaryCorrection(e_);
+
+    calculate();
+    psi_.oldTime();   // Switch on saving old time
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::eThermo<MixtureType>::~eThermo()
+{}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class MixtureType>
+void Foam::eThermo<MixtureType>::calculate()
+{
+    const scalarField& eCells = e_.internalField();
+    const scalarField& pCells = p_.internalField();
+
+    scalarField& TCells = T_.internalField();
+    scalarField& psiCells = psi_.internalField();
+    scalarField& muCells = mu_.internalField();
+    scalarField& alphaCells = alpha_.internalField();
+
+    forAll(TCells, celli)
+    {
+        const typename MixtureType::thermoType& mixture_ =
+            this->cellMixture(celli);
+
+        TCells[celli] = mixture_.TE(eCells[celli], TCells[celli]);
+        psiCells[celli] = mixture_.psi(pCells[celli], TCells[celli]);
+
+        muCells[celli] = mixture_.mu(TCells[celli]);
+        alphaCells[celli] = mixture_.alpha(TCells[celli]);
+    }
+
+    forAll(T_.boundaryField(), patchi)
+    {
+        fvPatchScalarField& pp = p_.boundaryField()[patchi];
+        fvPatchScalarField& pT = T_.boundaryField()[patchi];
+        fvPatchScalarField& ppsi = psi_.boundaryField()[patchi];
+
+        fvPatchScalarField& pe = e_.boundaryField()[patchi];
+
+        fvPatchScalarField& pmu = mu_.boundaryField()[patchi];
+        fvPatchScalarField& palpha = alpha_.boundaryField()[patchi];
+
+        if (pT.fixesValue())
+        {
+            forAll(pT, facei)
+            {
+                const typename MixtureType::thermoType& mixture_ =
+                    this->patchFaceMixture(patchi, facei);
+
+                pe[facei] = mixture_.E(pT[facei]);
+
+                ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
+                pmu[facei] = mixture_.mu(pT[facei]);
+                palpha[facei] = mixture_.alpha(pT[facei]);
+            }
+        }
+        else
+        {
+            forAll(pT, facei)
+            {
+                const typename MixtureType::thermoType& mixture_ =
+                    this->patchFaceMixture(patchi, facei);
+
+                pT[facei] = mixture_.TE(pe[facei], pT[facei]);
+
+                ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
+                pmu[facei] = mixture_.mu(pT[facei]);
+                palpha[facei] = mixture_.alpha(pT[facei]);
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class MixtureType>
+void Foam::eThermo<MixtureType>::correct()
+{
+    if (debug)
+    {
+        Info<< "entering eThermo<MixtureType>::correct()" << endl;
+    }
+
+    // force the saving of the old-time values
+    psi_.oldTime();
+
+    calculate();
+
+    if (debug)
+    {
+        Info<< "exiting eThermo<MixtureType>::correct()" << endl;
+    }
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::eThermo<MixtureType>::e
+(
+    const scalarField& T,
+    const labelList& cells
+) const
+{
+    tmp<scalarField> te(new scalarField(T.size()));
+    scalarField& h = te();
+
+    forAll(T, celli)
+    {
+        h[celli] = this->cellMixture(cells[celli]).E(T[celli]);
+    }
+
+    return te;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::eThermo<MixtureType>::e
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> te(new scalarField(T.size()));
+    scalarField& h = te();
+
+    forAll(T, facei)
+    {
+        h[facei] = this->patchFaceMixture(patchi, facei).E(T[facei]);
+    }
+
+    return te;
+}
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::eThermo<MixtureType>::Cp
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> tCp(new scalarField(T.size()));
+    scalarField& cp = tCp();
+
+    forAll(T, facei)
+    {
+        cp[facei] = this->patchFaceMixture(patchi, facei).Cp(T[facei]);
+    }
+
+    return tCp;
+}
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField> Foam::eThermo<MixtureType>::Cp() const
+{
+    const fvMesh& mesh = T_.mesh();
+
+    tmp<volScalarField> tCp
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "Cp",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            dimensionSet(0, 2, -2, -1, 0),
+            T_.boundaryField().types()
+        )
+    );
+
+    volScalarField& cp = tCp();
+
+    forAll(T_, celli)
+    {
+        cp[celli] = this->cellMixture(celli).Cp(T_[celli]);
+    }
+
+    forAll(T_.boundaryField(), patchi)
+    {
+        const fvPatchScalarField& pT = T_.boundaryField()[patchi];
+        fvPatchScalarField& pCp = cp.boundaryField()[patchi];
+
+        forAll(pT, facei)
+        {
+            pCp[facei] = this->patchFaceMixture(patchi, facei).Cp(pT[facei]);
+        }
+    }
+
+    return tCp;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::eThermo<MixtureType>::Cv
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> tCv(new scalarField(T.size()));
+    scalarField& cv = tCv();
+
+    forAll(T, facei)
+    {
+        cv[facei] = this->patchFaceMixture(patchi, facei).Cv(T[facei]);
+    }
+
+    return tCv;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField> Foam::eThermo<MixtureType>::Cv() const
+{
+    const fvMesh& mesh = T_.mesh();
+
+    tmp<volScalarField> tCv
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "Cv",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            dimensionSet(0, 2, -2, -1, 0)
+        )
+    );
+
+    volScalarField& cv = tCv();
+
+    forAll(T_, celli)
+    {
+        cv[celli] = this->cellMixture(celli).Cv(T_[celli]);
+    }
+
+    forAll(T_.boundaryField(), patchi)
+    {
+        cv.boundaryField()[patchi] = Cv(T_.boundaryField()[patchi], patchi);
+    }
+
+    return tCv;
+}
+
+
+template<class MixtureType>
+bool Foam::eThermo<MixtureType>::read()
+{
+    if (basicThermo::read())
+    {
+        MixtureType::read(*this);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/eThermo/eThermo.H b/src/thermophysicalModels/basic/eThermo/eThermo.H
new file mode 100644
index 0000000000..3071d6150d
--- /dev/null
+++ b/src/thermophysicalModels/basic/eThermo/eThermo.H
@@ -0,0 +1,176 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::eThermo
+
+Description
+    Internal energy for a mixture
+
+SourceFiles
+    eThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef eThermo_H
+#define eThermo_H
+
+#include "basicThermo.H"
+#include "basicMixture.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class eThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class MixtureType>
+class eThermo
+:
+    public basicThermo,
+    public MixtureType
+{
+    // Private data
+
+        volScalarField e_;
+
+
+    // Private member functions
+
+        void calculate();
+
+        //- Construct as copy (not implemented)
+        eThermo(const eThermo<MixtureType>&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("eThermo");
+
+
+    // Constructors
+
+        //- Construct from mese
+        eThermo(const fvMesh&);
+
+
+    //- Destructor
+    virtual ~eThermo();
+
+
+    // Member functions
+
+        //- Return the compostion of the combustion mixture
+        virtual basicMixture& composition()
+        {
+            return *this;
+        }
+
+        //- Return the compostion of the combustion mixture
+        virtual const basicMixture& composition() const
+        {
+            return *this;
+        }
+
+        //- Update properties
+        virtual void correct();
+
+
+        // Access to thermodynamic state variables
+
+            //- Internal energy [J/kg]
+            //  Non-const access allowed for transport equations
+            virtual volScalarField& e()
+            {
+                return e_;
+            }
+
+            //- Internal energy [J/kg]
+            virtual const volScalarField& e() const
+            {
+                return e_;
+            }
+
+
+        // Fields derived from thermodynamic state variables
+
+            //- Internal energy for cell-set [J/kg]
+            virtual tmp<scalarField> e
+            (
+                const scalarField& T,
+                const labelList& cells
+            ) const;
+
+            //- Internal energy for patch [J/kg]
+            virtual tmp<scalarField> e
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant pressure for patch [J/kg/K]
+            virtual tmp<scalarField> Cp
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant pressure [J/kg/K]
+            virtual tmp<volScalarField> Cp() const;
+
+            //- Heat capacity at constant volume for patch [J/kg/K]
+            virtual tmp<scalarField> Cv
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant volume [J/kg/K]
+            virtual tmp<volScalarField> Cv() const;
+
+
+        //- Read thermophysicalProperties dictionary
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+#ifdef NoRepository
+#   include "eThermo.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/eThermo/eThermos.C b/src/thermophysicalModels/basic/eThermo/eThermos.C
new file mode 100644
index 0000000000..fa4f0d220a
--- /dev/null
+++ b/src/thermophysicalModels/basic/eThermo/eThermos.C
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Description
+    Selection function for internal energy based thermodynamics package.
+
+\*---------------------------------------------------------------------------*/
+
+#include "error.H"
+
+#include "basicThermo.H"
+#include "makeBasicThermo.H"
+
+#include "perfectGas.H"
+
+#include "hConstThermo.H"
+#include "janafThermo.H"
+#include "specieThermo.H"
+
+#include "constTransport.H"
+#include "sutherlandTransport.H"
+
+#include "eThermo.H"
+#include "pureMixture.H"
+
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
+
+
+makeBasicThermo
+(
+    eThermo,
+    pureMixture,
+    constTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicThermo
+(
+    eThermo,
+    pureMixture,
+    sutherlandTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicThermo
+(
+    eThermo,
+    pureMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/hThermo/hThermo.C b/src/thermophysicalModels/basic/hThermo/hThermo.C
index 7e32f7a063..988a790ce4 100644
--- a/src/thermophysicalModels/basic/hThermo/hThermo.C
+++ b/src/thermophysicalModels/basic/hThermo/hThermo.C
@@ -205,7 +205,6 @@ Foam::tmp<Foam::scalarField> Foam::hThermo<MixtureType>::h
     return th;
 }
 
-
 template<class MixtureType>
 Foam::tmp<Foam::scalarField> Foam::hThermo<MixtureType>::Cp
 (
@@ -224,7 +223,6 @@ Foam::tmp<Foam::scalarField> Foam::hThermo<MixtureType>::Cp
     return tCp;
 }
 
-
 template<class MixtureType>
 Foam::tmp<Foam::volScalarField> Foam::hThermo<MixtureType>::Cp() const
 {
@@ -243,7 +241,8 @@ Foam::tmp<Foam::volScalarField> Foam::hThermo<MixtureType>::Cp() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0)
+            dimensionSet(0, 2, -2, -1, 0),
+            T_.boundaryField().types()
         )
     );
 
@@ -256,13 +255,38 @@ Foam::tmp<Foam::volScalarField> Foam::hThermo<MixtureType>::Cp() const
 
     forAll(T_.boundaryField(), patchi)
     {
-        cp.boundaryField()[patchi] = Cp(T_.boundaryField()[patchi], patchi);
+        const fvPatchScalarField& pT = T_.boundaryField()[patchi];
+        fvPatchScalarField& pCp = cp.boundaryField()[patchi];
+
+        forAll(pT, facei)
+        {
+            pCp[facei] = this->patchFaceMixture(patchi, facei).Cp(pT[facei]);
+        }
     }
 
     return tCp;
 }
 
 
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::hThermo<MixtureType>::Cv
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> tCv(new scalarField(T.size()));
+    scalarField& cv = tCv();
+
+    forAll(T, facei)
+    {
+        cv[facei] = this->patchFaceMixture(patchi, facei).Cv(T[facei]);
+    }
+
+    return tCv;
+}
+
+
 template<class MixtureType>
 Foam::tmp<Foam::volScalarField> Foam::hThermo<MixtureType>::Cv() const
 {
@@ -281,8 +305,7 @@ Foam::tmp<Foam::volScalarField> Foam::hThermo<MixtureType>::Cv() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0),
-            T_.boundaryField().types()
+            dimensionSet(0, 2, -2, -1, 0)
         )
     );
 
@@ -295,19 +318,12 @@ Foam::tmp<Foam::volScalarField> Foam::hThermo<MixtureType>::Cv() const
 
     forAll(T_.boundaryField(), patchi)
     {
-        const fvPatchScalarField& pT = T_.boundaryField()[patchi];
-        fvPatchScalarField& pCv = cv.boundaryField()[patchi];
-
-        forAll(pT, facei)
-        {
-            pCv[facei] = this->patchFaceMixture(patchi, facei).Cv(pT[facei]);
-        }
+        cv.boundaryField()[patchi] = Cv(T_.boundaryField()[patchi], patchi);
     }
 
     return tCv;
 }
 
-
 template<class MixtureType>
 bool Foam::hThermo<MixtureType>::read()
 {
diff --git a/src/thermophysicalModels/basic/hThermo/hThermo.H b/src/thermophysicalModels/basic/hThermo/hThermo.H
index b7effc7f70..6ed34db0b8 100644
--- a/src/thermophysicalModels/basic/hThermo/hThermo.H
+++ b/src/thermophysicalModels/basic/hThermo/hThermo.H
@@ -79,40 +79,39 @@ public:
         hThermo(const fvMesh&);
 
 
-    // Destructor
-
-        ~hThermo();
+    //- Destructor
+    virtual ~hThermo();
 
 
     // Member functions
 
         //- Return the compostion of the combustion mixture
-        basicMixture& composition()
+        virtual basicMixture& composition()
         {
             return *this;
         }
 
         //- Return the compostion of the combustion mixture
-        const basicMixture& composition() const
+        virtual const basicMixture& composition() const
         {
             return *this;
         }
 
         //- Update properties
-        void correct();
+        virtual void correct();
 
 
         // Access to thermodynamic state variables
 
             //- Enthalpy [J/kg]
             //  Non-const access allowed for transport equations
-            volScalarField& h()
+            virtual volScalarField& h()
             {
                 return h_;
             }
 
             //- Enthalpy [J/kg]
-            const volScalarField& h() const
+            virtual const volScalarField& h() const
             {
                 return h_;
             }
@@ -121,31 +120,42 @@ public:
         // Fields derived from thermodynamic state variables
 
             //- Enthalpy for cell-set [J/kg]
-            tmp<scalarField> h
+            virtual tmp<scalarField> h
             (
                 const scalarField& T,
                 const labelList& cells
             ) const;
 
             //- Enthalpy for patch [J/kg]
-            tmp<scalarField> h
+            virtual tmp<scalarField> h
             (
                 const scalarField& T,
                 const label patchi
             ) const;
 
             //- Heat capacity at constant pressure for patch [J/kg/K]
-            tmp<scalarField> Cp(const scalarField& T, const label patchi) const;
+            virtual tmp<scalarField> Cp
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
 
             //- Heat capacity at constant pressure [J/kg/K]
-            tmp<volScalarField> Cp() const;
+            virtual tmp<volScalarField> Cp() const;
+
+            //- Heat capacity at constant volume for patch [J/kg/K]
+            virtual tmp<scalarField> Cv
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
 
             //- Heat capacity at constant volume [J/kg/K]
-            tmp<volScalarField> Cv() const;
+            virtual tmp<volScalarField> Cv() const;
 
 
         //- Read thermophysicalProperties dictionary
-        bool read();
+        virtual bool read();
 };
 
 
diff --git a/src/thermophysicalModels/basic/hThermo/hThermos.C b/src/thermophysicalModels/basic/hThermo/hThermos.C
new file mode 100644
index 0000000000..6b144725c0
--- /dev/null
+++ b/src/thermophysicalModels/basic/hThermo/hThermos.C
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Description
+    Selection function for internal energy based thermodynamics package.
+
+\*---------------------------------------------------------------------------*/
+
+#include "error.H"
+
+#include "basicThermo.H"
+#include "makeBasicThermo.H"
+
+#include "perfectGas.H"
+
+#include "hConstThermo.H"
+#include "janafThermo.H"
+#include "specieThermo.H"
+
+#include "constTransport.H"
+#include "sutherlandTransport.H"
+
+#include "hThermo.H"
+#include "pureMixture.H"
+
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
+
+
+makeBasicThermo
+(
+    hThermo,
+    pureMixture,
+    constTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicThermo
+(
+    hThermo,
+    pureMixture,
+    sutherlandTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicThermo
+(
+    hThermo,
+    pureMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C
new file mode 100644
index 0000000000..8efab94648
--- /dev/null
+++ b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Description
+    Selection function for internal energy based thermodynamics package.
+
+\*---------------------------------------------------------------------------*/
+
+#include "error.H"
+
+#include "basicMixture.H"
+#include "makeBasicMixture.H"
+
+#include "perfectGas.H"
+
+#include "hConstThermo.H"
+#include "janafThermo.H"
+#include "specieThermo.H"
+
+#include "constTransport.H"
+#include "sutherlandTransport.H"
+
+#include "pureMixture.H"
+
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
+
+makeBasicMixture
+(
+    pureMixture,
+    constTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicMixture
+(
+    pureMixture,
+    sutherlandTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicMixture
+(
+    pureMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/mixtures/basicMixture/makeBasicMixture.H b/src/thermophysicalModels/basic/mixtures/basicMixture/makeBasicMixture.H
new file mode 100644
index 0000000000..6214aa0814
--- /dev/null
+++ b/src/thermophysicalModels/basic/mixtures/basicMixture/makeBasicMixture.H
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+InClass
+    Foam::basicMixture
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeBasicMixture_H
+#define makeBasicMixture_H
+
+#include "basicMixture.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeBasicMixture(Mixture,Transport,Thermo,EqnOfState)                 \
+                                                                              \
+typedef Mixture<Transport<specieThermo<Thermo<EqnOfState> > > >               \
+    Mixture##Transport##Thermo##EqnOfState;                                   \
+                                                                              \
+defineTemplateTypeNameAndDebugWithName                                        \
+    (Mixture##Transport##Thermo##EqnOfState,                                  \
+    #Mixture"<"#Transport"<specieThermo<"#Thermo"<"#EqnOfState">>>>", 0)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/hCombustionThermo/hCombustionThermo.H b/src/thermophysicalModels/combustion/hCombustionThermo/hCombustionThermo.H
index c1dd274813..1ba8809838 100644
--- a/src/thermophysicalModels/combustion/hCombustionThermo/hCombustionThermo.H
+++ b/src/thermophysicalModels/combustion/hCombustionThermo/hCombustionThermo.H
@@ -92,9 +92,8 @@ public:
         static autoPtr<hCombustionThermo> New(const fvMesh&);
 
 
-    // Destructor
-
-        virtual ~hCombustionThermo();
+    //- Destructor
+    virtual ~hCombustionThermo();
 
 
     // Member functions
@@ -110,18 +109,24 @@ public:
 
             //- Enthalpy [J/kg]
             //  Non-const access allowed for transport equations
-            volScalarField& h()
+            virtual volScalarField& h()
             {
                 return h_;
             }
 
             //- Enthalpy [J/kg]
-            const volScalarField& h() const
+            virtual const volScalarField& h() const
             {
                 return h_;
             }
 
 
+        //- Sensible enthalpy [J/kg]
+        virtual tmp<volScalarField> hs() const = 0;
+
+        //- Chemical enthalpy [J/kg]
+        virtual tmp<volScalarField> hc() const = 0;
+
         //- Update properties
         virtual void correct() = 0;
 };
diff --git a/src/thermophysicalModels/combustion/hhuCombustionThermo/hhuCombustionThermo.H b/src/thermophysicalModels/combustion/hhuCombustionThermo/hhuCombustionThermo.H
index ffc9f27f5a..0f235d5dd7 100644
--- a/src/thermophysicalModels/combustion/hhuCombustionThermo/hhuCombustionThermo.H
+++ b/src/thermophysicalModels/combustion/hhuCombustionThermo/hhuCombustionThermo.H
@@ -96,9 +96,8 @@ public:
         static autoPtr<hhuCombustionThermo> New(const fvMesh&);
 
 
-    // Destructor
-
-        virtual ~hhuCombustionThermo();
+    //- Destructor
+    virtual ~hhuCombustionThermo();
 
 
     // Member functions
@@ -111,13 +110,13 @@ public:
 
             //- Unburnt gas enthalpy [J/kg]
             //  Non-const access allowed for transport equations
-            volScalarField& hu()
+            virtual volScalarField& hu()
             {
                 return hu_;
             }
 
             //- Unburnt gas enthalpy [J/kg]
-            const volScalarField& hu() const
+            virtual const volScalarField& hu() const
             {
                 return hu_;
             }
@@ -140,7 +139,7 @@ public:
             ) const = 0;
 
             //- Unburnt gas temperature [K]
-            const volScalarField& Tu() const
+            virtual const volScalarField& Tu() const
             {
                 return Tu_;
             }
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/hMixtureThermo/hMixtureThermo.C b/src/thermophysicalModels/combustion/mixtureThermos/hMixtureThermo/hMixtureThermo.C
index 064e7c3eba..936973abda 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/hMixtureThermo/hMixtureThermo.C
+++ b/src/thermophysicalModels/combustion/mixtureThermos/hMixtureThermo/hMixtureThermo.C
@@ -134,7 +134,120 @@ void Foam::hMixtureThermo<MixtureType>::calculate()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField> Foam::hMixtureThermo<MixtureType>::h
+void Foam::hMixtureThermo<MixtureType>::correct()
+{
+    if (debug)
+    {
+        Info<< "entering hMixtureThermo<MixtureType>::correct()" << endl;
+    }
+
+    // force the saving of the old-time values
+    psi_.oldTime();
+
+    calculate();
+
+    if (debug)
+    {
+        Info<< "exiting hMixtureThermo<MixtureType>::correct()" << endl;
+    }
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField>
+Foam::hMixtureThermo<MixtureType>::hs() const
+{
+    const fvMesh& mesh = T_.mesh();
+
+    tmp<volScalarField> ths
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "hs",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            h_.dimensions()
+        )
+    );
+
+    volScalarField& hsf = ths();
+    scalarField& hsCells = hsf.internalField();
+    const scalarField& TCells = T_.internalField();
+
+    forAll(TCells, celli)
+    {
+        hsCells[celli] = this->cellMixture(celli).Hs(TCells[celli]);
+    }
+
+    forAll(T_.boundaryField(), patchi)
+    {
+        scalarField& hsp = hsf.boundaryField()[patchi];
+        const scalarField& Tp = T_.boundaryField()[patchi];
+
+        forAll(Tp, facei)
+        {
+            hsp[facei] = this->patchFaceMixture(patchi, facei).Hs(Tp[facei]);
+        }
+    }
+
+    return ths;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField>
+Foam::hMixtureThermo<MixtureType>::hc() const
+{
+    const fvMesh& mesh = T_.mesh();
+
+    tmp<volScalarField> thc
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "hc",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            h_.dimensions()
+        )
+    );
+
+    volScalarField& hcf = thc();
+    scalarField& hcCells = hcf.internalField();
+
+    forAll(hcCells, celli)
+    {
+        hcCells[celli] = this->cellMixture(celli).Hc();
+    }
+
+    forAll(hcf.boundaryField(), patchi)
+    {
+        scalarField& hcp = hcf.boundaryField()[patchi];
+
+        forAll(hcp, facei)
+        {
+            hcp[facei] = this->patchFaceMixture(patchi, facei).Hc();
+        }
+    }
+
+    return thc;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField>
+Foam::hMixtureThermo<MixtureType>::h
 (
     const scalarField& T,
     const labelList& cells
@@ -153,7 +266,8 @@ Foam::tmp<Foam::scalarField> Foam::hMixtureThermo<MixtureType>::h
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField> Foam::hMixtureThermo<MixtureType>::h
+Foam::tmp<Foam::scalarField>
+Foam::hMixtureThermo<MixtureType>::h
 (
     const scalarField& T,
     const label patchi
@@ -172,7 +286,8 @@ Foam::tmp<Foam::scalarField> Foam::hMixtureThermo<MixtureType>::h
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField> Foam::hMixtureThermo<MixtureType>::Cp
+Foam::tmp<Foam::scalarField>
+Foam::hMixtureThermo<MixtureType>::Cp
 (
     const scalarField& T,
     const label patchi
@@ -192,7 +307,8 @@ Foam::tmp<Foam::scalarField> Foam::hMixtureThermo<MixtureType>::Cp
 
 
 template<class MixtureType>
-Foam::tmp<Foam::volScalarField> Foam::hMixtureThermo<MixtureType>::Cp() const
+Foam::tmp<Foam::volScalarField>
+Foam::hMixtureThermo<MixtureType>::Cp() const
 {
     const fvMesh& mesh = T_.mesh();
 
@@ -215,9 +331,12 @@ Foam::tmp<Foam::volScalarField> Foam::hMixtureThermo<MixtureType>::Cp() const
 
     volScalarField& cp = tCp();
 
-    forAll(T_, celli)
+    scalarField& cpCells = cp.internalField();
+    const scalarField& TCells = T_.internalField();
+
+    forAll(TCells, celli)
     {
-        cp[celli] = this->cellMixture(celli).Cp(T_[celli]);
+        cpCells[celli] = this->cellMixture(celli).Cp(TCells[celli]);
     }
 
     forAll(T_.boundaryField(), patchi)
@@ -229,26 +348,6 @@ Foam::tmp<Foam::volScalarField> Foam::hMixtureThermo<MixtureType>::Cp() const
 }
 
 
-template<class MixtureType>
-void Foam::hMixtureThermo<MixtureType>::correct()
-{
-    if (debug)
-    {
-        Info<< "entering hMixtureThermo<MixtureType>::correct()" << endl;
-    }
-
-    // force the saving of the old-time values
-    psi_.oldTime();
-
-    calculate();
-
-    if (debug)
-    {
-        Info<< "exiting hMixtureThermo<MixtureType>::correct()" << endl;
-    }
-}
-
-
 template<class MixtureType>
 bool Foam::hMixtureThermo<MixtureType>::read()
 {
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/hMixtureThermo/hMixtureThermo.H b/src/thermophysicalModels/combustion/mixtureThermos/hMixtureThermo/hMixtureThermo.H
index 2436ff833d..e1b231bac2 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/hMixtureThermo/hMixtureThermo.H
+++ b/src/thermophysicalModels/combustion/mixtureThermos/hMixtureThermo/hMixtureThermo.H
@@ -73,21 +73,20 @@ public:
         hMixtureThermo(const fvMesh&);
 
 
-    // Destructor
-
-        virtual ~hMixtureThermo();
+    //- Destructor
+    virtual ~hMixtureThermo();
 
 
     // Member functions
 
         //- Return the compostion of the combustion mixture
-        combustionMixture& composition()
+        virtual combustionMixture& composition()
         {
             return *this;
         }
 
         //- Return the compostion of the combustion mixture
-        const combustionMixture& composition() const
+        virtual const combustionMixture& composition() const
         {
             return *this;
         }
@@ -95,28 +94,37 @@ public:
         //- Update properties
         virtual void correct();
 
+        //- Sensible enthalpy [J/kg]
+        virtual tmp<volScalarField> hs() const;
+
+        //- Chemical enthalpy [J/kg]
+        virtual tmp<volScalarField> hc() const;
 
         // Fields derived from thermodynamic state variables
 
             //- Enthalpy for cell-set [J/kg]
-            tmp<scalarField> h
+            virtual tmp<scalarField> h
             (
                 const scalarField& T,
                 const labelList& cells
             ) const;
 
             //- Enthalpy for patch [J/kg]
-            tmp<scalarField> h
+            virtual tmp<scalarField> h
             (
                 const scalarField& T,
                 const label patchi
             ) const;
 
             //- Heat capacity at constant pressure for patch [J/kg/K]
-            tmp<scalarField> Cp(const scalarField& T, const label patchi) const;
+            virtual tmp<scalarField> Cp
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
 
             //- Heat capacity at constant pressure [J/kg/K]
-            tmp<volScalarField> Cp() const;
+            virtual tmp<volScalarField> Cp() const;
 
 
         //- Read thermophysicalProperties dictionary
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C b/src/thermophysicalModels/combustion/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C
index 0086e8cd14..694d2e3b60 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C
+++ b/src/thermophysicalModels/combustion/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C
@@ -173,6 +173,100 @@ void Foam::hhuMixtureThermo<MixtureType>::correct()
     }
 }
 
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField>
+Foam::hhuMixtureThermo<MixtureType>::hs() const
+{
+    const fvMesh& mesh = T_.mesh();
+
+    tmp<volScalarField> ths
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "hs",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            h_.dimensions()
+        )
+    );
+
+    volScalarField& hsf = ths();
+
+    scalarField& hsCells = hsf.internalField();
+    const scalarField& TCells = T_.internalField();
+
+    forAll(TCells, celli)
+    {
+        hsCells[celli] = this->cellMixture(celli).Hs(TCells[celli]);
+    }
+
+    forAll(T_.boundaryField(), patchi)
+    {
+        scalarField& hsp = hsf.boundaryField()[patchi];
+        const scalarField& Tp = T_.boundaryField()[patchi];
+
+        forAll(Tp, facei)
+        {
+            hsp[facei] = this->patchFaceMixture(patchi, facei).Hs(Tp[facei]);
+        }
+    }
+
+    return ths;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField>
+Foam::hhuMixtureThermo<MixtureType>::hc() const
+{
+    const fvMesh& mesh = T_.mesh();
+
+    tmp<volScalarField> thc
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "hc",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            h_.dimensions()
+        )
+    );
+
+    volScalarField& hcf = thc();
+    scalarField& hcCells = hcf.internalField();
+
+    forAll(hcCells, celli)
+    {
+        hcCells[celli] = this->cellMixture(celli).Hc();
+    }
+
+    forAll(hcf.boundaryField(), patchi)
+    {
+        scalarField& hcp = hcf.boundaryField()[patchi];
+
+        forAll(hcp, facei)
+        {
+            hcp[facei] = this->patchFaceMixture(patchi, facei).Hc();
+        }
+    }
+
+    return thc;
+}
+
+
 template<class MixtureType>
 Foam::tmp<Foam::scalarField> Foam::hhuMixtureThermo<MixtureType>::h
 (
@@ -232,7 +326,8 @@ Foam::tmp<Foam::scalarField> Foam::hhuMixtureThermo<MixtureType>::Cp
 
 
 template<class MixtureType>
-Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::Cp() const
+Foam::tmp<Foam::volScalarField>
+Foam::hhuMixtureThermo<MixtureType>::Cp() const
 {
     const fvMesh& mesh = T_.mesh();
 
@@ -254,10 +349,12 @@ Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::Cp() const
     );
 
     volScalarField& cp = tCp();
+    scalarField& cpCells = cp.internalField();
+    const scalarField& TCells = T_.internalField();
 
-    forAll(T_, celli)
+    forAll(TCells, celli)
     {
-        cp[celli] = this->cellMixture(celli).Cp(T_[celli]);
+        cpCells[celli] = this->cellMixture(celli).Cp(TCells[celli]);
     }
 
     forAll(T_.boundaryField(), patchi)
@@ -269,9 +366,9 @@ Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::Cp() const
 }
 
 
-
 template<class MixtureType>
-Foam::tmp<Foam::scalarField> Foam::hhuMixtureThermo<MixtureType>::hu
+Foam::tmp<Foam::scalarField>
+Foam::hhuMixtureThermo<MixtureType>::hu
 (
     const scalarField& Tu,
     const labelList& cells
@@ -290,7 +387,8 @@ Foam::tmp<Foam::scalarField> Foam::hhuMixtureThermo<MixtureType>::hu
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField> Foam::hhuMixtureThermo<MixtureType>::hu
+Foam::tmp<Foam::scalarField>
+Foam::hhuMixtureThermo<MixtureType>::hu
 (
     const scalarField& Tu,
     const label patchi
@@ -309,7 +407,8 @@ Foam::tmp<Foam::scalarField> Foam::hhuMixtureThermo<MixtureType>::hu
 
 
 template<class MixtureType>
-Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::Tb() const
+Foam::tmp<Foam::volScalarField>
+Foam::hhuMixtureThermo<MixtureType>::Tb() const
 {
     tmp<volScalarField> tTb
     (
@@ -328,10 +427,14 @@ Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::Tb() const
     );
 
     volScalarField& Tb_ = tTb();
+    scalarField& TbCells = Tb_.internalField();
+    const scalarField& TCells = T_.internalField();
+    const scalarField& hCells = h_.internalField();
 
-    forAll(Tb_, celli)
+    forAll(TbCells, celli)
     {
-        Tb_[celli] = this->cellProducts(celli).TH(h_[celli], T_[celli]);
+        TbCells[celli] =
+            this->cellProducts(celli).TH(hCells[celli], TCells[celli]);
     }
 
     forAll(Tb_.boundaryField(), patchi)
@@ -344,7 +447,8 @@ Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::Tb() const
         forAll(pTb, facei)
         {
             pTb[facei] =
-                this->patchFaceProducts(patchi, facei).TH(ph[facei], pT[facei]);
+                this->patchFaceProducts(patchi, facei)
+               .TH(ph[facei], pT[facei]);
         }
     }
 
@@ -374,10 +478,14 @@ Foam::hhuMixtureThermo<MixtureType>::psiu() const
     );
 
     volScalarField& psiu = tpsiu();
+    scalarField& psiuCells = psiu.internalField();
+    const scalarField& TuCells = Tu_.internalField();
+    const scalarField& pCells = p_.internalField();
 
-    forAll(psiu, celli)
+    forAll(psiuCells, celli)
     {
-        psiu[celli] = this->cellReactants(celli).psi(p_[celli], Tu_[celli]);
+        psiuCells[celli] =
+            this->cellReactants(celli).psi(pCells[celli], TuCells[celli]);
     }
 
     forAll(psiu.boundaryField(), patchi)
@@ -421,12 +529,15 @@ Foam::hhuMixtureThermo<MixtureType>::psib() const
     );
 
     volScalarField& psib = tpsib();
-
+    scalarField& psibCells = psib.internalField();
     volScalarField Tb_ = Tb();
+    const scalarField& TbCells = Tb_.internalField();
+    const scalarField& pCells = p_.internalField();
 
-    forAll(psib, celli)
+    forAll(psibCells, celli)
     {
-        psib[celli] = this->cellReactants(celli).psi(p_[celli], Tb_[celli]);
+        psibCells[celli] =
+            this->cellReactants(celli).psi(pCells[celli], TbCells[celli]);
     }
 
     forAll(psib.boundaryField(), patchi)
@@ -449,7 +560,8 @@ Foam::hhuMixtureThermo<MixtureType>::psib() const
 
 
 template<class MixtureType>
-Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::muu() const
+Foam::tmp<Foam::volScalarField>
+Foam::hhuMixtureThermo<MixtureType>::muu() const
 {
     tmp<volScalarField> tmuu
     (
@@ -469,10 +581,12 @@ Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::muu() const
     );
 
     volScalarField& muu_ = tmuu();
+    scalarField& muuCells = muu_.internalField();
+    const scalarField& TuCells = Tu_.internalField();
 
-    forAll(muu_, celli)
+    forAll(muuCells, celli)
     {
-        muu_[celli] = this->cellReactants(celli).mu(Tu_[celli]);
+        muuCells[celli] = this->cellReactants(celli).mu(TuCells[celli]);
     }
 
     forAll(muu_.boundaryField(), patchi)
@@ -492,7 +606,8 @@ Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::muu() const
 
 
 template<class MixtureType>
-Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::mub() const
+Foam::tmp<Foam::volScalarField>
+Foam::hhuMixtureThermo<MixtureType>::mub() const
 {
     tmp<volScalarField> tmub
     (
@@ -512,11 +627,13 @@ Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::mub() const
     );
 
     volScalarField& mub_ = tmub();
+    scalarField& mubCells = mub_.internalField();
     volScalarField Tb_ = Tb();
+    const scalarField& TbCells = Tb_.internalField();
 
-    forAll(mub_, celli)
+    forAll(mubCells, celli)
     {
-        mub_[celli] = this->cellProducts(celli).mu(Tb_[celli]);
+        mubCells[celli] = this->cellProducts(celli).mu(TbCells[celli]);
     }
 
     forAll(mub_.boundaryField(), patchi)
@@ -526,7 +643,8 @@ Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::mub() const
 
         forAll(pMub, facei)
         {
-            pMub[facei] = this->patchFaceProducts(patchi, facei).mu(pTb[facei]);
+            pMub[facei] =
+                this->patchFaceProducts(patchi, facei).mu(pTb[facei]);
         }
     }
 
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.H b/src/thermophysicalModels/combustion/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.H
index a5b3855599..7f3997ceee 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.H
+++ b/src/thermophysicalModels/combustion/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.H
@@ -73,21 +73,20 @@ public:
         hhuMixtureThermo(const fvMesh&);
 
 
-    // Destructor
-
-        virtual ~hhuMixtureThermo();
+    //- Destructor
+    virtual ~hhuMixtureThermo();
 
 
     // Member functions
 
         //- Return the compostion of the combustion mixture
-        combustionMixture& composition()
+        virtual combustionMixture& composition()
         {
             return *this;
         }
 
         //- Return the compostion of the combustion mixture
-        const combustionMixture& composition() const
+        virtual const combustionMixture& composition() const
         {
             return *this;
         }
@@ -95,38 +94,48 @@ public:
         //- Update properties
         virtual void correct();
 
+        //- Sensible enthalpy [J/kg]
+        virtual tmp<volScalarField> hs() const;
+
+        //- Chemical enthalpy [J/kg]
+        virtual tmp<volScalarField> hc() const;
+
 
         // Fields derived from thermodynamic state variables
 
             //- Enthalpy for cell-set [J/kg]
-            tmp<scalarField> h
+            virtual tmp<scalarField> h
             (
                 const scalarField& T,
                 const labelList& cells
             ) const;
 
             //- Enthalpy for patch [J/kg]
-            tmp<scalarField> h
+            virtual tmp<scalarField> h
             (
                 const scalarField& T,
                 const label patchi
             ) const;
 
             //- Heat capacity at constant pressure for patch [J/kg/K]
-            tmp<scalarField> Cp(const scalarField& T, const label patchi) const;
+            virtual tmp<scalarField> Cp
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
 
             //- Heat capacity at constant pressure [J/kg/K]
-            tmp<volScalarField> Cp() const;
+            virtual tmp<volScalarField> Cp() const;
 
             //- Unburnt gas enthalpy for cell-set [J/kg]
-            tmp<scalarField> hu
+            virtual tmp<scalarField> hu
             (
                 const scalarField& T,
                 const labelList& cells
             ) const;
 
             //- Unburnt gas enthalpy for patch [J/kg]
-            tmp<scalarField> hu
+            virtual tmp<scalarField> hu
             (
                 const scalarField& T,
                 const label patchi
@@ -134,22 +143,22 @@ public:
 
 
             //- Burnt gas temperature [K]
-            tmp<volScalarField> Tb() const;
+            virtual tmp<volScalarField> Tb() const;
 
             //- Unburnt gas compressibility [s^2/m^2]
-            tmp<volScalarField> psiu() const;
+            virtual tmp<volScalarField> psiu() const;
 
             //- Burnt gas compressibility [s^2/m^2]
-            tmp<volScalarField> psib() const;
+            virtual tmp<volScalarField> psib() const;
 
 
         // Access to transport variables
 
             //- Dynamic viscosity of unburnt gas [kg/ms]
-            tmp<volScalarField> muu() const;
+            virtual tmp<volScalarField> muu() const;
 
             //- Dynamic viscosity of burnt gas [kg/ms]
-            tmp<volScalarField> mub() const;
+            virtual tmp<volScalarField> mub() const;
 
 
         //- Read thermophysicalProperties dictionary
diff --git a/src/thermophysicalModels/specie/specie/specie.C b/src/thermophysicalModels/specie/specie/specie.C
index ff2b2f67e1..18941b6aea 100644
--- a/src/thermophysicalModels/specie/specie/specie.C
+++ b/src/thermophysicalModels/specie/specie/specie.C
@@ -22,35 +22,27 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Base class of the thermophysical property types.
-
 \*---------------------------------------------------------------------------*/
 
 #include "specie.H"
 #include "IOstreams.H"
 #include "dimensionedConstants.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 /* * * * * * * * * * * * * public constants  * * * * * * * * * * * * */
 
 //- Universal gas constant (default in [J/(kmol K)])
-const scalar specie::RR = dimensionedConstant("R", 8314.51);
+const Foam::scalar Foam::specie::RR = dimensionedConstant("R", 8314.51);
 
 //- Standard pressure (default in [Pa])
-const scalar specie::Pstd = dimensionedConstant("Pstd", 1.0e5);
+const Foam::scalar Foam::specie::Pstd = dimensionedConstant("Pstd", 1.0e5);
 
 //- Standard temperature (default in [K])
-const scalar specie::Tstd = dimensionedConstant("Tstd", 298.15);
+const Foam::scalar Foam::specie::Tstd = dimensionedConstant("Tstd", 298.15);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-specie::specie(Istream& is)
+Foam::specie::specie(Istream& is)
 :
     name_(is),
     nMoles_(readScalar(is)),
@@ -62,7 +54,7 @@ specie::specie(Istream& is)
 
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
-Ostream& operator<<(Ostream& os, const specie& st)
+Foam::Ostream& Foam::operator<<(Ostream& os, const specie& st)
 {
     os  << st.name_ << tab
         << st.nMoles_ << tab
@@ -73,8 +65,4 @@ Ostream& operator<<(Ostream& os, const specie& st)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
index a2870c86ab..4c0dcb5b5a 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
@@ -22,27 +22,18 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Constant properties thermodynamics package derived from the basic
-    thermo package data type specieThermo.
-
 \*---------------------------------------------------------------------------*/
 
 #include "eConstThermo.H"
 #include "IOstreams.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-eConstThermo::eConstThermo(Istream& is)
+Foam::eConstThermo::eConstThermo(Istream& is)
 :
     specieThermo(is),
-    CV(readScalar(is)),
-    Hf(readScalar(is))
+    Cv_(readScalar(is)),
+    Hf_(readScalar(is))
 {
     is.check("eConstThermo::eConstThermo(Istream& is)");
 }
@@ -50,17 +41,13 @@ eConstThermo::eConstThermo(Istream& is)
 
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
-Ostream& operator<<(Ostream& os, const eConstThermo& ct)
+Foam::Ostream& Foam::operator<<(Ostream& os, const eConstThermo& ct)
 {
-    os << (const specieThermo&)ct << tab << ct.CV << tab << ct.Hf;
+    os << (const specieThermo&)ct << tab << ct.Cv_ << tab << ct.Hf_;
 
     os.check("Ostream& operator<<(Ostream& os, const eConstThermo& ct)");
     return os;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
index fa8e624946..4cb1217c0e 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
@@ -95,13 +95,13 @@ class eConstThermo
 {
     // Private data
 
-        scalar CV;
-        scalar Hf;
+        scalar Cv_;
+        scalar Hf_;
 
 
     // Private member functions
 
-        //- construct from components
+        //- Construct from components
         inline eConstThermo
         (
             const specieThermo& st,
@@ -109,6 +109,7 @@ class eConstThermo
             const scalar hf
         );
 
+
 public:
 
     // Constructors
@@ -136,6 +137,12 @@ public:
             //- Enthalpy [J/kmol]
             inline scalar h(const scalar T) const;
 
+            //- Sensible Enthalpy [J/kmol]
+            inline scalar hs(const scalar T) const;
+
+            //- Chemical enthalpy [J/kmol]
+            inline scalar hc() const;
+
             //- Entropy [J/(kmol K)]
             inline scalar s(const scalar T) const;
 
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
index 2f7d1faf4c..ce40ccbd94 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
@@ -34,8 +34,8 @@ inline Foam::eConstThermo::eConstThermo
 )
 :
     specieThermo(st),
-    CV(cv),
-    Hf(hf)
+    Cv_(cv),
+    Hf_(hf)
 {}
 
 
@@ -48,8 +48,8 @@ inline Foam::eConstThermo::eConstThermo
 )
 :
     specieThermo(name, ct),
-    CV(ct.CV),
-    Hf(ct.Hf)
+    Cv_(ct.Cv_),
+    Hf_(ct.Hf_)
 {}
 
 
@@ -79,13 +79,26 @@ Foam::eConstThermo<equationOfState>::New(Istream& is)
 
 inline Foam::scalar Foam::eConstThermo::cp(const scalar) const
 {
-    return CV*W() + RR;
+    return Cv_*W() + RR;
 }
 
 
 inline Foam::scalar Foam::eConstThermo::h(const scalar T) const
 {
-    return cp(T)*T + Hf*W();
+    return cp(T)*T + Hf_*W();
+}
+
+
+inline Foam::scalar Foam::eConstThermo::hs(const scalar T) const
+{
+    return cp(T)*T;
+}
+
+
+template<class equationOfState>
+inline Foam::scalar Foam::eConstThermo<equationOfState>::hc() const
+{
+    return Hf_*this->W();
 }
 
 
@@ -102,7 +115,7 @@ inline Foam::scalar Foam::eConstThermo::TH
     const scalar T0
 ) const
 {
-    return (h - Hf)/Cp(T0);
+    return (h - Hf_)/Cp(T0);
 }
 
 
@@ -112,7 +125,7 @@ inline Foam::scalar Foam::eConstThermo::TE
     const scalar
 ) const
 {
-    return (e - Hf)/CV;
+    return (e - Hf_)/Cv_;
 }
 
 
@@ -125,8 +138,8 @@ inline Foam::eConstThermo& Foam::eConstThermo::operator=
 {
     specieThermo::operator=(ct);
 
-    CV = ct.CV;
-    Hf = ct.Hf;
+    Cv_ = ct.Cv_;
+    Hf_ = ct.Hf_;
 
     return *this;
 }
@@ -145,8 +158,8 @@ inline Foam::eConstThermo Foam::operator+
     return eConstThermo
     (
         st,
-        ct1.nMoles()/st.nMoles()*ct1.CV + ct2.nMoles()/st.nMoles()*ct2.CV,
-        ct1.nMoles()/st.nMoles()*ct1.Hf + ct2.nMoles()/st.nMoles()*ct2.Hf
+        ct1.nMoles()/st.nMoles()*ct1.Cv_ + ct2.nMoles()/st.nMoles()*ct2.Cv_,
+        ct1.nMoles()/st.nMoles()*ct1.Hf_ + ct2.nMoles()/st.nMoles()*ct2.Hf_
     );
 }
 
@@ -162,8 +175,8 @@ inline Foam::eConstThermo Foam::operator-
     return eConstThermo
     (
         st,
-        ct1.nMoles()/st.nMoles()*ct1.CV - ct2.nMoles()/st.nMoles()*ct2.CV,
-        ct1.nMoles()/st.nMoles()*ct1.Hf - ct2.nMoles()/st.nMoles()*ct2.Hf
+        ct1.nMoles()/st.nMoles()*ct1.Cv_ - ct2.nMoles()/st.nMoles()*ct2.Cv_,
+        ct1.nMoles()/st.nMoles()*ct1.Hf_ - ct2.nMoles()/st.nMoles()*ct2.Hf_
     );
 }
 
@@ -177,8 +190,8 @@ inline Foam::eConstThermo Foam::operator*
     return eConstThermo
     (
         s*((const specieThermo&)ct),
-        ct.CV,
-        ct.Hf
+        ct.Cv_,
+        ct.Hf_
     );
 }
 
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
index 8b4736a051..912ae4892f 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
@@ -22,28 +22,19 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Constant properties thermodynamics package
-    templated ito the equationOfState.
-
 \*---------------------------------------------------------------------------*/
 
 #include "hConstThermo.H"
 #include "IOstreams.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class equationOfState>
-hConstThermo<equationOfState>::hConstThermo(Istream& is)
+Foam::hConstThermo<equationOfState>::hConstThermo(Istream& is)
 :
     equationOfState(is),
-    CP(readScalar(is)),
-    Hf(readScalar(is))
+    Cp_(readScalar(is)),
+    Hf_(readScalar(is))
 {
     is.check("hConstThermo::hConstThermo(Istream& is)");
 }
@@ -52,18 +43,18 @@ hConstThermo<equationOfState>::hConstThermo(Istream& is)
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
 template<class equationOfState>
-Ostream& operator<<(Ostream& os, const hConstThermo<equationOfState>& ct)
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const hConstThermo<equationOfState>& ct
+)
 {
     os  << static_cast<const equationOfState&>(ct) << tab
-        << ct.CP << tab << ct.Hf;
+        << ct.Cp_ << tab << ct.Hf_;
 
     os.check("Ostream& operator<<(Ostream& os, const hConstThermo& ct)");
     return os;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
index 1355cb67d3..f1d9018446 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
@@ -94,13 +94,13 @@ class hConstThermo
 {
     // Private data
 
-        scalar CP;
-        scalar Hf;
+        scalar Cp_;
+        scalar Hf_;
 
 
     // Private member functions
 
-        //- construct from components
+        //- Construct from components
         inline hConstThermo
         (
             const equationOfState& st,
@@ -136,6 +136,12 @@ public:
             //- Enthalpy [J/kmol]
             inline scalar h(const scalar T) const;
 
+            //- Sensible enthalpy [J/kmol]
+            inline scalar hs(const scalar T) const;
+
+            //- Chemical enthalpy [J/kmol]
+            inline scalar hc() const;
+
             //- Entropy [J/(kmol K)]
             inline scalar s(const scalar T) const;
 
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
index acc976de05..b628384eb9 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
@@ -35,8 +35,8 @@ inline Foam::hConstThermo<equationOfState>::hConstThermo
 )
 :
     equationOfState(st),
-    CP(cp),
-    Hf(hf)
+    Cp_(cp),
+    Hf_(hf)
 {}
 
 
@@ -50,8 +50,8 @@ inline Foam::hConstThermo<equationOfState>::hConstThermo
 )
 :
     equationOfState(name, ct),
-    CP(ct.CP),
-    Hf(ct.Hf)
+    Cp_(ct.Cp_),
+    Hf_(ct.Hf_)
 {}
 
 
@@ -80,21 +80,47 @@ Foam::hConstThermo<equationOfState>::New(Istream& is)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class equationOfState>
-inline Foam::scalar Foam::hConstThermo<equationOfState>::cp(const scalar) const
+inline Foam::scalar Foam::hConstThermo<equationOfState>::cp
+(
+    const scalar
+) const
 {
-    return CP*this->W();
+    return Cp_*this->W();
 }
 
 
 template<class equationOfState>
-inline Foam::scalar Foam::hConstThermo<equationOfState>::h(const scalar T) const
+inline Foam::scalar Foam::hConstThermo<equationOfState>::h
+(
+    const scalar T
+) const
 {
-    return (CP*T + Hf)*this->W();
+    return (Cp_*T + Hf_)*this->W();
 }
 
 
 template<class equationOfState>
-inline Foam::scalar Foam::hConstThermo<equationOfState>::s(const scalar T) const
+inline Foam::scalar Foam::hConstThermo<equationOfState>::hs
+(
+    const scalar T
+) const
+{
+    return Cp_*T*this->W();
+}
+
+
+template<class equationOfState>
+inline Foam::scalar Foam::hConstThermo<equationOfState>::hc() const
+{
+    return Hf_*this->W();
+}
+
+
+template<class equationOfState>
+inline Foam::scalar Foam::hConstThermo<equationOfState>::s
+(
+    const scalar T
+) const
 {
     notImplemented
     (
@@ -119,8 +145,8 @@ inline void Foam::hConstThermo<equationOfState>::operator+=
     molr1 /= this->nMoles();
     scalar molr2 = ct.nMoles()/this->nMoles();
 
-    CP = molr1*CP + molr2*ct.CP;
-    Hf = molr1*Hf + molr2*ct.Hf;
+    Cp_ = molr1*Cp_ + molr2*ct.Cp_;
+    Hf_ = molr1*Hf_ + molr2*ct.Hf_;
 }
 
 
@@ -137,8 +163,8 @@ inline void Foam::hConstThermo<equationOfState>::operator-=
     molr1 /= this->nMoles();
     scalar molr2 = ct.nMoles()/this->nMoles();
 
-    CP = molr1*CP - molr2*ct.CP;
-    Hf = molr1*Hf - molr2*ct.Hf;
+    Cp_ = molr1*Cp_ - molr2*ct.Cp_;
+    Hf_ = molr1*Hf_ - molr2*ct.Hf_;
 }
 
 
@@ -160,8 +186,10 @@ inline Foam::hConstThermo<equationOfState> Foam::operator+
     return hConstThermo<equationOfState>
     (
         eofs,
-        ct1.nMoles()/eofs.nMoles()*ct1.CP + ct2.nMoles()/eofs.nMoles()*ct2.CP,
-        ct1.nMoles()/eofs.nMoles()*ct1.Hf + ct2.nMoles()/eofs.nMoles()*ct2.Hf
+        ct1.nMoles()/eofs.nMoles()*ct1.Cp_
+      + ct2.nMoles()/eofs.nMoles()*ct2.Cp_,
+        ct1.nMoles()/eofs.nMoles()*ct1.Hf_
+      + ct2.nMoles()/eofs.nMoles()*ct2.Hf_
     );
 }
 
@@ -182,8 +210,10 @@ inline Foam::hConstThermo<equationOfState> Foam::operator-
     return hConstThermo<equationOfState>
     (
         eofs,
-        ct1.nMoles()/eofs.nMoles()*ct1.CP - ct2.nMoles()/eofs.nMoles()*ct2.CP,
-        ct1.nMoles()/eofs.nMoles()*ct1.Hf - ct2.nMoles()/eofs.nMoles()*ct2.Hf
+        ct1.nMoles()/eofs.nMoles()*ct1.Cp_
+      - ct2.nMoles()/eofs.nMoles()*ct2.Cp_,
+        ct1.nMoles()/eofs.nMoles()*ct1.Hf_
+      - ct2.nMoles()/eofs.nMoles()*ct2.Hf_
     );
 }
 
@@ -198,8 +228,8 @@ inline Foam::hConstThermo<equationOfState> Foam::operator*
     return hConstThermo<equationOfState>
     (
         s*static_cast<const equationOfState&>(ct),
-        ct.CP,
-        ct.Hf
+        ct.Cp_,
+        ct.Hf_
     );
 }
 
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
index 5a3d05b848..13002ecc08 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
@@ -22,23 +22,15 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    JANAF tables based thermodynamics package templated ito the equationOfState.
-
 \*---------------------------------------------------------------------------*/
 
 #include "janafThermo.H"
 #include "IOstreams.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class equationOfState>
-janafThermo<equationOfState>::janafThermo(Istream& is)
+Foam::janafThermo<equationOfState>::janafThermo(Istream& is)
 :
     equationOfState(is),
     Tlow_(readScalar(is)),
@@ -103,7 +95,11 @@ janafThermo<equationOfState>::janafThermo(Istream& is)
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
 template<class equationOfState>
-Ostream& operator<<(Ostream& os, const janafThermo<equationOfState>& jt)
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const janafThermo<equationOfState>& jt
+)
 {
     os  << static_cast<const equationOfState&>(jt) << nl
         << "    " << jt.Tlow_
@@ -145,8 +141,4 @@ Ostream& operator<<(Ostream& os, const janafThermo<equationOfState>& jt)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
index db7807a642..e9f455b0a8 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
@@ -150,6 +150,12 @@ public:
         //- Enthalpy [J/kmol]
         inline scalar h(const scalar T) const;
 
+        //- Sensible enthalpy [J/kmol]
+        inline scalar hs(const scalar T) const;
+
+        //- Chemical enthalpy [J/kmol]
+        inline scalar hc() const;
+
         //- Entropy [J/(kmol K)]
         inline scalar s(const scalar T) const;
 
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
index f9dc5e7a0e..754996f27c 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
@@ -25,6 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "janafThermo.H"
+#include "specie.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -130,8 +131,7 @@ inline Foam::scalar Foam::janafThermo<equationOfState>::h
 ) const
 {
     const coeffArray& a = coeffs(T);
-    return
-    this->RR*
+    return this->RR*
     (
         ((((a[4]/5.0*T + a[3]/4.0)*T + a[2]/3.0)*T + a[1]/2.0)*T + a[0])*T
       + a[5]
@@ -139,6 +139,36 @@ inline Foam::scalar Foam::janafThermo<equationOfState>::h
 }
 
 
+template<class equationOfState>
+inline Foam::scalar Foam::janafThermo<equationOfState>::hs
+(
+    const scalar T
+) const
+{
+    const coeffArray& a = coeffs(T);
+    scalar Tr = T - specie::Tstd;
+    return this->RR*
+    (
+        ((((a[4]/5.0*Tr + a[3]/4.0)*Tr + a[2]/3.0)*Tr + a[1]/2.0)*Tr + a[0])*Tr
+    );
+}
+
+
+template<class equationOfState>
+inline Foam::scalar Foam::janafThermo<equationOfState>::hc() const
+{
+    const coeffArray& a = lowCpCoeffs_;
+    const scalar& Tstd = specie::Tstd;
+    return this->RR*
+    (
+        (
+            (((a[4]/5.0*Tstd + a[3]/4.0)*Tstd + a[2]/3.0)*Tstd + a[1]/2.0)*Tstd
+          + a[0]
+        )*Tstd
+    );
+}
+
+
 template<class equationOfState>
 inline Foam::scalar Foam::janafThermo<equationOfState>::s
 (
diff --git a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C
index a2aedda84a..3fcf489771 100644
--- a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C
+++ b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C
@@ -22,34 +22,24 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Basic thermodynamics type based on the use of fitting functions for
-    cp, h, s obtained from the template argument type thermo.  All other
-    properties are derived from these primitive functions.
-
 \*---------------------------------------------------------------------------*/
 
 #include "specieThermo.H"
 #include "IOstreams.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 /* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
 
 template<class thermo>
-const scalar specieThermo<thermo>::tol_ = 1.0e-4;
+const Foam::scalar Foam::specieThermo<thermo>::tol_ = 1.0e-4;
 
 template<class thermo>
-const int specieThermo<thermo>::maxIter_ = 100;
+const int Foam::specieThermo<thermo>::maxIter_ = 100;
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class thermo>
-specieThermo<thermo>::specieThermo(Istream& is)
+Foam::specieThermo<thermo>::specieThermo(Istream& is)
 :
     thermo(is)
 {
@@ -60,7 +50,7 @@ specieThermo<thermo>::specieThermo(Istream& is)
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
 template<class thermo>
-Ostream& operator<<(Ostream& os, const specieThermo<thermo>& st)
+Foam::Ostream& Foam::operator<<(Ostream& os, const specieThermo<thermo>& st)
 {
     os  << static_cast<const thermo&>(st);
 
@@ -69,8 +59,4 @@ Ostream& operator<<(Ostream& os, const specieThermo<thermo>& st)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H
index c0d4802c74..ba92b6da15 100644
--- a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H
+++ b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H
@@ -140,6 +140,12 @@ public:
             // Enthalpy [J/kmol]
             //scalar h(const scalar) const;
 
+            // Sensible enthalpy [J/kmol]
+            //scalar hs(const scalar) const;
+
+            // Chemical enthalpy [J/kmol]
+            //scalar hc(const scalar) const;
+
             // Entropy [J/(kmol K)]
             //scalar s(const scalar) const;
 
@@ -158,6 +164,9 @@ public:
                 //- Internal energy [J/kmol]
                 inline scalar e(const scalar T) const;
 
+                //- Sensible internal energy [J/kmol]
+                inline scalar es(const scalar T) const;
+
                 //- Gibbs free energy [J/kmol]
                 inline scalar g(const scalar T) const;
 
@@ -176,6 +185,12 @@ public:
                 //- Enthalpy [J/kg]
                 inline scalar H(const scalar T) const;
 
+                //- Sensible enthalpy [J/kg]
+                inline scalar Hs(const scalar T) const;
+
+                //- Chemical enthalpy [J/kg]
+                inline scalar Hc() const;
+
                 //- Entropy [J/(kg K)]
                 inline scalar S(const scalar T) const;
 
diff --git a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H
index 30f11baf42..13adec738b 100644
--- a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H
@@ -24,20 +24,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "error.H"
-
 #include "specieThermo.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// construct from components
 template<class thermo>
-inline specieThermo<thermo>::specieThermo
+inline Foam::specieThermo<thermo>::specieThermo
 (
     const thermo& sp
 )
@@ -46,10 +38,8 @@ inline specieThermo<thermo>::specieThermo
 {}
 
 
-// return the temperature corresponding to the value of the
-// thermodynamic property f, given the function f = F(T) and dF(T)/dT
 template<class thermo>
-inline scalar specieThermo<thermo>::T
+inline Foam::scalar Foam::specieThermo<thermo>::T
 (
     scalar f,
     scalar T0,
@@ -87,9 +77,8 @@ inline scalar specieThermo<thermo>::T
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct as named copy
 template<class thermo>
-inline specieThermo<thermo>::specieThermo
+inline Foam::specieThermo<thermo>::specieThermo
 (
     const word& name,
     const specieThermo& st
@@ -101,105 +90,114 @@ inline specieThermo<thermo>::specieThermo
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Calculate and return derived properties
-// (These functions need not provided in derived types)
-
-// mole specific properties
-
-// Heat capacities [J/(kmol K)]
 template<class thermo>
-inline scalar specieThermo<thermo>::cv(const scalar T) const
+inline Foam::scalar Foam::specieThermo<thermo>::cv(const scalar T) const
 {
     return this->cp(T) - this->RR;
 }
 
-// gamma = cp/cv []
+
 template<class thermo>
-inline scalar specieThermo<thermo>::gamma(const scalar T) const
+inline Foam::scalar Foam::specieThermo<thermo>::gamma(const scalar T) const
 {
     scalar CP = this->cp(T);
     return CP/(CP - this->RR);
 }
 
-// Internal energy [J/kmol]
+
 template<class thermo>
-inline scalar specieThermo<thermo>::e(const scalar T) const
+inline Foam::scalar Foam::specieThermo<thermo>::e(const scalar T) const
 {
     return this->h(T) - this->RR*(T - this->Tstd);
 }
 
-// Gibbs free energy [J/kmol]
+
 template<class thermo>
-inline scalar specieThermo<thermo>::g(const scalar T) const
+inline Foam::scalar Foam::specieThermo<thermo>::es(const scalar T) const
+{
+    return this->hs(T) - this->RR*(T - this->Tstd);
+}
+
+
+template<class thermo>
+inline Foam::scalar Foam::specieThermo<thermo>::g(const scalar T) const
 {
     return this->h(T) - T*this->s(T);
 }
 
-// Helmholtz free energy [J/kmol]
+
 template<class thermo>
-inline scalar specieThermo<thermo>::a(const scalar T) const
+inline Foam::scalar Foam::specieThermo<thermo>::a(const scalar T) const
 {
     return this->e(T) - T*this->s(T);
 }
 
 
-// mass specific properties
-
-// Heat capacity at constant pressure [J/(kg K)]
 template<class thermo>
-inline scalar specieThermo<thermo>::Cp(const scalar T) const
+inline Foam::scalar Foam::specieThermo<thermo>::Cp(const scalar T) const
 {
     return this->cp(T)/this->W();
 }
 
-// Heat capacity at constant pressure [J/(kg K)]
+
 template<class thermo>
-inline scalar specieThermo<thermo>::Cv(const scalar T) const
+inline Foam::scalar Foam::specieThermo<thermo>::Cv(const scalar T) const
 {
     return this->cv(T)/this->W();
 }
 
-// Enthalpy [J/kg]
+
 template<class thermo>
-inline scalar specieThermo<thermo>::H(const scalar T) const
+inline Foam::scalar Foam::specieThermo<thermo>::H(const scalar T) const
 {
     return this->h(T)/this->W();
 }
 
-// Entropy [J/kg]
+
 template<class thermo>
-inline scalar specieThermo<thermo>::S(const scalar T) const
+inline Foam::scalar Foam::specieThermo<thermo>::Hs(const scalar T) const
+{
+    return this->hs(T)/this->W();
+}
+
+
+template<class thermo>
+inline Foam::scalar Foam::specieThermo<thermo>::Hc() const
+{
+    return this->hc()/this->W();
+}
+
+
+template<class thermo>
+inline Foam::scalar Foam::specieThermo<thermo>::S(const scalar T) const
 {
     return this->s(T)/this->W();
 }
 
-// Internal energy [J/kg]
+
 template<class thermo>
-inline scalar specieThermo<thermo>::E(const scalar T) const
+inline Foam::scalar Foam::specieThermo<thermo>::E(const scalar T) const
 {
     return this->e(T)/this->W();
 }
 
-// Gibbs free energy [J/kg]
+
 template<class thermo>
-inline scalar specieThermo<thermo>::G(const scalar T) const
+inline Foam::scalar Foam::specieThermo<thermo>::G(const scalar T) const
 {
     return this->g(T)/this->W();
 }
 
-// Helmholtz free energy [J/kg]
+
 template<class thermo>
-inline scalar specieThermo<thermo>::A(const scalar T) const
+inline Foam::scalar Foam::specieThermo<thermo>::A(const scalar T) const
 {
     return this->a(T)/this->W();
 }
 
 
-// Equilibrium reaction thermodynamics
-
-// Equilibrium constant []
 template<class thermo>
-inline scalar specieThermo<thermo>::K(const scalar T) const
+inline Foam::scalar Foam::specieThermo<thermo>::K(const scalar T) const
 {
     scalar arg = -this->nMoles()*this->g(T)/(this->RR*T);
 
@@ -213,21 +211,16 @@ inline scalar specieThermo<thermo>::K(const scalar T) const
     }
 }
 
-//- Equilibrium constant [] i.t.o. partial pressures
-//  = PIi(pi/Pstd)^nui
-//  For low pressures (where the gas mixture is near perfect) Kp = K
+
 template<class thermo>
-inline scalar specieThermo<thermo>::Kp(const scalar T) const
+inline Foam::scalar Foam::specieThermo<thermo>::Kp(const scalar T) const
 {
     return K(T);
 }
 
 
-//- Equilibrium constant i.t.o. concentration
-//  For low pressures (where the gas mixture is near perfect)
-//  Kc = Kp(pstd/(RR*T))^nu
 template<class thermo>
-inline scalar specieThermo<thermo>::Kc(const scalar T) const
+inline Foam::scalar Foam::specieThermo<thermo>::Kc(const scalar T) const
 {
     if (equal(this->nMoles(), SMALL))
     {
@@ -240,11 +233,12 @@ inline scalar specieThermo<thermo>::Kc(const scalar T) const
 }
 
 
-//- Equilibrium constant [] i.t.o. mole-fractions
-//  For low pressures (where the gas mixture is near perfect) 
-//  Kx = Kp(pstd/p)^nui
 template<class thermo>
-inline scalar specieThermo<thermo>::Kx(const scalar T, const scalar p) const
+inline Foam::scalar Foam::specieThermo<thermo>::Kx
+(
+    const scalar T,
+    const scalar p
+) const
 {
     if (equal(this->nMoles(), SMALL))
     {
@@ -257,11 +251,8 @@ inline scalar specieThermo<thermo>::Kx(const scalar T, const scalar p) const
 }
 
 
-//- Equilibrium constant [] i.t.o. number of moles
-//  For low pressures (where the gas mixture is near perfect) 
-//  Kn = Kp(n*pstd/p)^nui where n = number of moles in mixture
 template<class thermo>
-inline scalar specieThermo<thermo>::Kn
+inline Foam::scalar Foam::specieThermo<thermo>::Kn
 (
     const scalar T,
     const scalar p,
@@ -279,19 +270,23 @@ inline scalar specieThermo<thermo>::Kn
 }
 
 
-// Energy->temperature  inversion functions
-
-// Temperature from Enthalpy given an initial temperature T0
 template<class thermo>
-inline scalar specieThermo<thermo>::TH(const scalar h, const scalar T0) const
+inline Foam::scalar Foam::specieThermo<thermo>::TH
+(
+    const scalar h,
+    const scalar T0
+) const
 {
     return T(h, T0, &specieThermo<thermo>::H, &specieThermo<thermo>::Cp);
 }
 
 
-// Temperature from internal energy given an initial temperature T0
 template<class thermo>
-inline scalar specieThermo<thermo>::TE(const scalar e, const scalar T0) const
+inline Foam::scalar Foam::specieThermo<thermo>::TE
+(
+    const scalar e,
+    const scalar T0
+) const
 {
     return T(e, T0, &specieThermo<thermo>::E, &specieThermo<thermo>::Cv);
 }
@@ -300,19 +295,25 @@ inline scalar specieThermo<thermo>::TE(const scalar e, const scalar T0) const
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class thermo>
-inline void specieThermo<thermo>::operator+=(const specieThermo<thermo>& st)
+inline void Foam::specieThermo<thermo>::operator+=
+(
+    const specieThermo<thermo>& st
+)
 {
     thermo::operator+=(st);
 }
 
 template<class thermo>
-inline void specieThermo<thermo>::operator-=(const specieThermo<thermo>& st)
+inline void Foam::specieThermo<thermo>::operator-=
+(
+    const specieThermo<thermo>& st
+)
 {
     thermo::operator-=(st);
 }
 
 template<class thermo>
-inline void specieThermo<thermo>::operator*=(const scalar s)
+inline void Foam::specieThermo<thermo>::operator*=(const scalar s)
 {
     thermo::operator*=(s);
 }
@@ -321,7 +322,7 @@ inline void specieThermo<thermo>::operator*=(const scalar s)
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
 template<class thermo>
-inline specieThermo<thermo> operator+
+inline Foam::specieThermo<thermo> Foam::operator+
 (
     const specieThermo<thermo>& st1,
     const specieThermo<thermo>& st2
@@ -335,7 +336,7 @@ inline specieThermo<thermo> operator+
 
 
 template<class thermo>
-inline specieThermo<thermo> operator-
+inline Foam::specieThermo<thermo> Foam::operator-
 (
     const specieThermo<thermo>& st1,
     const specieThermo<thermo>& st2
@@ -349,7 +350,7 @@ inline specieThermo<thermo> operator-
 
 
 template<class thermo>
-inline specieThermo<thermo> operator*
+inline Foam::specieThermo<thermo> Foam::operator*
 (
     const scalar s,
     const specieThermo<thermo>& st
@@ -363,7 +364,7 @@ inline specieThermo<thermo> operator*
 
 
 template<class thermo>
-inline specieThermo<thermo> operator==
+inline Foam::specieThermo<thermo> Foam::operator==
 (
     const specieThermo<thermo>& st1,
     const specieThermo<thermo>& st2
@@ -373,8 +374,4 @@ inline specieThermo<thermo> operator==
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/wmake/wclean b/wmake/wclean
index 1ea917eec5..8d75088397 100755
--- a/wmake/wclean
+++ b/wmake/wclean
@@ -34,8 +34,8 @@
 Script=${0##*/}
 
 usage() {
-   while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-   cat<<USAGE
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
 usage: $Script [dir]
        $Script target [dir [MakeDir]]
 
@@ -56,7 +56,7 @@ USAGE
 # provide immediate help
 if [ "$1" = "-h" -o "$1" = "-help" ]
 then
-   usage
+    usage
 fi
 
 
@@ -70,35 +70,34 @@ MakeDir=Make
 if [ $# -ge 1 ]
 then
 
-   if [ -d "$1" ]
-   then
-      dir=$1
-   else
-      makeOption=$1
-   fi
+    if [ -d "$1" ]
+    then
+        dir=$1
+    else
+        makeOption=$1
+    fi
 
-   if [ $# -ge 2 ]
-   then
-      dir=$2
-   fi
+    if [ $# -ge 2 ]
+    then
+        dir=$2
+    fi
 
-   # alternative name for the Make sub-directory
-   if [ $# -ge 3 ]
-   then
-      MakeDir=$3
-   fi
+    # alternative name for the Make sub-directory
+    if [ $# -ge 3 ]
+    then
+        MakeDir=$3
+    fi
 
-   if [ "$dir" ]
-   then
-      cd $dir 2>/dev/null || {
-         echo "$Script error"
-         echo "    could not change to directory '$dir'"
-         exit 1
-      }
-   fi
+    if [ "$dir" ]
+    then
+        cd $dir 2>/dev/null || {
+            echo "$Script error: could not change to directory '$dir'" 1>&2
+            exit 1
+        }
+    fi
 
-   # provide some feedback
-   echo "$Script ${dir:-./}"
+    # provide some feedback
+    echo "$Script ${dir:-./}"
 fi
 
 #------------------------------------------------------------------------------
@@ -113,9 +112,9 @@ then
         exit $?
     elif [ ! -d $MakeDir ]
     then
-        for dir in `find . \( -type d -a -name "Make" \) -printf "%h "`
+        for dir in `find . \( -type d -a -name Make \) -printf "%h "`
         do
-           $0 $dir
+            $0 $dir
         done
         exit 0
     fi
@@ -131,9 +130,8 @@ fi
 
 if [ ! -d $MakeDir ]
 then
-   echo "$Script error"
-   echo "    '$MakeDir' directory does not exist"
-   exit 1
+    echo "$Script error: '$MakeDir' directory does not exist" 1>&2
+    exit 1
 fi
 
 # -----------------------------------------------------------------------------
@@ -144,8 +142,8 @@ find . -name "*.dep" -exec rm {} \;
 
 case "$makeOption" in
 lib | libso | libo )
-   rm -rf lnInclude 2>/dev/null
-   ;;
+    rm -rf lnInclude 2>/dev/null
+    ;;
 esac
 
 rm -rf ii_files Templates.DB 2>/dev/null
diff --git a/wmake/wcleanAll b/wmake/wcleanAll
index e9b36bc375..99e765fc9d 100755
--- a/wmake/wcleanAll
+++ b/wmake/wcleanAll
@@ -27,30 +27,34 @@
 #     wcleanAll
 #
 # Description
-#     script that searches all the directories below the current for the
-#     object file directories of all machines and then deletes them.
+#     search all the directories below the current for the object file
+#     directories of all machines and delete them.
 #
 #------------------------------------------------------------------------------
+if [ "$1" = "-h" -o "$1" = "-help" ]
+then
+    echo "Usage: ${0##*/}"
+    echo
+    echo "    Remove all object files and *.dep files"
+    exit 1
+fi
 
 [ -d bin -a -d src ] || {
-   echo "${0##*/}: not in the project top level directory"
-   exit 1
+    echo "${0##*/}: not in the project top level directory"
+    exit 1
 }
 
 for dir in lib applications/bin
 do
-   echo "Removing $dir/"
-   [ -d $dir ] && rm -rf $dir/*
+    echo "Removing $dir/"
+    [ -d $dir ] && rm -rf $dir/*
 done
 
-echo "Removing *~ backup files"
-find . -name '*~' -exec rm {} \;
-
-echo "Removing .dep files"
+echo "Removing *.dep files"
 find . -name '*.dep' -exec rm {} \;
 
 echo "Cleaning Make subdirectories"
-find `find . -depth \( -name "Make.[A-Za-z]*" -o -name "Make" \) -type d -print` -depth \( -type d ! -name "*Make.[A-Za-z]*" ! -name "*Make" \) -exec rm -rf {} \;
+find `find . -depth \( -name "Make.[A-Za-z]*" -o -name Make \) -type d -print` -depth \( -type d ! -name "*Make.[A-Za-z]*" ! -name "*Make" \) -exec rm -rf {} \;
 
 echo "Removing lnInclude and intermediate directories"
 find . -depth -type d \( -name lnInclude -o -name ii_files -o -name Templates.DB \) -exec rm -rf {} \;
@@ -58,8 +62,6 @@ find . -depth -type d \( -name lnInclude -o -name ii_files -o -name Templates.DB
 echo "Removing misc files"
 find . \( -name exe -o -name log -o -name so_locations \) -exec rm {} \;
 
-# rm -rf src/mpich-${MPICH_VERSION}/platforms
-
 ( cd tutorials && ./Allclean )
 
 #------------------------------------------------------------------------------
diff --git a/wmake/wcleanAlmostAll b/wmake/wcleanAlmostAll
deleted file mode 100755
index 8bd5291600..0000000000
--- a/wmake/wcleanAlmostAll
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
-#    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software; you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by the
-#     Free Software Foundation; either version 2 of the License, or (at your
-#     option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM; if not, write to the Free Software Foundation,
-#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Script
-#     wcleanAlmostAll
-#
-# Description
-#     as per wcleanAll, but retains "*~" backup files
-#
-#------------------------------------------------------------------------------
-
-[ -d bin -a -d src ] || {
-   echo "${0##*/}: not in the project top level directory"
-   exit 1
-}
-
-for dir in lib applications/bin
-do
-   echo "Removing $dir/"
-   [ -d $dir ] && rm -rf $dir/*
-done
-
-echo "Retaining *~ backup files"
-## find . -name '*~' -exec rm {} \;
-
-echo "Removing .dep files"
-find . -name '*.dep' -exec rm {} \;
-
-echo "Cleaning Make subdirectories"
-find `find . -depth \( -name "Make.[A-Za-z]*" -o -name "Make" \) -type d -print` -depth \( -type d ! -name "*Make.[A-Za-z]*" ! -name "*Make" \) -exec rm -rf {} \;
-
-echo "Removing lnInclude and intermediate directories"
-find . -depth -type d \( -name lnInclude -o -name ii_files -o -name Templates.DB \) -exec rm -rf {} \;
-
-echo "Removing misc files"
-find . \( -name exe -o -name log -o -name so_locations \) -exec rm {} \;
-
-( cd tutorials && ./Allclean )
-
-#------------------------------------------------------------------------------
diff --git a/wmake/wcleanLnIncludeAll b/wmake/wcleanLnIncludeAll
index 67da4d0bb0..2cd830e855 100755
--- a/wmake/wcleanLnIncludeAll
+++ b/wmake/wcleanLnIncludeAll
@@ -31,6 +31,28 @@
 #
 #------------------------------------------------------------------------------
 
-find . -depth -type d -name lnInclude -exec rm -rf {} \;
+# default is pwd
+if [ "$#" -eq 0 ]
+then
+    set -- .
+elif [ "$1" = "-h" -o "$1" = "-help" ]
+then
+    echo "Usage: ${0##*/} [dir1] .. [dirN]"
+    echo
+    echo "    Delete all the lnInclude directories in the tree"
+    exit 1
+fi
+
+
+for i
+do
+    if [ -d "$i" ]
+    then
+        echo "removing lnInclude directories: $i"
+        find $i -depth -type d -name lnInclude -exec rm -rf {} \;
+    else
+        echo "no directory: $i" 1>&2
+    fi
+done
 
 #------------------------------------------------------------------------------
diff --git a/wmake/wcleanMachine b/wmake/wcleanMachine
index a3deba2322..9dacf643ea 100755
--- a/wmake/wcleanMachine
+++ b/wmake/wcleanMachine
@@ -33,32 +33,40 @@
 #     Usage: wcleanMachine <machineType> [ .. <machineTypeN> ]
 #
 #------------------------------------------------------------------------------
+usage() {
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+usage: ${0##*/} machineType [... machineTypeN]
 
-if [ $# -eq 0 ]
+  Searches the directories below the current directory for the object file
+  directories of the specified machine type(s) and deletes them
+
+USAGE
+    exit 1
+}
+
+# needs some machine types ... or provide immediate help
+if [ "$#" -lt 1 -o "$1" = "-h" -o "$1" = "-help" ]
 then
-   echo "${0##*/}: Machine type(s) expected, exiting !"
-   exit 1
+    usage
 fi
 
-[ -d lib -a -d src ] || {
-   echo "${0##*/}: not in the project top level directory !"
-   exit 1
-}
+[ -d lib -a -d src ] || usage "not in the project top level directory"
 
 
 for machType
 do
-   echo "Cleaning machine type: $machType"
+    echo "Cleaning machine type: $machType"
 
-   find `find . -depth \( -name "Make.[A-Za-z]*" -o -name "Make" \) -type d -print` \
-       -depth \( -type d -name "*$machType" -o -name "*$machType$WM_MPLIB" \) -exec rm -r {} \;
+    find `find . -depth \( -name "Make.[A-Za-z]*" -o -name Make \) -type d -print` \
+        -depth \( -type d -name "*$machType" -o -name "*$machType$WM_MPLIB" \) -exec rm -r {} \;
 
-   # find . -depth -type d \( -name ii_files -o -name Templates.DB \) -exec rm -rf {} \;
+    # find . -depth -type d \( -name ii_files -o -name Templates.DB \) -exec rm -rf {} \;
 
-   for dir in lib/$machType applications/bin/$machType
-   do
-      [ -d $dir ] && rm -r $dir
-   done
+    for dir in lib/$machType applications/bin/$machType
+    do
+        [ -d $dir ] && rm -rf $dir
+    done
 
 done
 
diff --git a/wmake/wmake b/wmake/wmake
index 1290fd556d..92dc42a9f3 100755
--- a/wmake/wmake
+++ b/wmake/wmake
@@ -33,8 +33,8 @@
 Script=${0##*/}
 
 usage() {
-   while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-   cat<<USAGE
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
 usage: $Script [dir]
        $Script target [dir [MakeDir]]
 
@@ -52,12 +52,13 @@ The 'target' is a Makefile target:
     jar       build Java jar
 
 USAGE
-   exit 1
+    exit 1
 }
 
 # provide immediate help
-if [ "$1" = "-h" -o "$1" = "-help" ]; then
-   usage
+if [ "$1" = "-h" -o "$1" = "-help" ]
+then
+    usage
 fi
 
 
@@ -66,20 +67,19 @@ fi
 #
 for check in WM_OPTIONS WM_LINK_LANGUAGE WM_DIR
 do
-   eval test "\$$check" || {
-      echo "$Script error"
-      echo "    environment variable \$$check not set"
-      exit 1
-   }
+    eval test "\$$check" || {
+        echo "$Script error: environment variable \$$check not set" 1>&2
+        exit 1
+    }
 done
 
 # when compiling anything but a standalone exe,
 # WM_PROJECT and WM_PROJECT_DIR must be set
 [ "$1" = exe -o \( "$WM_PROJECT" -a "$WM_PROJECT_DIR" \) ] || {
-   echo "$Script error"
-   echo "    environment variable \$WM_PROJECT or \$WM_PROJECT_DIR not set"
-   echo  "   while building project library or executable"
-   exit 1
+    echo "$Script error:" 1>&2
+    echo "    environment variable \$WM_PROJECT or \$WM_PROJECT_DIR not set" 1>&2
+    echo  "   while building project library" 1>&2
+    exit 1
 }
 
 
@@ -92,8 +92,8 @@ make="make"
 # set WM_NCOMPPROCS automatically when both WM_HOSTS and WM_SCHEDULER are set
 if [ -z "$WM_NCOMPPROCS" -a -n "$WM_HOSTS" -a -n "$WM_SCHEDULER" ]
 then
-   WM_NCOMPPROCS=$(wmakeScheduler -count)
-   [ $? -eq 0 ] || unset WM_NCOMPPROCS
+    WM_NCOMPPROCS=$(wmakeScheduler -count)
+    [ $? -eq 0 ] || unset WM_NCOMPPROCS
 fi
 
 if [ "$WM_NCOMPPROCS" ]
@@ -123,32 +123,31 @@ MakeDir=Make
 
 if [ $# -ge 1 ]
 then
-   if [ -d "$1" ]
-   then
-      dir=$1
-   else
-      makeOption=$1
-   fi
+    if [ -d "$1" ]
+    then
+        dir=$1
+    else
+        makeOption=$1
+    fi
 
-   if [ $# -ge 2 ]
-   then
-      dir=$2
-   fi
+    if [ $# -ge 2 ]
+    then
+        dir=$2
+    fi
 
-   # alternative name for the Make sub-directory
-   if [ $# -ge 3 ]
-   then
-      MakeDir=$3
-   fi
+    # alternative name for the Make sub-directory
+    if [ $# -ge 3 ]
+    then
+        MakeDir=$3
+    fi
 
-   if [ "$dir" ]
-   then
-      cd $dir 2>/dev/null || {
-         echo "$Script error"
-         echo "    could not change to directory '$dir'"
-         exit 1
-      }
-   fi
+    if [ "$dir" ]
+    then
+        cd $dir 2>/dev/null || {
+            echo "$Script error: could not change to directory '$dir'" 1>&2
+            exit 1
+        }
+    fi
 fi
 
 
@@ -180,27 +179,23 @@ fi
 # If both exist make the wmake derived files
 #------------------------------------------------------------------------------
 
-if [ ! -d $MakeDir ]
-then
-   echo "$Script error"
-   echo "    '$MakeDir' directory does not exist"
-   exit 1
-fi
+[ -d $MakeDir ] || {
+    echo "$Script error: '$MakeDir' directory does not exist" 1>&2
+    exit 1
+}
 
-if [ ! -r $MakeDir/files ]
-then
-   echo "$Script error"
-   echo "    file '$MakeDir/files' does not exist"
-   exit 1
-fi
+[ -r $MakeDir/files ] || {
+    echo "$Script error: file '$MakeDir/files' does not exist" 1>&2
+    exit 1
+}
 
 # Spawn a sub-shell and unset MAKEFLAGS in that sub-shell to avoid
 # files and options being built in parallel
 (
-   cd $MakeDir
-   unset MAKEFLAGS
-   make -s -f $WM_DIR/MakefileOptions
-   make -s -f $WM_DIR/MakefileFiles allFiles
+    cd $MakeDir
+    unset MAKEFLAGS
+    make -s -f $WM_DIR/MakefileOptions
+    make -s -f $WM_DIR/MakefileFiles allFiles
 )
 
 
@@ -211,12 +206,10 @@ fi
 
 OBJECTS_DIR=$MakeDir/$WM_OPTIONS
 
-if [ ! -r $OBJECTS_DIR/objectFiles ]
-then
-   echo "$Script error"
-   echo "    file '$OBJECTS_DIR/objectFiles' was not created successfully"
-   exit 1
-fi
+[ -r $OBJECTS_DIR/objectFiles ] || {
+    echo "$Script error: file '$OBJECTS_DIR/objectFiles' could not be created" 1>&2
+    exit 1
+}
 
 
 #------------------------------------------------------------------------------
@@ -227,14 +220,15 @@ touch $OBJECTS_DIR/dontIncludeDeps
 
 case "$makeOption" in
 lib | libso | libo )
-   $make -s -f $WM_DIR/Makefile MAKE_DIR=$MakeDir INCLUDE_DEPS=$OBJECTS_DIR/dontIncludeDeps lnInclude/uptodate
-   ;;
+    $make -s -f $WM_DIR/Makefile MAKE_DIR=$MakeDir INCLUDE_DEPS=$OBJECTS_DIR/dontIncludeDeps lnInclude/uptodate
+    ;;
 esac
 
 $make -s -f $WM_DIR/Makefile MAKE_DIR=$MakeDir INCLUDE_DEPS=$OBJECTS_DIR/dontIncludeDeps $OBJECTS_DIR/dependencies
 
 retVal=$?
-if [ $retVal -ne 0 ]; then
+if [ $retVal -ne 0 ]
+then
     exit $retVal
 fi
 
diff --git a/wmake/wmakeDerivedFiles b/wmake/wmakeDerivedFiles
index e4fd037a25..9f2aa1543a 100755
--- a/wmake/wmakeDerivedFiles
+++ b/wmake/wmakeDerivedFiles
@@ -34,14 +34,14 @@
 
 if [ ! -d "$WM_OPTIONS" ]
 then
-    echo "The $WM_OPTIONS directory does not exist, exiting"
+    echo "The $WM_OPTIONS directory does not exist, exiting" 1>&2
     exit 1
 fi
 
 # change to the $WM_OPTIONS directory
 cd $WM_OPTIONS 2>/dev/null || {
-   echo "Could not change to directory '$WM_OPTIONS'"
-   exit 1
+    echo "Could not change to directory '$WM_OPTIONS'" 1>&2
+    exit 1
 }
 
 # Find and keep macro definitions in files list
diff --git a/wmake/wmakeFilesAndOptions b/wmake/wmakeFilesAndOptions
index f65b7c435e..b26a45bf41 100755
--- a/wmake/wmakeFilesAndOptions
+++ b/wmake/wmakeFilesAndOptions
@@ -40,29 +40,28 @@ Script=${0##*/}
 #
 for check in WM_OPTIONS WM_LINK_LANGUAGE WM_DIR
 do
-   eval test "\$$check" || {
-      echo "$Script error"
-      echo "    environment variable \$$check not set"
-      exit 1
-   }
+    eval test "\$$check" || {
+        echo "$Script error: environment variable \$$check not set" 1>&2
+        exit 1
+    }
 done
 
 if [ -d Make ]
 then
-   echo "$Script: Make directory already exists"
-   exit 1
+    echo "$Script error: Make directory already exists" 1>&2
+    exit 1
 else
-   mkdir Make
+    mkdir Make
 fi
 
 [ -e Make/files ] || {
-   echo "$Script: Creating files"
-   $WM_DIR/scripts/makeFiles
+    echo "$Script: Creating files"
+    $WM_DIR/scripts/makeFiles
 }
 
 [ -e Make/options ] || {
-   echo "$Script: Creating options"
-   $WM_DIR/scripts/makeOptions
+    echo "$Script: Creating options"
+    $WM_DIR/scripts/makeOptions
 }
 
 #------------------------------------------------------------------------------
diff --git a/wmake/wmakeLnInclude b/wmake/wmakeLnInclude
index ad63d6bca9..066b6346fd 100755
--- a/wmake/wmakeLnInclude
+++ b/wmake/wmakeLnInclude
@@ -41,8 +41,8 @@
 Script=${0##*/}
 
 usage() {
-   while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-   cat<<USAGE
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
 
 usage: $Script [-f] <dir> [-lnOption]
 
@@ -62,68 +62,68 @@ unset findOpt
 # simple parse options
 while [ "$#" -gt 0 ]
 do
-   case "$1" in
-   -h | -help)   # provide immediate help
-      usage
-      ;;
-   -f)
-      shift
-      forceUpdate=1
-      ;;
-   -*)
-      usage "unknown option/argument: '$*'"
-      ;;
-   *)
-      break
-      ;;
-   esac
+    case "$1" in
+    -h | -help)   # provide immediate help
+        usage
+        ;;
+    -f)
+        shift
+        forceUpdate=1
+        ;;
+    -*)
+        usage "unknown option/argument: '$*'"
+        ;;
+    *)
+        break
+        ;;
+    esac
 done
 
 baseDir=$1
 # convert incorrect path/dir/lnInclude to something sensible
 while [ "${baseDir##*/}" = lnInclude ]
 do
-   baseDir="${baseDir%/*}"
-   if [ "$baseDir" = lnInclude ]
-   then
-      baseDir="."
-   fi
+    baseDir="${baseDir%/*}"
+    if [ "$baseDir" = lnInclude ]
+    then
+        baseDir="."
+    fi
 done
 incDir=$baseDir/lnInclude
 
 
 if [ $# -eq 1 ]
 then
-   lnOpt="-s"
+    lnOpt="-s"
 elif [ $# -eq 2 ]
 then
-   lnOpt="$2"
+    lnOpt="$2"
 else
-   usage "ERROR: incorrect number of arguments"
+    usage "ERROR: incorrect number of arguments"
 fi
 
 
 if [ ! -d $baseDir ]
 then
-   echo $Script: Base directory $baseDir does not exist, exiting.
-   exit 2
+    echo "$Script error: base directory $baseDir does not exist" 1>&2
+    exit 2
 fi
 
 if [ -d $incDir ]
 then
-   if [ ! "$forceUpdate" ]
-   then
-      # echo $Script: include directory $incDir already exists, exiting.
-      exit 0
-   fi
+    if [ ! "$forceUpdate" ]
+    then
+       # echo "$Script error: include directory $incDir already exists" 1>&2
+       exit 0
+    fi
 else
-   mkdir $incDir
+    mkdir $incDir
 fi
 
 if [ ! -d $incDir ]
 then
-   echo $Script: failed to create include directory $incDir
-   exit 0
+    echo "$Script error: failed to create include directory $incDir" 1>&2
+    exit 0
 fi
 
 cd $incDir || exit 1
@@ -131,7 +131,7 @@ cd $incDir || exit 1
 
 # Link include files
 # ~~~~~~~~~~~~~~~~~~
-echo $Script: linking include files to $incDir
+echo "$Script: linking include files to $incDir"
 
 #
 # remove any broken links first (this helps when file locations have moved)
@@ -146,14 +146,14 @@ find .. $findOpt \
  -o \( -name '*.[CHh]' -o -name '*.[ch]xx' -o -name '*.[ch]pp' -o -name '*.type' \)  \
  -a ! -name ".#*" \
  -print | \
-   while read src
-   do
-      link=$(readlink ${src##*/})
-      if [ "$link" != "$src" ]
-      then
-         rm $link 2>/dev/null
-         ln $lnOpt $src .
-      fi
-   done
+    while read src
+    do
+        link=$(readlink ${src##*/})
+        if [ "$link" != "$src" ]
+        then
+            rm $link 2>/dev/null
+            ln $lnOpt $src .
+        fi
+    done
 
 #------------------------------------------------------------------------------