diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
index 14c5e10a3e..abee4af7eb 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
@@ -19,7 +19,6 @@ EXE_LIBS = \
     -ldynamicMesh \
     -ledgeMesh \
     -lengine \
-    -lextrudeModel \
     -lfieldFunctionObjects \
     -lfileFormats \
     -lfiniteVolume \
@@ -43,7 +42,6 @@ EXE_LIBS = \
     -lliquidMixtureProperties \
     -lliquidProperties \
     -lmeshTools \
-    -lMGridGenGAMGAgglomeration \
     -lmolecularMeasurements \
     -lmolecule \
     -lmultiphaseInterFoam \
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
index 4392395af0..c9ab1ffbbe 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer
                 (
                     new passiveParticle
                     (
-                        positions_,
+                        procMesh,
                         ppi.position(),
                         procCelli,
                         false
@@ -112,7 +112,7 @@ Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer
 
     particleIndices_.setSize(pi);
 
-    IOPosition<passiveParticle>(positions_).write();
+    IOPosition<Cloud<passiveParticle> >(positions_).write();
 }
 
 
diff --git a/applications/utilities/preProcessing/mapFields/mapLagrangian.C b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
index 36dd981719..97a999b62c 100644
--- a/applications/utilities/preProcessing/mapFields/mapLagrangian.C
+++ b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,8 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "MapLagrangianFields.H"
-#include "Cloud.H"
-#include "passiveParticle.H"
+#include "passiveParticleCloud.H"
 #include "meshSearch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -44,7 +43,9 @@ static label findCell(const Cloud<passiveParticle>& cloud, const point& pt)
     label tetFaceI = -1;
     label tetPtI = -1;
 
-    cloud.findCellFacePt(pt, cellI, tetFaceI, tetPtI);
+    const polyMesh& mesh = cloud.pMesh();
+
+    mesh.findCellFacePt(pt, cellI, tetFaceI, tetPtI);
 
     if (cellI >= 0)
     {
@@ -55,8 +56,6 @@ static label findCell(const Cloud<passiveParticle>& cloud, const point& pt)
         // See if particle on face by finding nearest face and shifting
         // particle.
 
-        const polyMesh& mesh = cloud.pMesh();
-
         meshSearch meshSearcher(mesh, false);
 
         label faceI = meshSearcher.findNearestBoundaryFace(pt);
@@ -67,7 +66,7 @@ static label findCell(const Cloud<passiveParticle>& cloud, const point& pt)
 
             const point perturbPt = (1-perturbFactor)*pt+perturbFactor*cc;
 
-            cloud.findCellFacePt(perturbPt, cellI, tetFaceI, tetPtI);
+            mesh.findCellFacePt(perturbPt, cellI, tetFaceI, tetPtI);
 
             return cellI;
         }
@@ -124,7 +123,7 @@ void mapLagrangian(const meshToMesh& meshToMeshInterp)
             Info<< nl << "    processing cloud " << cloudDirs[cloudI] << endl;
 
             // Read positions & cell
-            Cloud<passiveParticle> sourceParcels
+            passiveParticleCloud sourceParcels
             (
                 meshSource,
                 cloudDirs[cloudI],
@@ -134,13 +133,15 @@ void mapLagrangian(const meshToMesh& meshToMeshInterp)
                 << " parcels from source mesh." << endl;
 
             // Construct empty target cloud
-            Cloud<passiveParticle> targetParcels
+            passiveParticleCloud targetParcels
             (
                 meshTarget,
                 cloudDirs[cloudI],
                 IDLList<passiveParticle>()
             );
 
+            particle::TrackingData<passiveParticleCloud> td(targetParcels);
+
             label sourceParticleI = 0;
 
             // Indices of source particles that get added to targetParcels
@@ -176,15 +177,14 @@ void mapLagrangian(const meshToMesh& meshToMeshInterp)
                         (
                             new passiveParticle
                             (
-                                targetParcels,
+                                meshTarget,
                                 targetCc[targetCells[i]],
                                 targetCells[i]
                             )
                         );
                         passiveParticle& newP = newPtr();
 
-                        scalar fraction = 0;
-                        label faceI = newP.track(iter().position(), fraction);
+                        label faceI = newP.track(iter().position(), td);
 
                         if (faceI < 0 && newP.cell() >= 0)
                         {
@@ -246,7 +246,7 @@ void mapLagrangian(const meshToMesh& meshToMeshInterp)
 
             if (addParticles.size())
             {
-                IOPosition<passiveParticle>(targetParcels).write();
+                IOPosition<passiveParticleCloud>(targetParcels).write();
 
                 // addParticles now contains the indices of the sourceMesh
                 // particles that were appended to the target mesh.
diff --git a/src/Allwmake b/src/Allwmake
index e9a922ab36..37313b73df 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -38,9 +38,9 @@ parallel/decompose/AllwmakeLnInclude
 # dummyThirdParty (dummy metisDecomp, scotchDecomp etc) needed by e.g. meshTools
 dummyThirdParty/Allwmake $*
 
+wmake $makeOption finiteVolume
 wmake $makeOption lagrangian/basic
 wmake $makeOption lagrangian/distributionModels
-wmake $makeOption finiteVolume
 wmake $makeOption genericPatchFields
 
 # Build the proper scotchDecomp, metisDecomp etc.
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 18522689e8..432f6ccc0e 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -495,6 +495,8 @@ $(pointBoundaryMesh)/pointBoundaryMesh.C
 
 meshes/boundBox/boundBox.C
 
+meshes/treeBoundBox/treeBoundBox.C
+
 meshTools = meshes/meshTools
 $(meshTools)/matchPoints.C
 $(meshTools)/mergePoints.C
@@ -572,6 +574,11 @@ $(interpolations)/patchToPatchInterpolation/PatchToPatchInterpolationName.C
 algorithms/MeshWave/MeshWaveName.C
 algorithms/MeshWave/FaceCellWaveName.C
 
+algorithms/indexedOctree/indexedOctreeName.C
+algorithms/indexedOctree/treeDataCell.C
+
+
+
 graph/curve/curve.C
 graph/graph.C
 
diff --git a/src/meshTools/indexedOctree/indexedOctree.C b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
similarity index 98%
rename from src/meshTools/indexedOctree/indexedOctree.C
rename to src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
index df489a6f95..6020d24d19 100644
--- a/src/meshTools/indexedOctree/indexedOctree.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
@@ -25,8 +25,8 @@ License
 
 #include "indexedOctree.H"
 #include "linePointRef.H"
-#include "meshTools.H"
 #include "OFstream.H"
+#include "ListOps.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -1730,26 +1730,6 @@ void Foam::indexedOctree<Type>::traverseNode
 
         point perturbedEnd(pushPoint(octantBb, end, false));
 
-
-        //if (debug)
-        {
-            // Dump octantBb to obj
-            writeOBJ(nodeI, octant);
-            // Dump ray to obj as well
-            {
-                OFstream str("ray.obj");
-                meshTools::writeOBJ(str, start);
-                meshTools::writeOBJ(str, end);
-                str << "l 1 2" << nl;
-            }
-            WarningIn("indexedOctree<Type>::traverseNode(..)")
-                << "Did not intersect ray from endpoint:" << end
-                << " to startpoint:" << start
-                << " with bounding box:" << octantBb << nl
-                << "Re-intersecting with perturbed endpoint:" << perturbedEnd
-                << endl;
-        }
-
         traverseNode
         (
             findAny,
@@ -2316,12 +2296,6 @@ void Foam::indexedOctree<Type>::writeOBJ
     pointField bbPoints(subBb.points());
 
     label pointVertI = vertI;
-    forAll(bbPoints, i)
-    {
-        meshTools::writeOBJ(str, bbPoints[i]);
-        vertI++;
-    }
-
     forAll(treeBoundBox::edges, i)
     {
         const edge& e = treeBoundBox::edges[i];
diff --git a/src/meshTools/indexedOctree/indexedOctree.H b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
similarity index 100%
rename from src/meshTools/indexedOctree/indexedOctree.H
rename to src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
diff --git a/src/meshTools/indexedOctree/indexedOctreeName.C b/src/OpenFOAM/algorithms/indexedOctree/indexedOctreeName.C
similarity index 95%
rename from src/meshTools/indexedOctree/indexedOctreeName.C
rename to src/OpenFOAM/algorithms/indexedOctree/indexedOctreeName.C
index 519d0d5992..4483d42068 100644
--- a/src/meshTools/indexedOctree/indexedOctreeName.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctreeName.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/indexedOctree/labelBits.H b/src/OpenFOAM/algorithms/indexedOctree/labelBits.H
similarity index 98%
rename from src/meshTools/indexedOctree/labelBits.H
rename to src/OpenFOAM/algorithms/indexedOctree/labelBits.H
index 221881f5bb..58893cbaeb 100644
--- a/src/meshTools/indexedOctree/labelBits.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/labelBits.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/indexedOctree/treeDataCell.C b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C
similarity index 100%
rename from src/meshTools/indexedOctree/treeDataCell.C
rename to src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C
diff --git a/src/meshTools/indexedOctree/treeDataCell.H b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H
similarity index 98%
rename from src/meshTools/indexedOctree/treeDataCell.H
rename to src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H
index 06342311e8..7cebddafa9 100644
--- a/src/meshTools/indexedOctree/treeDataCell.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/cloud/cloud.C b/src/OpenFOAM/fields/cloud/cloud.C
index c4260f02ee..40eb070bcd 100644
--- a/src/OpenFOAM/fields/cloud/cloud.C
+++ b/src/OpenFOAM/fields/cloud/cloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ Foam::cloud::cloud(const objectRegistry& obr, const word& cloudName)
     (
         IOobject
         (
-            ( cloudName.size() ? cloudName : defaultName ),
+            (cloudName.size() ? cloudName : defaultName),
             obr.time().timeName(),
             prefix,
             obr,
@@ -58,4 +58,12 @@ Foam::cloud::~cloud()
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::cloud::autoMap(const mapPolyMesh&)
+{
+    notImplemented("cloud::autoMap(const mapPolyMesh&)");
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/cloud/cloud.H b/src/OpenFOAM/fields/cloud/cloud.H
index a4c4eae51e..0755c6dd61 100644
--- a/src/OpenFOAM/fields/cloud/cloud.H
+++ b/src/OpenFOAM/fields/cloud/cloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,7 @@ public:
 
             //- Remap the cells of particles corresponding to the
             //  mesh topology change
-            virtual void autoMap(const mapPolyMesh&) = 0;
+            virtual void autoMap(const mapPolyMesh&);
 };
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index f83861aae9..da7ffdc266 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1183,10 +1183,123 @@ void Foam::polyMesh::removeFiles(const fileName& instanceDir) const
     }
 }
 
+
 void Foam::polyMesh::removeFiles() const
 {
     removeFiles(instance());
 }
 
 
+void Foam::polyMesh::findCellFacePt
+(
+    const point& pt,
+    label& cellI,
+    label& tetFaceI,
+    label& tetPtI
+) const
+{
+    cellI = -1;
+    tetFaceI = -1;
+    tetPtI = -1;
+
+    const indexedOctree<treeDataCell>& tree = cellTree();
+
+    // Find nearest cell to the point
+
+    pointIndexHit info = tree.findNearest(pt, sqr(GREAT));
+
+    if (info.hit())
+    {
+        label nearestCellI = tree.shapes().cellLabels()[info.index()];
+
+        // Check the nearest cell to see if the point is inside.
+        findTetFacePt(nearestCellI, pt, tetFaceI, tetPtI);
+
+        if (tetFaceI != -1)
+        {
+            // Point was in the nearest cell
+
+            cellI = nearestCellI;
+
+            return;
+        }
+        else
+        {
+            // Check the other possible cells that the point may be in
+
+            labelList testCells = tree.findIndices(pt);
+
+            forAll(testCells, pCI)
+            {
+                label testCellI = tree.shapes().cellLabels()[testCells[pCI]];
+
+                if (testCellI == nearestCellI)
+                {
+                    // Don't retest the nearest cell
+
+                    continue;
+                }
+
+                // Check the test cell to see if the point is inside.
+                findTetFacePt(testCellI, pt, tetFaceI, tetPtI);
+
+                if (tetFaceI != -1)
+                {
+                    // Point was in the test cell
+
+                    cellI = testCellI;
+
+                    return;
+                }
+            }
+        }
+    }
+    else
+    {
+        FatalErrorIn
+        (
+            "void Foam::polyMesh::findCellFacePt"
+            "("
+                "const point&, "
+                "label&, "
+                "label&, "
+                "label&"
+            ") const"
+        )   << "Did not find nearest cell in search tree."
+            << abort(FatalError);
+    }
+}
+
+
+void Foam::polyMesh::findTetFacePt
+(
+    const label cellI,
+    const point& pt,
+    label& tetFaceI,
+    label& tetPtI
+) const
+{
+    const polyMesh& mesh = *this;
+
+    tetFaceI = -1;
+    tetPtI = -1;
+
+    List<tetIndices> cellTets =
+        polyMeshTetDecomposition::cellTetIndices(mesh, cellI);
+
+    forAll(cellTets, tetI)
+    {
+        const tetIndices& cellTetIs = cellTets[tetI];
+
+        if (cellTetIs.tet(mesh).inside(pt))
+        {
+            tetFaceI = cellTetIs.face();
+            tetPtI = cellTetIs.tetPt();
+
+            return;
+        }
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index 65cf88dbe5..2be783a25e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,6 +34,7 @@ SourceFiles
     polyMeshFromShapeMesh.C
     polyMeshIO.C
     polyMeshUpdate.C
+    polyMeshFindCell.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -391,6 +392,7 @@ public:
                 return *this;
             }
 
+
         // Mesh motion
 
             //- Is mesh moving
@@ -508,6 +510,28 @@ public:
 
             //- Remove all files from mesh instance()
             void removeFiles() const;
+
+
+        // Helper functions
+
+            //- Find the cell, tetFaceI and tetPtI for the given position
+            void findCellFacePt
+            (
+                const point& pt,
+                label& cellI,
+                label& tetFaceI,
+                label& tetPtI
+            ) const;
+
+            //- Find the tetFaceI and tetPtI for the given position in
+            //  the supplied cell, tetFaceI and tetPtI = -1 if not found
+            void findTetFacePt
+            (
+                const label cellI,
+                const point& pt,
+                label& tetFaceI,
+                label& tetPtI
+            ) const;
 };
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
index a0fd190585..b0e83ce670 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,8 +26,6 @@ License
 #include "primitiveMesh.H"
 #include "demandDrivenData.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(Foam::primitiveMesh, 0);
@@ -63,6 +61,8 @@ Foam::primitiveMesh::primitiveMesh()
     ppPtr_(NULL),
     cpPtr_(NULL),
 
+    cellTreePtr_(NULL),
+
     labels_(0),
 
     cellCentresPtr_(NULL),
@@ -105,6 +105,8 @@ Foam::primitiveMesh::primitiveMesh
     ppPtr_(NULL),
     cpPtr_(NULL),
 
+    cellTreePtr_(NULL),
+
     labels_(0),
 
     cellCentresPtr_(NULL),
@@ -347,4 +349,36 @@ const Foam::cellShapeList& Foam::primitiveMesh::cellShapes() const
 }
 
 
+const Foam::indexedOctree<Foam::treeDataCell>&
+Foam::primitiveMesh::cellTree() const
+{
+    if (!cellTreePtr_)
+    {
+        treeBoundBox overallBb(points());
+
+        Random rndGen(261782);
+
+        overallBb = overallBb.extend(rndGen, 1E-4);
+        overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
+        overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
+
+        cellTreePtr_ =
+            new indexedOctree<treeDataCell>
+            (
+                treeDataCell
+                (
+                    false,      // not cache bb
+                    *this
+                ),
+                overallBb,
+                8,              // maxLevel
+                10,             // leafsize
+                3.0             // duplicity
+            );
+    }
+
+    return *cellTreePtr_;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
index 23eefb0e0b..cc3bc2c80a 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,6 +67,8 @@ SourceFiles
 #include "Map.H"
 #include "EdgeMap.H"
 #include "boundBox.H"
+#include "indexedOctree.H"
+#include "treeDataCell.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -155,6 +157,9 @@ class primitiveMesh
             //- Cell-points
             mutable labelListList* cpPtr_;
 
+            //- Search tree to allow spatial tet searching
+            mutable indexedOctree<treeDataCell>* cellTreePtr_;
+
 
         // On-the-fly edge addresing storage
 
@@ -482,6 +487,10 @@ public:
                 const labelListList& cellPoints() const;
 
 
+            //- Build (if necessary) and return the cell search tree
+            const indexedOctree<treeDataCell>& cellTree() const;
+
+
             // Geometric data (raw!)
 
                 const vectorField& cellCentres() const;
@@ -814,6 +823,9 @@ public:
             //- Clear topological data
             void clearAddressing();
 
+            //- Clear cell tree data
+            void clearCellTree();
+
             //- Clear all geometry and addressing unnecessary for CFD
             void clearOut();
 };
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C
index f11a901c7d..cc232c162f 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,6 +99,11 @@ void Foam::primitiveMesh::printAllocated() const
         Pout<< "    Cell-point" << endl;
     }
 
+    if (cellTreePtr_)
+    {
+        Pout<< "    Cell-tree" << endl;
+    }
+
     // Geometry
     if (cellCentresPtr_)
     {
@@ -165,6 +170,14 @@ void Foam::primitiveMesh::clearAddressing()
     deleteDemandDrivenData(pePtr_);
     deleteDemandDrivenData(ppPtr_);
     deleteDemandDrivenData(cpPtr_);
+
+    deleteDemandDrivenData(cellTreePtr_);
+}
+
+
+void Foam::primitiveMesh::clearCellTree()
+{
+    deleteDemandDrivenData(cellTreePtr_);
 }
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C
index a42befb41a..c7087aa70f 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,10 +26,8 @@ License
 #include "primitiveMesh.H"
 #include "cell.H"
 
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Is the point in the cell bounding box
 bool Foam::primitiveMesh::pointInCellBB
 (
     const point& p,
@@ -60,7 +58,6 @@ bool Foam::primitiveMesh::pointInCellBB
 }
 
 
-// Is the point in the cell
 bool Foam::primitiveMesh::pointInCell(const point& p, label celli) const
 {
     const labelList& f = cells()[celli];
@@ -86,7 +83,6 @@ bool Foam::primitiveMesh::pointInCell(const point& p, label celli) const
 }
 
 
-// Find the cell with the nearest cell centre
 Foam::label Foam::primitiveMesh::findNearestCell(const point& location) const
 {
     const vectorField& centres = cellCentres();
@@ -109,7 +105,6 @@ Foam::label Foam::primitiveMesh::findNearestCell(const point& location) const
 }
 
 
-// Find cell enclosing this location
 Foam::label Foam::primitiveMesh::findCell(const point& location) const
 {
     if (nCells() == 0)
diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
index 7e55cd872c..53e92c7f66 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -174,10 +174,10 @@ public:
             ) const;
 
             //- Return nearest point to p on tetrahedron
-            inline pointHit nearestPoint
-            (
-                const point& p
-            ) const;
+            inline pointHit nearestPoint(const point& p) const;
+
+            //- Return true if point is inside tetrahedron
+            inline bool inside(const point& pt) const;
 
             //- Return (min)containment sphere, i.e. the smallest sphere with
             //  all points inside. Returns pointHit with:
diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
index 38c9eae41c..0051951e6b 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -380,6 +380,82 @@ inline Foam::pointHit Foam::tetrahedron<Point, PointRef>::nearestPoint
 }
 
 
+template<class Point, class PointRef>
+bool Foam::tetrahedron<Point, PointRef>::inside(const point& pt) const
+{
+    // For robustness, assuming that the point is in the tet unless
+    // "definitively" shown otherwise by obtaining a positive dot
+    // product greater than a tolerance of SMALL.
+
+    // The tet is defined: tet(Cc, tetBasePt, pA, pB) where the normal
+    // vectors and base points for the half-space planes are:
+    // area[0] = Sa();
+    // area[1] = Sb();
+    // area[2] = Sc();
+    // area[3] = Sd();
+    // planeBase[0] = tetBasePt = b_
+    // planeBase[1] = ptA       = c_
+    // planeBase[2] = tetBasePt = b_
+    // planeBase[3] = tetBasePt = b_
+
+    vector n = vector::zero;
+
+    {
+        // 0, a
+        const point& basePt = b_;
+
+        n = Sa();
+        n /= (Foam::mag(n) + VSMALL);
+
+        if (((pt - basePt) & n) > SMALL)
+        {
+            return false;
+        }
+    }
+
+    {
+        // 1, b
+        const point& basePt = c_;
+
+        n = Sb();
+        n /= (Foam::mag(n) + VSMALL);
+
+        if (((pt - basePt) & n) > SMALL)
+        {
+            return false;
+        }
+    }
+
+    {
+        // 2, c
+        const point& basePt = b_;
+
+        n = Sc();
+        n /= (Foam::mag(n) + VSMALL);
+
+        if (((pt - basePt) & n) > SMALL)
+        {
+            return false;
+        }
+    }
+
+    {
+        // 3, d
+        const point& basePt = b_;
+
+        n = Sd();
+        n /= (Foam::mag(n) + VSMALL);
+
+        if (((pt - basePt) & n) > SMALL)
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
 template<class Point, class PointRef>
diff --git a/src/meshTools/octree/treeBoundBox.C b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C
similarity index 100%
rename from src/meshTools/octree/treeBoundBox.C
rename to src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C
diff --git a/src/meshTools/octree/treeBoundBox.H b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
similarity index 100%
rename from src/meshTools/octree/treeBoundBox.H
rename to src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
diff --git a/src/meshTools/octree/treeBoundBoxI.H b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H
similarity index 99%
rename from src/meshTools/octree/treeBoundBoxI.H
rename to src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H
index 7426e04708..1f069feb48 100644
--- a/src/meshTools/octree/treeBoundBoxI.H
+++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/octree/treeBoundBoxList.H b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxList.H
similarity index 96%
rename from src/meshTools/octree/treeBoundBoxList.H
rename to src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxList.H
index 610df2c1b1..b82eede2f0 100644
--- a/src/meshTools/octree/treeBoundBoxList.H
+++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/octree/treeBoundBoxTemplates.C b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxTemplates.C
similarity index 96%
rename from src/meshTools/octree/treeBoundBoxTemplates.C
rename to src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxTemplates.C
index c8cb5fab5d..09e0a9be7a 100644
--- a/src/meshTools/octree/treeBoundBoxTemplates.C
+++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index c140c449d5..425c8221cd 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,12 +32,6 @@ License
 #include "OFstream.H"
 #include "wallPolyPatch.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-template<class ParticleType>
-const Foam::scalar Foam::Cloud<ParticleType>::trackingCorrectionTol = 1e-5;
-
-
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
 template<class ParticleType>
@@ -47,7 +41,7 @@ void Foam::Cloud<ParticleType>::calcCellWallFaces() const
 
     PackedBoolList& cellWallFaces = cellWallFacesPtr_();
 
-    const polyBoundaryMesh& patches = pMesh().boundaryMesh();
+    const polyBoundaryMesh& patches = polyMesh_.boundaryMesh();
 
     forAll(patches, patchI)
     {
@@ -78,9 +72,7 @@ Foam::Cloud<ParticleType>::Cloud
     cloud(pMesh),
     IDLList<ParticleType>(),
     polyMesh_(pMesh),
-    particleCount_(0),
     labels_(),
-    cellTree_(),
     nTrackingRescues_(),
     cellWallFacesPtr_()
 {
@@ -104,9 +96,7 @@ Foam::Cloud<ParticleType>::Cloud
     cloud(pMesh, cloudName),
     IDLList<ParticleType>(),
     polyMesh_(pMesh),
-    particleCount_(0),
     labels_(),
-    cellTree_(),
     nTrackingRescues_(),
     cellWallFacesPtr_()
 {
@@ -121,236 +111,6 @@ Foam::Cloud<ParticleType>::Cloud
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class ParticleType>
-void Foam::Cloud<ParticleType>::findCellFacePt
-(
-    const point& pt,
-    label& cellI,
-    label& tetFaceI,
-    label& tetPtI
-) const
-{
-    cellI = -1;
-    tetFaceI = -1;
-    tetPtI = -1;
-
-    const indexedOctree<treeDataCell>& tree = cellTree();
-
-    // Find nearest cell to the point
-
-    pointIndexHit info = tree.findNearest(pt, sqr(GREAT));
-
-    if (info.hit())
-    {
-        label nearestCellI = tree.shapes().cellLabels()[info.index()];
-
-        // Check the nearest cell to see if the point is inside.
-        findFacePt(nearestCellI, pt, tetFaceI, tetPtI);
-
-        if (tetFaceI != -1)
-        {
-            // Point was in the nearest cell
-
-            cellI = nearestCellI;
-
-            return;
-        }
-        else
-        {
-            // Check the other possible cells that the point may be in
-
-            labelList testCells = tree.findIndices(pt);
-
-            forAll(testCells, pCI)
-            {
-                label testCellI = tree.shapes().cellLabels()[testCells[pCI]];
-
-                if (testCellI == nearestCellI)
-                {
-                    // Don't retest the nearest cell
-
-                    continue;
-                }
-
-                // Check the test cell to see if the point is inside.
-                findFacePt(testCellI, pt, tetFaceI, tetPtI);
-
-                if (tetFaceI != -1)
-                {
-                    // Point was in the test cell
-
-                    cellI = testCellI;
-
-                    return;
-                }
-            }
-        }
-    }
-    else
-    {
-        FatalErrorIn
-        (
-            "void Foam::Cloud<ParticleType>::findCellFacePt"
-            "("
-                "const point& pt, "
-                "label& cellI, "
-                "label& tetFaceI, "
-                "label& tetPtI"
-            ") const"
-        )   << "Did not find nearest cell in search tree."
-            << abort(FatalError);
-    }
-}
-
-
-template<class ParticleType>
-void Foam::Cloud<ParticleType>::findFacePt
-(
-    label cellI,
-    const point& pt,
-    label& tetFaceI,
-    label& tetPtI
-) const
-{
-    tetFaceI = -1;
-    tetPtI = -1;
-
-    List<tetIndices> cellTets = polyMeshTetDecomposition::cellTetIndices
-    (
-        polyMesh_,
-        cellI
-    );
-
-    forAll(cellTets, tetI)
-    {
-        const tetIndices& cellTetIs = cellTets[tetI];
-
-        if (inTet(pt, cellTetIs.tet(polyMesh_)))
-        {
-            tetFaceI = cellTetIs.face();
-            tetPtI = cellTetIs.tetPt();
-
-            return;
-        }
-    }
-}
-
-
-template<class ParticleType>
-bool Foam::Cloud<ParticleType>::inTet
-(
-    const point& pt,
-    const tetPointRef& tet
-) const
-{
-    // For robustness, assuming that the point is in the tet unless
-    // "definitively" shown otherwise by obtaining a positive dot
-    // product greater than a tolerance of SMALL.
-
-    // The tet is defined: tet(Cc, tetBasePt, pA, pB) where the normal
-    // vectors and base points for the half-space planes are:
-    // area[0] = tet.Sa();
-    // area[1] = tet.Sb();
-    // area[2] = tet.Sc();
-    // area[3] = tet.Sd();
-    // planeBase[0] = tetBasePt = tet.b()
-    // planeBase[1] = ptA       = tet.c()
-    // planeBase[2] = tetBasePt = tet.b()
-    // planeBase[3] = tetBasePt = tet.b()
-
-    vector n = vector::zero;
-
-    {
-        // 0, a
-        const point& basePt = tet.b();
-
-        n = tet.Sa();
-        n /= (mag(n) + VSMALL);
-
-        if (((pt - basePt) & n) > SMALL)
-        {
-            return false;
-        }
-    }
-
-    {
-        // 1, b
-        const point& basePt = tet.c();
-
-        n = tet.Sb();
-        n /= (mag(n) + VSMALL);
-
-        if (((pt - basePt) & n) > SMALL)
-        {
-            return false;
-        }
-    }
-
-    {
-        // 2, c
-        const point& basePt = tet.b();
-
-        n = tet.Sc();
-        n /= (mag(n) + VSMALL);
-
-        if (((pt - basePt) & n) > SMALL)
-        {
-            return false;
-        }
-    }
-
-    {
-        // 3, d
-        const point& basePt = tet.b();
-
-        n = tet.Sd();
-        n /= (mag(n) + VSMALL);
-
-        if (((pt - basePt) & n) > SMALL)
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-
-template<class ParticleType>
-const Foam::indexedOctree<Foam::treeDataCell>&
-Foam::Cloud<ParticleType>::cellTree() const
-{
-    if (cellTree_.empty())
-    {
-        treeBoundBox overallBb(polyMesh_.points());
-
-        Random rndGen(261782);
-
-        overallBb = overallBb.extend(rndGen, 1E-4);
-        overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
-        overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
-
-        cellTree_.reset
-        (
-            new indexedOctree<treeDataCell>
-            (
-                treeDataCell
-                (
-                    false,      // not cache bb
-                    polyMesh_
-                ),
-                overallBb,
-                8,              // maxLevel
-                10,             // leafsize
-                3.0             // duplicity
-            )
-        );
-    }
-
-    return cellTree_();
-}
-
-
 template<class ParticleType>
 const Foam::PackedBoolList& Foam::Cloud<ParticleType>::cellHasWallFaces()
 const
@@ -364,22 +124,6 @@ const
 }
 
 
-
-template<class ParticleType>
-Foam::label Foam::Cloud<ParticleType>::getNewParticleID() const
-{
-    label id = particleCount_++;
-
-    if (id == labelMax)
-    {
-        WarningIn("Cloud<ParticleType>::getNewParticleID() const")
-            << "Particle counter has overflowed. This might cause problems"
-            << " when reconstructing particle tracks." << endl;
-    }
-    return id;
-}
-
-
 template<class ParticleType>
 void Foam::Cloud<ParticleType>::addParticle(ParticleType* pPtr)
 {
@@ -399,14 +143,14 @@ void Foam::Cloud<ParticleType>::cloudReset(const Cloud<ParticleType>& c)
 {
     // Reset particle cound and particles only
     // - not changing the cloud object registry or reference to the polyMesh
-    particleCount_ = 0;
+    ParticleType::particleCount_ = 0;
     IDLList<ParticleType>::operator=(c);
 }
 
 
 template<class ParticleType>
-template<class TrackingData>
-void Foam::Cloud<ParticleType>::move(TrackingData& td, const scalar trackTime)
+template<class TrackData>
+void Foam::Cloud<ParticleType>::move(TrackData& td, const scalar trackTime)
 {
     const polyBoundaryMesh& pbm = pMesh().boundaryMesh();
     const globalMeshData& pData = polyMesh_.globalData();
@@ -472,9 +216,9 @@ void Foam::Cloud<ParticleType>::move(TrackingData& td, const scalar trackTime)
             {
                 // If we are running in parallel and the particle is on a
                 // boundary face
-                if (Pstream::parRun() && p.faceI_ >= pMesh().nInternalFaces())
+                if (Pstream::parRun() && p.face() >= pMesh().nInternalFaces())
                 {
-                    label patchI = pbm.whichPatch(p.faceI_);
+                    label patchI = pbm.whichPatch(p.face());
 
                     // ... and the face is on a processor patch
                     // prepare it for transfer
@@ -571,7 +315,7 @@ void Foam::Cloud<ParticleType>::move(TrackingData& td, const scalar trackTime)
                 IDLList<ParticleType> newParticles
                 (
                     particleStream,
-                    typename ParticleType::iNew(*this)
+                    typename ParticleType::iNew(polyMesh_)
                 );
 
                 label pI = 0;
@@ -600,57 +344,64 @@ void Foam::Cloud<ParticleType>::move(TrackingData& td, const scalar trackTime)
 
 
 template<class ParticleType>
-void Foam::Cloud<ParticleType>::autoMap(const mapPolyMesh& mapper)
+template<class TrackData>
+void Foam::Cloud<ParticleType>::autoMap
+(
+    TrackData& td,
+    const mapPolyMesh& mapper
+)
 {
     if (cloud::debug)
     {
-        Info<< "Cloud<ParticleType>::autoMap(const morphFieldMapper& map) "
-               "for lagrangian cloud " << cloud::name() << endl;
+        Info<< "Cloud<ParticleType>::autoMap(TrackData&, const mapPolyMesh&) "
+            << "for lagrangian cloud " << cloud::name() << endl;
     }
 
     const labelList& reverseCellMap = mapper.reverseCellMap();
     const labelList& reverseFaceMap = mapper.reverseFaceMap();
 
     // Reset stored data that relies on the mesh
-    cellTree_.clear();
+//    polyMesh_.clearCellTree();
     cellWallFacesPtr_.clear();
 
     forAllIter(typename Cloud<ParticleType>, *this, pIter)
     {
-        if (reverseCellMap[pIter().cellI_] >= 0)
-        {
-            pIter().cellI_ = reverseCellMap[pIter().cellI_];
+        ParticleType& p = pIter();
 
-            if (pIter().faceI_ >= 0 && reverseFaceMap[pIter().faceI_] >= 0)
+        if (reverseCellMap[p.cell()] >= 0)
+        {
+            p.cell() = reverseCellMap[p.cell()];
+
+            if (p.face() >= 0 && reverseFaceMap[p.face()] >= 0)
             {
-                pIter().faceI_ = reverseFaceMap[pIter().faceI_];
+                p.face() = reverseFaceMap[p.face()];
             }
             else
             {
-                pIter().faceI_ = -1;
+                p.face() = -1;
             }
 
-            pIter().initCellFacePt();
+            p.initCellFacePt();
         }
         else
         {
-            label trackStartCell = mapper.mergedCell(pIter().cellI_);
+            label trackStartCell = mapper.mergedCell(p.cell());
 
             if (trackStartCell < 0)
             {
                 trackStartCell = 0;
             }
 
-            vector p = pIter().position();
+            vector pos = p.position();
 
-            const_cast<vector&>(pIter().position()) =
+            const_cast<vector&>(p.position()) =
                 polyMesh_.cellCentres()[trackStartCell];
 
-            pIter().stepFraction() = 0;
+            p.stepFraction() = 0;
 
-            pIter().initCellFacePt();
+            p.initCellFacePt();
 
-            pIter().track(p);
+            p.track(pos, td);
         }
     }
 }
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index 3715bcb75c..488fc63f3d 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -25,6 +25,7 @@ Class
     Foam::Cloud
 
 Description
+    Base cloud calls templated on particle type
 
 SourceFiles
     Cloud.C
@@ -80,15 +81,9 @@ class Cloud
 
         const polyMesh& polyMesh_;
 
-        //- Overall count of particles ever created. Never decreases.
-        mutable label particleCount_;
-
         //- Temporary storage for addressing. Used in findTris.
         mutable DynamicList<label> labels_;
 
-        //- Search tree to allow spatial tet searching
-        mutable autoPtr<indexedOctree<treeDataCell> > cellTree_;
-
         //- Count of how many tracking rescue corrections have been
         //  applied
         mutable label nTrackingRescues_;
@@ -114,8 +109,7 @@ class Cloud
 
 public:
 
-    template<class ParticleT>
-    friend class Particle;
+    friend class particle;
     template<class ParticleT>
     friend class IOPosition;
 
@@ -133,10 +127,6 @@ public:
         //- Name of cloud properties dictionary
         static word cloudPropertiesName;
 
-        //- Fraction of distance to tet centre to move a particle to
-        // 'rescue' it from a tracking problem
-        static const scalar trackingCorrectionTol;
-
 
     // Constructors
 
@@ -184,65 +174,15 @@ public:
                 return polyMesh_;
             }
 
-            //- Is this global face an internal face?
-            bool internalFace(const label faceI) const
-            {
-                return polyMesh_.isInternalFace(faceI);
-            }
-
-            //- Is this global face a boundary face?
-            bool boundaryFace(const label faceI) const
-            {
-                return !internalFace(faceI);
-            }
-
-            //- Which patch is this global face on
-            label facePatch(const label faceI) const
-            {
-                return polyMesh_.boundaryMesh().whichPatch(faceI);
-            }
-
-            //- Which face of this patch is this global face
-            label patchFace(const label patchI, const label faceI) const
-            {
-                return polyMesh_.boundaryMesh()[patchI].whichFace(faceI);
-            }
-
             label size() const
             {
                 return IDLList<ParticleType>::size();
             };
 
-            //- Find the cell, tetFaceI and tetPtI for the given
-            //  position
-            void findCellFacePt
-            (
-                const point& pt,
-                label& cellI,
-                label& tetFaceI,
-                label& tetPtI
-            ) const;
-
-            //- Find the tetFaceI and tetPtI for the given position in
-            //  the supplied cell, tetFaceI and tetPtI = -1 if not
-            //  found
-            void findFacePt
-            (
-                label cellI,
-                const point& pt,
-                label& tetFaceI,
-                label& tetPtI
-            ) const;
-
-            //- Test if the given position is inside the give tet
-            bool inTet
-            (
-                const point& pt,
-                const tetPointRef& tet
-            ) const;
-
-            //- Build (if necessary) and return the cell search tree
-            const indexedOctree<treeDataCell>& cellTree() const;
+            DynamicList<label>& labels()
+            {
+                return labels_;
+            }
 
             //- Return nTrackingRescues
             label nTrackingRescues() const
@@ -314,9 +254,6 @@ public:
                 return IDLList<ParticleType>::clear();
             };
 
-            //- Get unique particle creation id
-            label getNewParticleID() const;
-
             //- Transfer particle to cloud
             void addParticle(ParticleType* pPtr);
 
@@ -328,12 +265,13 @@ public:
 
             //- Move the particles
             //  passing the TrackingData to the track function
-            template<class TrackingData>
-            void move(TrackingData& td, const scalar trackTime);
+            template<class TrackData>
+            void move(TrackData& td, const scalar trackTime);
 
             //- Remap the cells of particles corresponding to the
             //  mesh topology change
-            virtual void autoMap(const mapPolyMesh&);
+            template<class TrackData>
+            void autoMap(TrackData& td, const mapPolyMesh&);
 
 
         // Read
diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C
index 33d7913a77..f1ce310bac 100644
--- a/src/lagrangian/basic/Cloud/CloudIO.C
+++ b/src/lagrangian/basic/Cloud/CloudIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "Cloud.H"
-#include "Particle.H"
 #include "Time.H"
 #include "IOPosition.H"
 
@@ -58,12 +57,12 @@ void Foam::Cloud<ParticleType>::readCloudUniformProperties()
         if (uniformPropsDict.found(procName))
         {
             uniformPropsDict.subDict(procName).lookup("particleCount")
-                >> particleCount_;
+                >> ParticleType::particleCount_;
         }
     }
     else
     {
-        particleCount_ = 0;
+        ParticleType::particleCount_ = 0;
     }
 }
 
@@ -86,7 +85,7 @@ void Foam::Cloud<ParticleType>::writeCloudUniformProperties() const
     );
 
     labelList np(Pstream::nProcs(), 0);
-    np[Pstream::myProcNo()] = particleCount_;
+    np[Pstream::myProcNo()] = ParticleType::particleCount_;
 
     Pstream::listCombineGather(np, maxEqOp<label>());
     Pstream::listCombineScatter(np);
@@ -98,7 +97,12 @@ void Foam::Cloud<ParticleType>::writeCloudUniformProperties() const
         uniformPropsDict.subDict(procName).add("particleCount", np[i]);
     }
 
-    uniformPropsDict.regIOobject::write();
+    uniformPropsDict.writeObject
+    (
+        IOstream::ASCII,
+        IOstream::currentVersion,
+        time().writeCompression()
+    );
 }
 
 
@@ -107,7 +111,7 @@ void Foam::Cloud<ParticleType>::initCloud(const bool checkClass)
 {
     readCloudUniformProperties();
 
-    IOPosition<ParticleType> ioP(*this);
+    IOPosition<Cloud<ParticleType> > ioP(*this);
 
     if (ioP.headerOk())
     {
@@ -154,9 +158,7 @@ Foam::Cloud<ParticleType>::Cloud
 :
     cloud(pMesh),
     polyMesh_(pMesh),
-    particleCount_(0),
     labels_(),
-    cellTree_(),
     nTrackingRescues_(),
     cellWallFacesPtr_()
 {
@@ -174,9 +176,7 @@ Foam::Cloud<ParticleType>::Cloud
 :
     cloud(pMesh, cloudName),
     polyMesh_(pMesh),
-    particleCount_(0),
     labels_(),
-    cellTree_(),
     nTrackingRescues_(),
     cellWallFacesPtr_()
 {
@@ -262,8 +262,7 @@ void Foam::Cloud<ParticleType>::writeFields() const
 {
     if (this->size())
     {
-        const ParticleType& p = *this->first();
-        ParticleType::writeFields(p.cloud());
+        ParticleType::writeFields(*this);
     }
 }
 
diff --git a/src/lagrangian/basic/IOPosition/IOPosition.C b/src/lagrangian/basic/IOPosition/IOPosition.C
index e8d289d32e..13dd59285e 100644
--- a/src/lagrangian/basic/IOPosition/IOPosition.C
+++ b/src/lagrangian/basic/IOPosition/IOPosition.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,11 +27,8 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class ParticleType>
-Foam::IOPosition<ParticleType>::IOPosition
-(
-    const Cloud<ParticleType>& c
-)
+template<class CloudType>
+Foam::IOPosition<CloudType>::IOPosition(const CloudType& c)
 :
     regIOobject
     (
@@ -50,8 +47,8 @@ Foam::IOPosition<ParticleType>::IOPosition
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class ParticleType>
-bool Foam::IOPosition<ParticleType>::write() const
+template<class CloudType>
+bool Foam::IOPosition<CloudType>::write() const
 {
     if (cloud_.size())
     {
@@ -64,19 +61,18 @@ bool Foam::IOPosition<ParticleType>::write() const
 }
 
 
-template<class ParticleType>
-bool Foam::IOPosition<ParticleType>::writeData(Ostream& os) const
+template<class CloudType>
+bool Foam::IOPosition<CloudType>::writeData(Ostream& os) const
 {
     os  << cloud_.size() << nl << token::BEGIN_LIST << nl;
 
-    forAllConstIter(typename Cloud<ParticleType>, cloud_, iter)
+    forAllConstIter(typename CloudType, cloud_, iter)
     {
+        const typename CloudType::particleType& p = iter();
+
         // Prevent writing additional fields
-        static_cast<const Particle<ParticleType>&>(iter()).write
-        (
-            os,
-            false
-        );
+        p.write(os, false);
+
         os  << nl;
     }
 
@@ -86,13 +82,11 @@ bool Foam::IOPosition<ParticleType>::writeData(Ostream& os) const
 }
 
 
-template<class ParticleType>
-void Foam::IOPosition<ParticleType>::readData
-(
-    Cloud<ParticleType>& c,
-    bool checkClass
-)
+template<class CloudType>
+void Foam::IOPosition<CloudType>::readData(CloudType& c, bool checkClass)
 {
+    const polyMesh& mesh = c.pMesh();
+
     Istream& is = readStream(checkClass ? typeName : "");
 
     token firstToken(is);
@@ -102,16 +96,16 @@ void Foam::IOPosition<ParticleType>::readData
         label s = firstToken.labelToken();
 
         // Read beginning of contents
-        is.readBeginList("Cloud<ParticleType>");
+        is.readBeginList("IOPosition<CloudType>::readData(CloudType, bool)");
 
         for (label i=0; i<s; i++)
         {
             // Do not read any fields, position only
-            c.append(new ParticleType(c, is, false));
+            c.append(new typename CloudType::particleType(mesh, is, false));
         }
 
         // Read end of contents
-        is.readEndList("Cloud<ParticleType>");
+        is.readEndList("IOPosition<CloudType>::readData(CloudType, bool)");
     }
     else if (firstToken.isPunctuation())
     {
@@ -119,12 +113,10 @@ void Foam::IOPosition<ParticleType>::readData
         {
             FatalIOErrorIn
             (
-                "void IOPosition<ParticleType>::readData"
-                "(Cloud<ParticleType>&, bool)",
+                "void IOPosition<CloudType>::readData(CloudType&, bool)",
                 is
             )   << "incorrect first token, '(', found "
-                << firstToken.info()
-                << exit(FatalIOError);
+                << firstToken.info() << exit(FatalIOError);
         }
 
         token lastToken(is);
@@ -138,26 +130,24 @@ void Foam::IOPosition<ParticleType>::readData
         {
             is.putBack(lastToken);
             // Do not read any fields, position only
-            c.append(new ParticleType(c, is, false));
-            is >> lastToken;
+            c.append(new typename CloudType::particleType(mesh, is, false));
+            is  >> lastToken;
         }
     }
     else
     {
         FatalIOErrorIn
         (
-            "void IOPosition<ParticleType>::readData"
-            "(Cloud<ParticleType>&, bool)",
+            "void IOPosition<ParticleType>::readData(CloudType&, bool)",
             is
         )   << "incorrect first token, expected <int> or '(', found "
-            << firstToken.info()
-            << exit(FatalIOError);
+            << firstToken.info() << exit(FatalIOError);
     }
 
     // Check state of IOstream
     is.check
     (
-        "void IOPosition<ParticleType>::readData(Cloud<ParticleType>&, bool)"
+        "void IOPosition<CloudType>::readData(CloudType&, bool)"
     );
 }
 
diff --git a/src/lagrangian/basic/IOPosition/IOPosition.H b/src/lagrangian/basic/IOPosition/IOPosition.H
index a81e4a0d3b..645b0219cf 100644
--- a/src/lagrangian/basic/IOPosition/IOPosition.H
+++ b/src/lagrangian/basic/IOPosition/IOPosition.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ namespace Foam
                          Class IOPosition Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class ParticleType>
+template<class CloudType>
 class IOPosition
 :
     public regIOobject
@@ -55,7 +55,7 @@ class IOPosition
     // Private data
 
         //- Reference to the cloud
-        const Cloud<ParticleType>& cloud_;
+        const CloudType& cloud_;
 
 
 public:
@@ -65,19 +65,20 @@ public:
         //- Runtime type name information. Use cloud type.
         virtual const word& type() const
         {
-            return cloud_.type();
+            return Cloud<typename CloudType::particleType>::typeName;
+            //cloud_.type();
         }
 
 
     // Constructors
 
         //- Construct from cloud
-        IOPosition(const Cloud<ParticleType>&);
+        IOPosition(const CloudType&);
 
 
     // Member functions
 
-        virtual void readData(Cloud<ParticleType>& c, bool checkClass);
+        virtual void readData(CloudType& c, bool checkClass);
 
         virtual bool write() const;
 
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.C b/src/lagrangian/basic/InteractionLists/InteractionLists.C
index 862665e4ee..3a138449b5 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.C
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.C
@@ -29,6 +29,7 @@ License
 #include "treeDataFace.H"
 #include "treeDataCell.H"
 #include "volFields.H"
+#include "meshTools.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -1237,7 +1238,7 @@ void Foam::InteractionLists<ParticleType>::receiveReferredData
                 referredParticles_[constructMap[i]] = IDLList<ParticleType>
                 (
                     str,
-                    typename ParticleType::iNew(cloud_)
+                    typename ParticleType::iNew(mesh_)
                 );
             }
         }
diff --git a/src/lagrangian/basic/Make/files b/src/lagrangian/basic/Make/files
index cca45409c6..044d340f7a 100644
--- a/src/lagrangian/basic/Make/files
+++ b/src/lagrangian/basic/Make/files
@@ -1,8 +1,7 @@
-passiveParticle = passiveParticle
-indexedParticle = indexedParticle
-
-$(passiveParticle)/passiveParticleCloud.C
-$(indexedParticle)/indexedParticleCloud.C
+particle/particle.C
+particle/particleIO.C
+passiveParticle/passiveParticleCloud.C
+indexedParticle/indexedParticleCloud.C
 
 InteractionLists/referredWallFace/referredWallFace.C
 
diff --git a/src/lagrangian/basic/Make/options b/src/lagrangian/basic/Make/options
index 4b2f0a059f..f7d9a36f3b 100644
--- a/src/lagrangian/basic/Make/options
+++ b/src/lagrangian/basic/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
     -lmeshTools
diff --git a/src/lagrangian/basic/indexedParticle/indexedParticle.H b/src/lagrangian/basic/indexedParticle/indexedParticle.H
index 7d7dd52966..a13ff0d8a0 100644
--- a/src/lagrangian/basic/indexedParticle/indexedParticle.H
+++ b/src/lagrangian/basic/indexedParticle/indexedParticle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,18 +25,17 @@ Class
     Foam::indexedParticle
 
 Description
+    Adds label index to base particle
 
 SourceFiles
-    indexedParticleI.H
-    indexedParticle.C
-    indexedParticleIO.C
+    indexedParticle.H
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef indexedParticle_H
 #define indexedParticle_H
 
-#include "Particle.H"
+#include "particle.H"
 #include "IOstream.H"
 #include "autoPtr.H"
 
@@ -51,7 +50,7 @@ namespace Foam
 
 class indexedParticle
 :
-    public Particle<indexedParticle>
+    public particle
 {
     // Private data
 
@@ -65,7 +64,7 @@ public:
         //- Construct from components
         indexedParticle
         (
-            const Cloud<indexedParticle>& c,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             const label tetFaceI,
@@ -73,47 +72,44 @@ public:
             const label index = 0
         )
         :
-            Particle<indexedParticle>(c, position, cellI, tetFaceI, tetPtI),
+            particle(mesh, position, cellI, tetFaceI, tetPtI),
             index_(index)
         {}
 
         //- Construct from components, with searching for tetFace and tetPt
         indexedParticle
         (
-            const Cloud<indexedParticle>& c,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             const label index = 0
         )
         :
-            Particle<indexedParticle>(c, position, cellI),
+            particle(mesh, position, cellI),
             index_(index)
         {}
 
         //- Construct from Istream
         indexedParticle
         (
-            const Cloud<indexedParticle>& c,
+            const polyMesh& mesh,
             Istream& is,
             bool readFields = true
         )
         :
-            Particle<indexedParticle>(c, is, readFields)
+            particle(mesh, is, readFields)
         {}
 
         //- Construct as a copy
         indexedParticle(const indexedParticle& p)
         :
-            Particle<indexedParticle>(p)
+            particle(p)
         {}
 
         //- Construct and return a clone
-        virtual autoPtr<Particle<indexedParticle> > clone() const
+        virtual autoPtr<particle> clone() const
         {
-            return autoPtr<Particle<indexedParticle> >
-            (
-                new indexedParticle(*this)
-            );
+            return autoPtr<particle>(new indexedParticle(*this));
         }
 
 
diff --git a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C
index 2ef5de0b23..1e09140c0c 100644
--- a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C
+++ b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,6 @@ License
 
 namespace Foam
 {
-    defineParticleTypeNameAndDebug(indexedParticle, 0);
     defineTemplateTypeNameAndDebug(Cloud<indexedParticle>, 0);
 }
 
diff --git a/src/lagrangian/basic/particle/particle.C b/src/lagrangian/basic/particle/particle.C
new file mode 100644
index 0000000000..c2ae9af0d2
--- /dev/null
+++ b/src/lagrangian/basic/particle/particle.C
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2004-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "particle.H"
+#include "transform.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+Foam::label Foam::particle::particleCount_ = 0;
+
+const Foam::scalar Foam::particle::trackingCorrectionTol = 1e-5;
+
+namespace Foam
+{
+    defineTypeNameAndDebug(particle, 0);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::particle::particle
+(
+    const polyMesh& mesh,
+    const vector& position,
+    const label cellI,
+    const label tetFaceI,
+    const label tetPtI
+)
+:
+    mesh_(mesh),
+    position_(position),
+    cellI_(cellI),
+    faceI_(-1),
+    stepFraction_(0.0),
+    tetFaceI_(tetFaceI),
+    tetPtI_(tetPtI),
+    origProc_(Pstream::myProcNo()),
+    origId_(getNewParticleID())
+{}
+
+
+Foam::particle::particle
+(
+    const polyMesh& mesh,
+    const vector& position,
+    const label cellI,
+    bool doCellFacePt
+)
+:
+    mesh_(mesh),
+    position_(position),
+    cellI_(cellI),
+    faceI_(-1),
+    stepFraction_(0.0),
+    tetFaceI_(-1),
+    tetPtI_(-1),
+    origProc_(Pstream::myProcNo()),
+    origId_(getNewParticleID())
+{
+    if (doCellFacePt)
+    {
+        initCellFacePt();
+    }
+}
+
+
+Foam::particle::particle(const particle& p)
+:
+    mesh_(p.mesh_),
+    position_(p.position_),
+    cellI_(p.cellI_),
+    faceI_(p.faceI_),
+    stepFraction_(p.stepFraction_),
+    tetFaceI_(p.tetFaceI_),
+    tetPtI_(p.tetPtI_),
+    origProc_(p.origProc_),
+    origId_(p.origId_)
+{}
+
+
+Foam::particle::particle(const particle& p, const polyMesh& mesh)
+:
+    mesh_(mesh),
+    position_(p.position_),
+    cellI_(p.cellI_),
+    faceI_(p.faceI_),
+    stepFraction_(p.stepFraction_),
+    tetFaceI_(p.tetFaceI_),
+    tetPtI_(p.tetPtI_),
+    origProc_(p.origProc_),
+    origId_(p.origId_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::particle::transformPosition(const tensor& T)
+{
+    position_ = transform(T, position_);
+}
+
+
+void Foam::particle::transformProperties(const tensor&)
+{}
+
+
+void Foam::particle::transformProperties(const vector&)
+{}
+
+
+// * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * //
+
+bool Foam::operator==(const particle& pA, const particle& pB)
+{
+    return (pA.origProc() == pB.origProc() && pA.origId() == pB.origId());
+}
+
+
+bool Foam::operator!=(const particle& pA, const particle& pB)
+{
+    return !(pA == pB);
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/basic/Particle/Particle.H b/src/lagrangian/basic/particle/particle.H
similarity index 73%
rename from src/lagrangian/basic/Particle/Particle.H
rename to src/lagrangian/basic/particle/particle.H
index 484ca7ded0..f9b832348f 100644
--- a/src/lagrangian/basic/Particle/Particle.H
+++ b/src/lagrangian/basic/particle/particle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,108 +22,111 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::Particle
+    Foam::particle
 
 Description
+    Base particle class
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Particle_H
-#define Particle_H
+#ifndef particle_H
+#define particle_H
 
 #include "vector.H"
+#include "Cloud.H"
 #include "IDLList.H"
 #include "labelList.H"
 #include "pointField.H"
 #include "faceList.H"
-#include "typeInfo.H"
+//#include "typeInfo.H"
 #include "OFstream.H"
 #include "tetPointRef.H"
 #include "FixedList.H"
 #include "polyMeshTetDecomposition.H"
-#include "wallPolyPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-template<class Particle>
-class Cloud;
+// Forward declaration of classes
+class particle;
+
+class polyPatch;
 
-class wedgePolyPatch;
-class symmetryPolyPatch;
 class cyclicPolyPatch;
 class processorPolyPatch;
+class symmetryPolyPatch;
 class wallPolyPatch;
-class polyPatch;
+class wedgePolyPatch;
 
 // Forward declaration of friend functions and operators
 
-template<class ParticleType>
-class Particle;
-
-// Friend Operators
-
-template<class ParticleType>
 Ostream& operator<<
 (
     Ostream&,
-    const Particle<ParticleType>&
+    const particle&
 );
 
-template<class ParticleType>
-bool operator==(const Particle<ParticleType>&, const Particle<ParticleType>&);
+bool operator==(const particle&, const particle&);
 
-template<class ParticleType>
-bool operator!=(const Particle<ParticleType>&, const Particle<ParticleType>&);
+bool operator!=(const particle&, const particle&);
 
 /*---------------------------------------------------------------------------*\
-                           Class Particle Declaration
+                          Class Particle Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class ParticleType>
-class Particle
+class particle
 :
-    public IDLList<ParticleType>::link
+    public IDLList<particle>::link
 {
-
 public:
 
-    //- Class used to pass tracking data to the trackToFace function
-    class trackData
+    template<class CloudType>
+    class TrackingData
     {
-
         // Private data
 
-            //- Reference to the cloud containing this particle
-            Cloud<ParticleType>& cloud_;
+            //- Reference to the cloud containing (this) particle
+            CloudType& cloud_;
 
 
     public:
 
-        bool switchProcessor;
-        bool keepParticle;
+        // Public data
+
+            typedef CloudType cloudType;
+
+            //- Flag to switch processor
+            bool switchProcessor;
+
+            //- Flag to indicate whether to keep particle (false = delete)
+            bool keepParticle;
 
 
-        // Constructors
-
-            inline trackData(Cloud<ParticleType>& cloud);
+        // Constructor
+        TrackingData(CloudType& cloud)
+        :
+            cloud_(cloud)
+        {}
 
 
         // Member functions
 
             //- Return a reference to the cloud
-            inline Cloud<ParticleType>& cloud();
+            CloudType& cloud()
+            {
+                return cloud_;
+            }
     };
 
 
 protected:
 
-    // Private data
+    // Protected data
 
-        //- Reference to the particle cloud
-        const Cloud<ParticleType>& cloud_;
+        //- Reference to the polyMesh database
+        const polyMesh& mesh_;
 
         //- Position of particle
         vector position_;
@@ -156,7 +159,7 @@ protected:
     // Private Member Functions
 
         //- Find the tet tri faces between position and tet centre
-        inline void findTris
+        void findTris
         (
             const vector& position,
             DynamicList<label>& faceList,
@@ -179,18 +182,18 @@ protected:
             const label tetPtI
         ) const;
 
-         //- Find the lambda value for a moving tri face
-         inline scalar movingTetLambda
-         (
-             const vector& from,
-             const vector& to,
-             const label triI,
-             const vector& tetArea,
-             const label tetPlaneBasePtI,
-             const label cellI,
-             const label tetFaceI,
-             const label tetPtI
-         ) const;
+        //- Find the lambda value for a moving tri face
+        inline scalar movingTetLambda
+        (
+            const vector& from,
+            const vector& to,
+            const label triI,
+            const vector& tetArea,
+            const label tetPlaneBasePtI,
+            const label cellI,
+            const label tetFaceI,
+            const label tetPtI
+        ) const;
 
         //- Modify the tet owner data by crossing triI
         inline void tetNeighbour(label triI);
@@ -208,8 +211,10 @@ protected:
         //- Hit wall faces in the current cell if the
         //- wallImpactDistance is non-zero.  They may not be in
         //- different tets to the current.
+        template<class CloudType>
         inline void hitWallFaces
         (
+            const CloudType& td,
             const vector& from,
             const vector& to,
             scalar& lambdaMin,
@@ -239,37 +244,21 @@ protected:
 
         //- Overridable function to handle the particle hitting a wedgePatch
         template<class TrackData>
-        void hitWedgePatch
-        (
-            const wedgePolyPatch&,
-            TrackData& td
-        );
+        void hitWedgePatch(const wedgePolyPatch&, TrackData& td);
 
         //- Overridable function to handle the particle hitting a
         //  symmetryPatch
         template<class TrackData>
-        void hitSymmetryPatch
-        (
-            const symmetryPolyPatch&,
-            TrackData& td
-        );
+        void hitSymmetryPatch(const symmetryPolyPatch&, TrackData& td);
 
         //- Overridable function to handle the particle hitting a cyclicPatch
         template<class TrackData>
-        void hitCyclicPatch
-        (
-            const cyclicPolyPatch&,
-            TrackData& td
-        );
+        void hitCyclicPatch(const cyclicPolyPatch&, TrackData& td);
 
         //- Overridable function to handle the particle hitting a
         //  processorPatch
         template<class TrackData>
-        void hitProcessorPatch
-        (
-            const processorPolyPatch&,
-            TrackData& td
-        );
+        void hitProcessorPatch(const processorPolyPatch&, TrackData& td);
 
         //- Overridable function to handle the particle hitting a wallPatch
         template<class TrackData>
@@ -283,61 +272,33 @@ protected:
         //- Overridable function to handle the particle hitting a
         //  general patch
         template<class TrackData>
-        void hitPatch
-        (
-            const polyPatch&,
-            TrackData& td
-        );
-
-
-    // Transformations
-
-        //- Transform the position the particle
-        //  according to the given transformation tensor
-        virtual void transformPosition(const tensor& T);
-
-        //- Transform the physical properties of the particle
-        //  according to the given transformation tensor
-        virtual void transformProperties(const tensor& T);
-
-        //- Transform the physical properties of the particle
-        //  according to the given separation vector
-        virtual void transformProperties(const vector& separation);
-
-
-    // Parallel transfer
-
-        //- Convert global addressing to the processor patch
-        //  local equivalents
-        template<class TrackData>
-        void prepareForParallelTransfer(const label patchI, TrackData& td);
-
-        //- Convert processor patch addressing to the global equivalents
-        //  and set the cellI to the face-neighbour
-        template<class TrackData>
-        void correctAfterParallelTransfer(const label patchI, TrackData& td);
+        void hitPatch(const polyPatch&, TrackData& td);
 
 
 public:
 
-    friend class Cloud<ParticleType>;
-
-
     // Static data members
 
         //- Runtime type information
-        TypeName("Particle");
+        TypeName("particle");
 
         //- String representation of properties
         static string propHeader;
 
+        //- Cumulative particle counter - used to provode unique ID
+        static label particleCount_;
+
+        //- Fraction of distance to tet centre to move a particle to
+        // 'rescue' it from a tracking problem
+        static const scalar trackingCorrectionTol;
+
 
     // Constructors
 
         //- Construct from components
-        Particle
+        particle
         (
-            const Cloud<ParticleType>&,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             const label tetFaceI,
@@ -346,47 +307,27 @@ public:
 
         //- Construct from components, tetFaceI_ and tetPtI_ are not
         //  supplied so they will be deduced by a search
-        Particle
+        particle
         (
-            const Cloud<ParticleType>&,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             bool doCellFacePt = true
         );
 
         //- Construct from Istream
-        Particle
-        (
-            const Cloud<ParticleType>&,
-            Istream&,
-            bool readFields = true
-        );
+        particle(const polyMesh& mesh, Istream&, bool readFields = true);
 
         //- Construct as a copy
-        Particle(const Particle& p);
+        particle(const particle& p);
 
-        //- Construct as a copy
-        Particle(const Particle& p, const Cloud<ParticleType>& c);
+        //- Construct as a copy with refernce to a new mesh
+        particle(const particle& p, const polyMesh& mesh);
 
         //- Construct a clone
-        virtual autoPtr<Particle<ParticleType> > clone() const
+        virtual autoPtr<particle> clone() const
         {
-            return autoPtr<Particle<ParticleType> >
-            (
-                new Particle<ParticleType>(*this)
-            );
-        }
-
-        //- Construct a clone
-        virtual autoPtr<Particle<ParticleType> > clone
-        (
-            const Cloud<ParticleType>& c
-        ) const
-        {
-            return autoPtr<Particle<ParticleType> >
-            (
-                new Particle<ParticleType>(*this, c)
-            );
+            return autoPtr<particle>(new particle(*this));
         }
 
 
@@ -394,36 +335,24 @@ public:
         //  parallel transfer
         class iNew
         {
-            // Private data
-
-                //- Reference to the cloud
-                const Cloud<ParticleType>& cloud_;
-
+            const polyMesh& mesh_;
 
         public:
 
-            iNew(const Cloud<ParticleType>& cloud)
+            iNew(const polyMesh& mesh)
             :
-                cloud_(cloud)
+                mesh_(mesh)
             {}
 
-            autoPtr<ParticleType> operator()(Istream& is) const
+            autoPtr<particle> operator()(Istream& is) const
             {
-                return autoPtr<ParticleType>
-                (
-                    new ParticleType
-                    (
-                        cloud_,
-                        is,
-                        true
-                    )
-                );
+                return autoPtr<particle>(new particle(mesh_, is, true));
             }
         };
 
 
     //- Destructor
-    virtual ~Particle()
+    virtual ~particle()
     {}
 
 
@@ -431,6 +360,12 @@ public:
 
         // Access
 
+            //- Get unique particle creation id
+            inline label getNewParticleID() const;
+
+            //- Return the mesh database
+            inline const polyMesh& mesh() const;
+
             //- Return current particle position
             inline const vector& position() const;
 
@@ -478,9 +413,6 @@ public:
             //- Return current face particle is on otherwise -1
             inline label face() const;
 
-            //- Return reference to the particle cloud
-            inline const Cloud<ParticleType>& cloud() const;
-
             //- Return the impact model to be used, soft or hard (default).
             inline bool softImpact() const;
 
@@ -497,6 +429,12 @@ public:
             //- Is the particle on the boundary/(or outside the domain)?
             inline bool onBoundary() const;
 
+            //- Is this global face an internal face?
+            inline bool internalFace(const label faceI) const;
+
+            //- Is this global face a boundary face?
+            inline bool boundaryFace(const label faceI) const;
+
             //- Which patch is particle on
             inline label patch(const label faceI) const;
 
@@ -540,14 +478,7 @@ public:
             //  Returns the boundary face index if the track stops at the
             //  boundary, -1 otherwise.
             template<class TrackData>
-            label track
-            (
-                const vector& endPosition,
-                TrackData& td
-            );
-
-            //- Calls the templated track with dummy TrackData
-            label track(const vector& endPosition);
+            label track(const vector& endPosition, TrackData& td);
 
             //- Track particle to a given position and returns 1.0 if the
             //  trajectory is completed without hitting a face otherwise
@@ -556,50 +487,62 @@ public:
             //  on entry 'stepFraction()' should be set to the fraction of the
             //  time-step at which the tracking starts.
             template<class TrackData>
-            scalar trackToFace
-            (
-                const vector& endPosition,
-                TrackData& td
-            );
-
-            //- Calls the templated trackToFace with dummy TrackData
-            scalar trackToFace(const vector& endPosition);
+            scalar trackToFace(const vector& endPosition, TrackData& td);
 
             //- Return the index of the face to be used in the interpolation
             //  routine
             inline label faceInterpolation() const;
 
 
+    // Transformations
+
+        //- Transform the position the particle
+        //  according to the given transformation tensor
+        virtual void transformPosition(const tensor& T);
+
+        //- Transform the physical properties of the particle
+        //  according to the given transformation tensor
+        virtual void transformProperties(const tensor& T);
+
+        //- Transform the physical properties of the particle
+        //  according to the given separation vector
+        virtual void transformProperties(const vector& separation);
+
+
+    // Parallel transfer
+
+        //- Convert global addressing to the processor patch
+        //  local equivalents
+        template<class TrackData>
+        void prepareForParallelTransfer(const label patchI, TrackData& td);
+
+        //- Convert processor patch addressing to the global equivalents
+        //  and set the cellI to the face-neighbour
+        template<class TrackData>
+        void correctAfterParallelTransfer(const label patchI, TrackData& td);
+
+
     // I-O
 
         //- Read the fields associated with the owner cloud
-        static void readFields(Cloud<ParticleType>& c);
+        template<class CloudType>
+        static void readFields(CloudType& c);
 
         //- Write the fields associated with the owner cloud
-        static void writeFields(const Cloud<ParticleType>& c);
+        template<class CloudType>
+        static void writeFields(const CloudType& c);
 
         //- Write the particle data
         void write(Ostream& os, bool writeFields) const;
 
+
     // Friend Operators
 
-        friend Ostream& operator<< <ParticleType>
-        (
-            Ostream&,
-            const Particle<ParticleType>&
-        );
+        friend Ostream& operator<<(Ostream&, const particle&);
 
-        friend bool operator== <ParticleType>
-        (
-            const Particle<ParticleType>& pA,
-            const Particle<ParticleType>& pB
-        );
+        friend bool operator==(const particle& pA, const particle& pB);
 
-        friend bool operator!= <ParticleType>
-        (
-            const Particle<ParticleType>& pA,
-            const Particle<ParticleType>& pB
-        );
+        friend bool operator!=(const particle& pA, const particle& pB);
 };
 
 
@@ -609,18 +552,18 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "ParticleI.H"
-
+#include "particleI.H"
+/*
 #define defineParticleTypeNameAndDebug(Type, DebugSwitch)                     \
     template<>                                                                \
     const Foam::word Particle<Type>::typeName(#Type);                         \
     template<>                                                                \
     int Particle<Type>::debug(Foam::debug::debugSwitch(#Type, DebugSwitch));
-
+*/
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Particle.C"
+#   include "particleTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/basic/Particle/ParticleI.H b/src/lagrangian/basic/particle/particleI.H
similarity index 55%
rename from src/lagrangian/basic/Particle/ParticleI.H
rename to src/lagrangian/basic/particle/particleI.H
index 0c39aeeeae..ebb72c7cb5 100644
--- a/src/lagrangian/basic/Particle/ParticleI.H
+++ b/src/lagrangian/basic/particle/particleI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,11 +24,11 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "polyMesh.H"
+#include "Time.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-template<class ParticleType>
-inline void Foam::Particle<ParticleType>::findTris
+inline void Foam::particle::findTris
 (
     const vector& position,
     DynamicList<label>& faceList,
@@ -63,8 +63,7 @@ inline void Foam::Particle<ParticleType>::findTris
 }
 
 
-template<class ParticleType>
-inline Foam::scalar Foam::Particle<ParticleType>::tetLambda
+inline Foam::scalar Foam::particle::tetLambda
 (
     const vector& from,
     const vector& to,
@@ -76,10 +75,9 @@ inline Foam::scalar Foam::Particle<ParticleType>::tetLambda
     const label tetPtI
 ) const
 {
-    const polyMesh& mesh = cloud_.polyMesh_;
-    const pointField& pPts = mesh.points();
+    const pointField& pPts = mesh_.points();
 
-    if (mesh.moving())
+    if (mesh_.moving())
     {
         return movingTetLambda
         (
@@ -132,9 +130,7 @@ inline Foam::scalar Foam::Particle<ParticleType>::tetLambda
 }
 
 
-
-template<class ParticleType>
-inline Foam::scalar Foam::Particle<ParticleType>::movingTetLambda
+inline Foam::scalar Foam::particle::movingTetLambda
 (
     const vector& from,
     const vector& to,
@@ -146,9 +142,8 @@ inline Foam::scalar Foam::Particle<ParticleType>::movingTetLambda
     const label tetPtI
 ) const
 {
-    const polyMesh& mesh = cloud_.polyMesh_;
-    const pointField& pPts = mesh.points();
-    const pointField& oldPPts = mesh.oldPoints();
+    const pointField& pPts = mesh_.points();
+    const pointField& oldPPts = mesh_.oldPoints();
 
     // Base point of plane at end of motion
     const point& b = pPts[tetPlaneBasePtI];
@@ -166,13 +161,13 @@ inline Foam::scalar Foam::Particle<ParticleType>::movingTetLambda
     vector n0 = vector::zero;
 
     {
-        tetIndices tetIs(cellI, tetFaceI, tetPtI, mesh);
+        tetIndices tetIs(cellI, tetFaceI, tetPtI, mesh_);
 
         // tet at timestep start
-        tetPointRef tet00 = tetIs.oldTet(mesh);
+        tetPointRef tet00 = tetIs.oldTet(mesh_);
 
         // tet at timestep end
-        tetPointRef tet = tetIs.tet(mesh);
+        tetPointRef tet = tetIs.tet(mesh_);
 
         point tet0PtA = tet00.a() + stepFraction_*(tet.a() - tet00.a());
         point tet0PtB = tet00.b() + stepFraction_*(tet.b() - tet00.b());
@@ -329,25 +324,23 @@ inline Foam::scalar Foam::Particle<ParticleType>::movingTetLambda
 }
 
 
-template<class ParticleType>
-inline void Foam::Particle<ParticleType>::tetNeighbour(label triI)
-{
-    const polyMesh& mesh = cloud_.polyMesh_;
 
-    const labelList& pOwner = mesh.faceOwner();
-    const faceList& pFaces = mesh.faces();
+inline void Foam::particle::tetNeighbour(label triI)
+{
+    const labelList& pOwner = mesh_.faceOwner();
+    const faceList& pFaces = mesh_.faces();
 
     bool own = (pOwner[tetFaceI_] == cellI_);
 
     const Foam::face& f = pFaces[tetFaceI_];
 
-    label tetBasePtI = mesh.tetBasePtIs()[tetFaceI_];
+    label tetBasePtI = mesh_.tetBasePtIs()[tetFaceI_];
 
     if (tetBasePtI == -1)
     {
         FatalErrorIn
         (
-            "inline void Foam::Particle<ParticleType>::tetNeighbour(label triI)"
+            "inline void Foam::particle::tetNeighbour(label triI)"
         )
             << "No base point for face " << tetFaceI_ << ", " << f
             << ", produces a valid tet decomposition."
@@ -464,19 +457,18 @@ inline void Foam::Particle<ParticleType>::tetNeighbour(label triI)
             FatalErrorIn
             (
                 "inline void "
-                "Foam::Particle<ParticleType>::tetNeighbour(label triI)"
+                "Foam::particle::tetNeighbour(label triI)"
             )
                 << "Tet tri face index error, can only be 0..3, supplied "
-                << triI << nl
-                << abort(FatalError);
+                << triI << abort(FatalError);
 
             break;
         }
     }
 }
 
-template<class ParticleType>
-inline void Foam::Particle<ParticleType>::crossEdgeConnectedFace
+
+inline void Foam::particle::crossEdgeConnectedFace
 (
     const label& cellI,
     label& tetFaceI,
@@ -484,10 +476,8 @@ inline void Foam::Particle<ParticleType>::crossEdgeConnectedFace
     const edge& e
 )
 {
-    const polyMesh& mesh = cloud_.polyMesh_;
-
-    const faceList& pFaces = mesh.faces();
-    const cellList& pCells = mesh.cells();
+    const faceList& pFaces = mesh_.faces();
+    const cellList& pCells = mesh_.cells();
 
     const Foam::face& f = pFaces[tetFaceI];
 
@@ -536,14 +526,14 @@ inline void Foam::Particle<ParticleType>::crossEdgeConnectedFace
                 eIndex = findIndex(otherFace, e.end());
             }
 
-            label tetBasePtI = mesh.tetBasePtIs()[fI];
+            label tetBasePtI = mesh_.tetBasePtIs()[fI];
 
             if (tetBasePtI == -1)
             {
                 FatalErrorIn
                 (
                     "inline void "
-                    "Foam::Particle<ParticleType>::crossEdgeConnectedFace"
+                    "Foam::particle::crossEdgeConnectedFace"
                     "("
                         "const label& cellI,"
                         "label& tetFaceI,"
@@ -590,344 +580,117 @@ inline void Foam::Particle<ParticleType>::crossEdgeConnectedFace
 }
 
 
-template<class ParticleType>
-inline void Foam::Particle<ParticleType>::hitWallFaces
-(
-    const vector& from,
-    const vector& to,
-    scalar& lambdaMin,
-    tetIndices& closestTetIs
-)
-{
-    if (!(cloud_.hasWallImpactDistance() && cloud_.cellHasWallFaces()[cellI_]))
-    {
-        return;
-    }
-
-    const polyMesh& mesh = cloud_.polyMesh_;
-    const faceList& pFaces = mesh.faces();
-
-    const ParticleType& p = static_cast<const ParticleType&>(*this);
-
-    const Foam::cell& thisCell = mesh.cells()[cellI_];
-
-    const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
-    forAll(thisCell, cFI)
-    {
-        label fI = thisCell[cFI];
-
-        if (cloud_.internalFace(fI))
-        {
-            continue;
-        }
-
-        label patchI = patches.patchID()[fI - mesh.nInternalFaces()];
-
-        if (isA<wallPolyPatch>(patches[patchI]))
-        {
-            // Get the decomposition of this wall face
-
-            const List<tetIndices>& faceTetIs =
-                polyMeshTetDecomposition::faceTetIndices(mesh, fI, cellI_);
-
-            const Foam::face& f = pFaces[fI];
-
-            forAll(faceTetIs, tI)
-            {
-                const tetIndices& tetIs = faceTetIs[tI];
-
-                triPointRef tri = tetIs.faceTri(mesh);
-
-                vector n = tri.normal();
-
-                vector nHat = n/mag(n);
-
-                // Radius of particle with respect to this wall face
-                // triangle.  Assuming that the wallImpactDistance
-                // does not change as the particle or the mesh moves
-                // forward in time.
-                scalar r = p.wallImpactDistance(nHat);
-
-                vector toPlusRNHat = to + r*nHat;
-
-                // triI = 0 because it is the cell face tri of the tet
-                // we are concerned with.
-                scalar tetClambda = tetLambda
-                (
-                    tetIs.tet(mesh).centre(),
-                    toPlusRNHat,
-                    0,
-                    n,
-                    f[tetIs.faceBasePt()],
-                    cellI_,
-                    fI,
-                    tetIs.tetPt()
-                );
-
-                if ((tetClambda <= 0.0) || (tetClambda >= 1.0))
-                {
-                    // toPlusRNHat is not on the outside of the plane of
-                    // the wall face tri, the tri cannot be hit.
-                    continue;
-                }
-
-                // Check if the actual trajectory of the near-tri
-                // points intersects the triangle.
-
-                vector fromPlusRNHat = from + r*nHat;
-
-                // triI = 0 because it is the cell face tri of the tet
-                // we are concerned with.
-                scalar lambda = tetLambda
-                (
-                    fromPlusRNHat,
-                    toPlusRNHat,
-                    0,
-                    n,
-                    f[tetIs.faceBasePt()],
-                    cellI_,
-                    fI,
-                    tetIs.tetPt()
-                );
-
-                pointHit hitInfo(vector::zero);
-
-                if (mesh.moving())
-                {
-                    // For a moving mesh, the position of wall
-                    // triangle needs to be moved in time to be
-                    // consistent with the moment defined by the
-                    // current value of stepFraction and the value of
-                    // lambda just calculated.
-
-                    // Total fraction thought the timestep of the
-                    // motion, including stepFraction before the
-                    // current tracking step and the current
-                    // lambda
-                    // i.e.
-                    // let s = stepFraction, l = lambda
-                    // Motion of x in time:
-                    // |-----------------|---------|---------|
-                    // x00               x0        xi        x
-                    //
-                    // where xi is the correct value of x at the required
-                    // tracking instant.
-                    //
-                    // x0 = x00 + s*(x - x00) = s*x + (1 - s)*x00
-                    //
-                    // i.e. the motion covered by previous tracking portions
-                    // within this timestep, and
-                    //
-                    // xi = x0 + l*(x - x0)
-                    //    = l*x + (1 - l)*x0
-                    //    = l*x + (1 - l)*(s*x + (1 - s)*x00)
-                    //    = (s + l - s*l)*x + (1 - (s + l - s*l))*x00
-                    //
-                    // let m = (s + l - s*l)
-                    //
-                    // xi = m*x + (1 - m)*x00 = x00 + m*(x - x00);
-                    //
-                    // In the same form as before.
-
-                    // Clip lambda to 0.0-1.0 to ensure that sensible
-                    // positions are used for triangle intersections.
-                    scalar lam = max(0.0, min(1.0, lambda));
-
-                    scalar m = stepFraction_ + lam - (stepFraction_*lam);
-
-                    triPointRef tri00 = tetIs.oldFaceTri(mesh);
-
-                    // Use SMALL positive tolerance to make the triangle
-                    // slightly "fat" to improve robustness.  Intersection
-                    // is calculated as the ray (from + r*nHat) -> (to +
-                    // r*nHat).
-
-                    point tPtA = tri00.a() + m*(tri.a() - tri00.a());
-                    point tPtB = tri00.b() + m*(tri.b() - tri00.b());
-                    point tPtC = tri00.c() + m*(tri.c() - tri00.c());
-
-                    triPointRef t(tPtA, tPtB, tPtC);
-
-                    // The point fromPlusRNHat + m*(to - from) is on the
-                    // plane of the triangle.  Determine the
-                    // intersection with this triangle by testing if
-                    // this point is inside or outside of the triangle.
-                    hitInfo = t.intersection
-                    (
-                        fromPlusRNHat + m*(to - from),
-                        t.normal(),
-                        intersection::FULL_RAY,
-                        SMALL
-                    );
-                }
-                else
-                {
-                    // Use SMALL positive tolerance to make the triangle
-                    // slightly "fat" to improve robustness.  Intersection
-                    // is calculated as the ray (from + r*nHat) -> (to +
-                    // r*nHat).
-                    hitInfo = tri.intersection
-                    (
-                        fromPlusRNHat,
-                        (to - from),
-                        intersection::FULL_RAY,
-                        SMALL
-                    );
-                }
-
-                if (hitInfo.hit())
-                {
-                    if (lambda < lambdaMin)
-                    {
-                        lambdaMin = lambda;
-
-                        faceI_ = fI;
-
-                        closestTetIs = tetIs;
-                    }
-                }
-            }
-        }
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class ParticleType>
-inline Foam::Particle<ParticleType>::trackData::trackData
-(
-    Cloud<ParticleType>& cloud
-)
-:
-    cloud_(cloud)
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class ParticleType>
-inline Foam::Cloud<ParticleType>&
-Foam::Particle<ParticleType>::trackData::cloud()
+inline Foam::label Foam::particle::getNewParticleID() const
 {
-    return cloud_;
+    label id = particleCount_++;
+
+    if (id == labelMax)
+    {
+        WarningIn("particle::getNewParticleID() const")
+            << "Particle counter has overflowed. This might cause problems"
+            << " when reconstructing particle tracks." << endl;
+    }
+    return id;
 }
 
 
-template<class ParticleType>
-inline const Foam::Cloud<ParticleType>&
-Foam::Particle<ParticleType>::cloud() const
+inline const Foam::polyMesh& Foam::particle::mesh() const
 {
-    return cloud_;
+    return mesh_;
 }
 
 
-template<class ParticleType>
-inline const Foam::vector& Foam::Particle<ParticleType>::position() const
+inline const Foam::vector& Foam::particle::position() const
 {
     return position_;
 }
 
 
-template<class ParticleType>
-inline Foam::vector& Foam::Particle<ParticleType>::position()
+inline Foam::vector& Foam::particle::position()
 {
     return position_;
 }
 
 
-template<class ParticleType>
-inline Foam::label Foam::Particle<ParticleType>::cell() const
+inline Foam::label Foam::particle::cell() const
 {
     return cellI_;
 }
 
 
-template<class ParticleType>
-inline Foam::label& Foam::Particle<ParticleType>::cell()
+inline Foam::label& Foam::particle::cell()
 {
     return cellI_;
 }
 
 
-template<class ParticleType>
-inline Foam::label Foam::Particle<ParticleType>::tetFace() const
+inline Foam::label Foam::particle::tetFace() const
 {
     return tetFaceI_;
 }
 
 
-template<class ParticleType>
-inline Foam::label& Foam::Particle<ParticleType>::tetFace()
+inline Foam::label& Foam::particle::tetFace()
 {
     return tetFaceI_;
 }
 
 
-template<class ParticleType>
-inline Foam::label Foam::Particle<ParticleType>::tetPt() const
+inline Foam::label Foam::particle::tetPt() const
 {
     return tetPtI_;
 }
 
 
-template<class ParticleType>
-inline Foam::label& Foam::Particle<ParticleType>::tetPt()
+inline Foam::label& Foam::particle::tetPt()
 {
     return tetPtI_;
 }
 
 
-template<class ParticleType>
-inline Foam::tetIndices Foam::Particle<ParticleType>::currentTetIndices() const
+inline Foam::tetIndices Foam::particle::currentTetIndices() const
 {
-    return tetIndices(cellI_, tetFaceI_, tetPtI_, cloud_.polyMesh_);
+    return tetIndices(cellI_, tetFaceI_, tetPtI_, mesh_);
 }
 
 
-template<class ParticleType>
-inline Foam::tetPointRef Foam::Particle<ParticleType>::currentTet() const
+inline Foam::tetPointRef Foam::particle::currentTet() const
 {
-    return currentTetIndices().tet(cloud_.polyMesh_);
+    return currentTetIndices().tet(mesh_);
 }
 
 
-template<class ParticleType>
-inline Foam::vector Foam::Particle<ParticleType>::normal() const
+inline Foam::vector Foam::particle::normal() const
 {
-    return currentTetIndices().faceTri(cloud_.polyMesh_).normal();
+    return currentTetIndices().faceTri(mesh_).normal();
 }
 
 
-template<class ParticleType>
-inline Foam::vector
-Foam::Particle<ParticleType>::oldNormal() const
+inline Foam::vector Foam::particle::oldNormal() const
 {
-    return currentTetIndices().oldFaceTri(cloud_.polyMesh_).normal();
+    return currentTetIndices().oldFaceTri(mesh_).normal();
 }
 
 
-template<class ParticleType>
-inline Foam::label Foam::Particle<ParticleType>::face() const
+inline Foam::label Foam::particle::face() const
 {
     return faceI_;
 }
 
 
-template<class ParticleType>
-inline Foam::label& Foam::Particle<ParticleType>::face()
+inline Foam::label& Foam::particle::face()
 {
     return faceI_;
 }
 
 
-template<class ParticleType>
-inline void Foam::Particle<ParticleType>::initCellFacePt()
+inline void Foam::particle::initCellFacePt()
 {
     if (cellI_ == -1)
     {
-        cloud_.findCellFacePt
+        mesh_.findCellFacePt
         (
             position_,
             cellI_,
@@ -937,26 +700,20 @@ inline void Foam::Particle<ParticleType>::initCellFacePt()
 
         if (cellI_ == -1)
         {
-            FatalErrorIn
-            (
-                "Foam::Particle<ParticleType>::Particle"
-                "("
-                    "void Foam::Particle<ParticleType>::initCellFacePt()"
-                ")"
-            )   << "cell, tetFace and tetPt search failure at position "
-                << position_ << nl
-                << abort(FatalError);
+            FatalErrorIn("void Foam::particle::initCellFacePt()")
+                << "cell, tetFace and tetPt search failure at position "
+                << position_ << abort(FatalError);
         }
     }
     else
     {
-        cloud_.findFacePt(cellI_, position_, tetFaceI_, tetPtI_);
+        mesh_.findTetFacePt(cellI_, position_, tetFaceI_, tetPtI_);
 
         if (tetFaceI_ == -1 || tetPtI_ == -1)
         {
             label oldCellI = cellI_;
 
-            cloud_.findCellFacePt
+            mesh_.findCellFacePt
             (
                 position_,
                 cellI_,
@@ -970,23 +727,16 @@ inline void Foam::Particle<ParticleType>::initCellFacePt()
                 // number, but hasn't been able to find a cell to
                 // occupy.
 
-                if(!cloud_.polyMesh_.pointInCellBB(position_, oldCellI, 0.1))
+                if(!mesh_.pointInCellBB(position_, oldCellI, 0.1))
                 {
                     // If the position is not inside the (slightly
                     // extended) bound-box of the cell that it thought
                     // it should be in, then this is considered an
                     // error.
 
-                    FatalErrorIn
-                    (
-                        "Foam::Particle<ParticleType>::Particle"
-                        "("
-                            "void "
-                            "Foam::Particle<ParticleType>::initCellFacePt()"
-                        ")"
-                    )   << "cell, tetFace and tetPt search failure at position "
-                        << position_ << nl
-                        << "for requested cell " << oldCellI << nl
+                    FatalErrorIn("void Foam::particle::initCellFacePt()")
+                        << "cell, tetFace and tetPt search failure at position "
+                        << position_ << nl << "for requested cell " << oldCellI
                         << abort(FatalError);
                 }
 
@@ -1005,19 +755,17 @@ inline void Foam::Particle<ParticleType>::initCellFacePt()
 
                 point newPosition = position_;
 
-                const point& cC = cloud_.polyMesh_.cellCentres()[cellI_];
+                const point& cC = mesh_.cellCentres()[cellI_];
 
-                label trap(1.0/Cloud<ParticleType>::trackingCorrectionTol + 1);
+                label trap(1.0/trackingCorrectionTol + 1);
 
                 label iterNo = 0;
 
                 do
                 {
-                    newPosition +=
-                        Cloud<ParticleType>::trackingCorrectionTol
-                       *(cC - position_);
+                    newPosition += trackingCorrectionTol*(cC - position_);
 
-                    cloud_.findFacePt
+                    mesh_.findTetFacePt
                     (
                         cellI_,
                         newPosition,
@@ -1029,27 +777,14 @@ inline void Foam::Particle<ParticleType>::initCellFacePt()
 
                 } while (tetFaceI_ < 0  && iterNo <= trap);
 
-                if(tetFaceI_ == -1)
+                if (tetFaceI_ == -1)
                 {
-                    FatalErrorIn
-                    (
-                        "Foam::Particle<ParticleType>::Particle"
-                        "("
-                        "void "
-                        "Foam::Particle<ParticleType>::initCellFacePt()"
-                        ")"
-                    )   << "cell, tetFace and tetPt search failure at position "
-                        << position_ << nl
-                        << abort(FatalError);
+                    FatalErrorIn("void Foam::particle::initCellFacePt()")
+                        << "cell, tetFace and tetPt search failure at position "
+                        << position_ << abort(FatalError);
                 }
 
-                WarningIn
-                (
-                    "Foam::Particle<ParticleType>::Particle"
-                    "("
-                        "void Foam::Particle<ParticleType>::initCellFacePt()"
-                    ")"
-                )
+                WarningIn("void Foam::particle::initCellFacePt()")
                     << "Particle moved from " << position_
                     << " to " << newPosition
                     << " in cell " << cellI_
@@ -1067,13 +802,7 @@ inline void Foam::Particle<ParticleType>::initCellFacePt()
 
             if (cellI_ != oldCellI)
             {
-                WarningIn
-                (
-                    "Foam::Particle<ParticleType>::Particle"
-                    "("
-                        "void Foam::Particle<ParticleType>::initCellFacePt()"
-                    ")"
-                )
+                WarningIn("void Foam::particle::initCellFacePt()")
                     << "Particle at position " << position_
                     << " searched for a cell, tetFace and tetPt." << nl
                     << "    Found"
@@ -1089,99 +818,100 @@ inline void Foam::Particle<ParticleType>::initCellFacePt()
 }
 
 
-template<class ParticleType>
-inline bool Foam::Particle<ParticleType>::onBoundary() const
+inline bool Foam::particle::onBoundary() const
 {
-    return faceI_ != -1 && faceI_ >= cloud_.pMesh().nInternalFaces();
+    return faceI_ != -1 && faceI_ >= mesh_.nInternalFaces();
 }
 
 
-template<class ParticleType>
-inline Foam::scalar& Foam::Particle<ParticleType>::stepFraction()
+inline Foam::scalar& Foam::particle::stepFraction()
 {
     return stepFraction_;
 }
 
 
-template<class ParticleType>
-inline Foam::scalar Foam::Particle<ParticleType>::stepFraction() const
+inline Foam::scalar Foam::particle::stepFraction() const
 {
     return stepFraction_;
 }
 
 
-template<class ParticleType>
-inline Foam::label Foam::Particle<ParticleType>::origProc() const
+inline Foam::label Foam::particle::origProc() const
 {
     return origProc_;
 }
 
 
-template<class ParticleType>
-inline Foam::label& Foam::Particle<ParticleType>::origProc()
+inline Foam::label& Foam::particle::origProc()
 {
     return origProc_;
 }
 
 
-template<class ParticleType>
-inline Foam::label Foam::Particle<ParticleType>::origId() const
+inline Foam::label Foam::particle::origId() const
 {
     return origId_;
 }
 
 
-template<class ParticleType>
-inline Foam::label& Foam::Particle<ParticleType>::origId()
+inline Foam::label& Foam::particle::origId()
 {
     return origId_;
 }
 
 
-template<class ParticleType>
-inline bool Foam::Particle<ParticleType>::softImpact() const
+inline bool Foam::particle::softImpact() const
 {
     return false;
 }
 
 
-template<class ParticleType>
-inline Foam::scalar Foam::Particle<ParticleType>::currentTime() const
+inline Foam::scalar Foam::particle::currentTime() const
 {
     return
-        cloud_.pMesh().time().value()
-      + stepFraction_*cloud_.pMesh().time().deltaTValue();
+        mesh_.time().value()
+      + stepFraction_*mesh_.time().deltaTValue();
 }
 
 
-template<class ParticleType>
-inline Foam::label Foam::Particle<ParticleType>::patch(const label faceI) const
+inline bool Foam::particle::internalFace(const label faceI) const
 {
-    return cloud_.facePatch(faceI);
+    return mesh_.isInternalFace(faceI);
 }
 
 
-template<class ParticleType>
-inline Foam::label Foam::Particle<ParticleType>::patchFace
+bool Foam::particle::boundaryFace(const label faceI) const
+{
+    return !internalFace(faceI);
+}
+
+
+inline Foam::label Foam::particle::patch(const label faceI) const
+{
+//    return cloud_.facePatch(faceI);
+    return mesh_.boundaryMesh().whichPatch(faceI);
+}
+
+
+inline Foam::label Foam::particle::patchFace
 (
     const label patchI,
     const label faceI
 ) const
 {
-    return cloud_.patchFace(patchI, faceI);
+//    return cloud_.patchFace(patchI, faceI);
+    return mesh_.boundaryMesh()[patchI].whichFace(faceI);
 }
 
 
-template<class ParticleType>
 inline Foam::scalar
-Foam::Particle<ParticleType>::wallImpactDistance(const vector&) const
+Foam::particle::wallImpactDistance(const vector&) const
 {
     return 0.0;
 }
 
 
-template<class ParticleType>
-inline Foam::label Foam::Particle<ParticleType>::faceInterpolation() const
+inline Foam::label Foam::particle::faceInterpolation() const
 {
     return faceI_;
 }
diff --git a/src/lagrangian/basic/Particle/ParticleIO.C b/src/lagrangian/basic/particle/particleIO.C
similarity index 66%
rename from src/lagrangian/basic/Particle/ParticleIO.C
rename to src/lagrangian/basic/particle/particleIO.C
index 200fc019df..ab089d522b 100644
--- a/src/lagrangian/basic/Particle/ParticleIO.C
+++ b/src/lagrangian/basic/particle/particleIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,28 +23,21 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "Particle.H"
+#include "particle.H"
 #include "IOstreams.H"
 #include "IOPosition.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<class ParticleType>
-Foam::string Foam::Particle<ParticleType>::propHeader =
+Foam::string Foam::particle::propHeader =
     "(Px Py Pz) cellI tetFaceI tetPtI origProc origId";
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class ParticleType>
-Foam::Particle<ParticleType>::Particle
-(
-    const Cloud<ParticleType>& cloud,
-    Istream& is,
-    bool readFields
-)
+Foam::particle::particle(const polyMesh& mesh, Istream& is, bool readFields)
 :
-    cloud_(cloud),
+    mesh_(mesh),
     position_(),
     cellI_(-1),
     faceI_(-1),
@@ -97,81 +90,11 @@ Foam::Particle<ParticleType>::Particle
     }
 
     // Check state of Istream
-    is.check("Particle<ParticleType>::Particle(Istream&)");
+    is.check("particle::particle(Istream&, bool)");
 }
 
 
-template<class ParticleType>
-void Foam::Particle<ParticleType>::readFields
-(
-    Cloud<ParticleType>& c
-)
-{
-    if (!c.size())
-    {
-        return;
-    }
-
-    IOobject procIO(c.fieldIOobject("origProcId", IOobject::MUST_READ));
-
-    if (procIO.headerOk())
-    {
-        IOField<label> origProcId(procIO);
-        c.checkFieldIOobject(c, origProcId);
-        IOField<label> origId(c.fieldIOobject("origId", IOobject::MUST_READ));
-        c.checkFieldIOobject(c, origId);
-
-        label i = 0;
-        forAllIter(typename Cloud<ParticleType>, c, iter)
-        {
-            ParticleType& p = iter();
-
-            p.origProc_ = origProcId[i];
-            p.origId_ = origId[i];
-            i++;
-        }
-    }
-}
-
-
-template<class ParticleType>
-void Foam::Particle<ParticleType>::writeFields
-(
-    const Cloud<ParticleType>& c
-)
-{
-    // Write the cloud position file
-    IOPosition<ParticleType> ioP(c);
-    ioP.write();
-
-    label np =  c.size();
-
-    IOField<label> origProc
-    (
-        c.fieldIOobject
-        (
-            "origProcId",
-            IOobject::NO_READ
-        ),
-        np
-    );
-    IOField<label> origId(c.fieldIOobject("origId", IOobject::NO_READ), np);
-
-    label i = 0;
-    forAllConstIter(typename Cloud<ParticleType>, c, iter)
-    {
-        origProc[i] = iter().origProc_;
-        origId[i] = iter().origId_;
-        i++;
-    }
-
-    origProc.write();
-    origId.write();
-}
-
-
-template<class ParticleType>
-void Foam::Particle<ParticleType>::write(Ostream& os, bool writeFields) const
+void Foam::particle::write(Ostream& os, bool writeFields) const
 {
     if (os.format() == IOstream::ASCII)
     {
@@ -223,12 +146,11 @@ void Foam::Particle<ParticleType>::write(Ostream& os, bool writeFields) const
     }
 
     // Check state of Ostream
-    os.check("Particle<ParticleType>::write(Ostream& os, bool) const");
+    os.check("particle::write(Ostream& os, bool) const");
 }
 
 
-template<class ParticleType>
-Foam::Ostream& Foam::operator<<(Ostream& os, const Particle<ParticleType>& p)
+Foam::Ostream& Foam::operator<<(Ostream& os, const particle& p)
 {
     // Write all data
     p.write(os, true);
diff --git a/src/lagrangian/basic/Particle/Particle.C b/src/lagrangian/basic/particle/particleTemplates.C
similarity index 62%
rename from src/lagrangian/basic/Particle/Particle.C
rename to src/lagrangian/basic/particle/particleTemplates.C
index 28d71517d6..dbe8457a5c 100644
--- a/src/lagrangian/basic/Particle/Particle.C
+++ b/src/lagrangian/basic/particle/particleTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,19 +23,18 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "Particle.H"
-#include "Cloud.H"
-#include "wedgePolyPatch.H"
-#include "symmetryPolyPatch.H"
+#include "IOPosition.H"
+
 #include "cyclicPolyPatch.H"
 #include "processorPolyPatch.H"
-#include "transform.H"
+#include "symmetryPolyPatch.H"
+#include "wallPolyPatch.H"
+#include "wedgePolyPatch.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-template<class ParticleType>
 template<class TrackData>
-void Foam::Particle<ParticleType>::prepareForParallelTransfer
+void Foam::particle::prepareForParallelTransfer
 (
     const label patchI,
     TrackData& td
@@ -46,17 +45,15 @@ void Foam::Particle<ParticleType>::prepareForParallelTransfer
 }
 
 
-template<class ParticleType>
 template<class TrackData>
-void Foam::Particle<ParticleType>::correctAfterParallelTransfer
+void Foam::particle::correctAfterParallelTransfer
 (
     const label patchI,
     TrackData& td
 )
 {
     const processorPolyPatch& ppp =
-        refCast<const processorPolyPatch>
-        (cloud_.pMesh().boundaryMesh()[patchI]);
+        refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchI]);
 
     cellI_ = ppp.faceCells()[faceI_];
 
@@ -70,7 +67,7 @@ void Foam::Particle<ParticleType>::correctAfterParallelTransfer
         );
 
         transformPosition(T);
-        static_cast<ParticleType&>(*this).transformProperties(T);
+        transformProperties(T);
     }
     else if (ppp.separated())
     {
@@ -81,10 +78,7 @@ void Foam::Particle<ParticleType>::correctAfterParallelTransfer
           : ppp.separation()[faceI_]
         );
         position_ -= s;
-        static_cast<ParticleType&>(*this).transformProperties
-        (
-            -s
-        );
+        transformProperties(-s);
     }
 
     tetFaceI_ = faceI_ + ppp.start();
@@ -110,7 +104,7 @@ void Foam::Particle<ParticleType>::correctAfterParallelTransfer
     // This relationship can be verified for other points and sizes of
     // face.
 
-    tetPtI_ = cloud_.polyMesh_.faces()[tetFaceI_].size() - 1 - tetPtI_;
+    tetPtI_ = mesh_.faces()[tetFaceI_].size() - 1 - tetPtI_;
 
     // Reset the face index for the next tracking operation
     if (stepFraction_ > (1.0 - SMALL))
@@ -125,99 +119,69 @@ void Foam::Particle<ParticleType>::correctAfterParallelTransfer
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class ParticleType>
-Foam::Particle<ParticleType>::Particle
-(
-    const Cloud<ParticleType>& cloud,
-    const vector& position,
-    const label cellI,
-    const label tetFaceI,
-    const label tetPtI
-)
-:
-    cloud_(cloud),
-    position_(position),
-    cellI_(cellI),
-    faceI_(-1),
-    stepFraction_(0.0),
-    tetFaceI_(tetFaceI),
-    tetPtI_(tetPtI),
-    origProc_(Pstream::myProcNo()),
-    origId_(cloud_.getNewParticleID())
-{}
-
-
-template<class ParticleType>
-Foam::Particle<ParticleType>::Particle
-(
-    const Cloud<ParticleType>& cloud,
-    const vector& position,
-    const label cellI,
-    bool doCellFacePt
-)
-:
-    cloud_(cloud),
-    position_(position),
-    cellI_(cellI),
-    faceI_(-1),
-    stepFraction_(0.0),
-    tetFaceI_(-1),
-    tetPtI_(-1),
-    origProc_(Pstream::myProcNo()),
-    origId_(cloud_.getNewParticleID())
+template<class CloudType>
+void Foam::particle::readFields(CloudType& c)
 {
-    if (doCellFacePt)
+    if (!c.size())
     {
-        initCellFacePt();
+        return;
+    }
+
+    IOobject procIO(c.fieldIOobject("origProcId", IOobject::MUST_READ));
+
+    if (procIO.headerOk())
+    {
+        IOField<label> origProcId(procIO);
+        c.checkFieldIOobject(c, origProcId);
+        IOField<label> origId(c.fieldIOobject("origId", IOobject::MUST_READ));
+        c.checkFieldIOobject(c, origId);
+
+        label i = 0;
+        forAllIter(typename CloudType, c, iter)
+        {
+            particle& p = iter();
+
+            p.origProc_ = origProcId[i];
+            p.origId_ = origId[i];
+            i++;
+        }
     }
 }
 
 
-template<class ParticleType>
-Foam::Particle<ParticleType>::Particle(const Particle<ParticleType>& p)
-:
-    cloud_(p.cloud_),
-    position_(p.position_),
-    cellI_(p.cellI_),
-    faceI_(p.faceI_),
-    stepFraction_(p.stepFraction_),
-    tetFaceI_(p.tetFaceI_),
-    tetPtI_(p.tetPtI_),
-    origProc_(p.origProc_),
-    origId_(p.origId_)
-{}
+template<class CloudType>
+void Foam::particle::writeFields(const CloudType& c)
+{
+    // Write the cloud position file
+    IOPosition<CloudType> ioP(c);
+    ioP.write();
+
+    label np =  c.size();
+
+    IOField<label> origProc
+    (
+        c.fieldIOobject("origProcId", IOobject::NO_READ),
+        np
+    );
+    IOField<label> origId(c.fieldIOobject("origId", IOobject::NO_READ), np);
+
+    label i = 0;
+    forAllConstIter(typename CloudType, c, iter)
+    {
+        origProc[i] = iter().origProc_;
+        origId[i] = iter().origId_;
+        i++;
+    }
+
+    origProc.write();
+    origId.write();
+}
 
 
-template<class ParticleType>
-Foam::Particle<ParticleType>::Particle
-(
-    const Particle<ParticleType>& p,
-    const Cloud<ParticleType>& c
-)
-:
-    cloud_(c),
-    position_(p.position_),
-    cellI_(p.cellI_),
-    faceI_(p.faceI_),
-    stepFraction_(p.stepFraction_),
-    tetFaceI_(p.tetFaceI_),
-    tetPtI_(p.tetPtI_),
-    origProc_(p.origProc_),
-    origId_(p.origId_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class ParticleType>
 template<class TrackData>
-Foam::label Foam::Particle<ParticleType>::track
-(
-    const vector& endPosition,
-    TrackData& td
-)
+Foam::label Foam::particle::track(const vector& endPosition, TrackData& td)
 {
     faceI_ = -1;
 
@@ -231,28 +195,22 @@ Foam::label Foam::Particle<ParticleType>::track
 }
 
 
-
-template<class ParticleType>
-Foam::label Foam::Particle<ParticleType>::track(const vector& endPosition)
-{
-    int dummyTd;
-    return track(endPosition, dummyTd);
-}
-
-
-template<class ParticleType>
 template<class TrackData>
-Foam::scalar Foam::Particle<ParticleType>::trackToFace
+Foam::scalar Foam::particle::trackToFace
 (
     const vector& endPosition,
     TrackData& td
 )
 {
-    const polyMesh& mesh = cloud_.polyMesh_;
+    typedef typename TrackData::cloudType cloudType;
+    typedef typename cloudType::particleType particleType;
 
-    const faceList& pFaces = mesh.faces();
-    const pointField& pPts = mesh.points();
-    const vectorField& pC = mesh.cellCentres();
+    cloudType& cloud = td.cloud();
+
+
+    const faceList& pFaces = mesh_.faces();
+    const pointField& pPts = mesh_.points();
+    const vectorField& pC = mesh_.cellCentres();
 
     faceI_ = -1;
 
@@ -317,7 +275,7 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
     // current tet centre.
     scalar lambdaMin = VGREAT;
 
-    DynamicList<label>& tris = cloud_.labels_;
+    DynamicList<label>& tris = cloud.labels();
 
     // Tet indices that will be set by hitWallFaces if a wall face is
     // to be hit, or are set when any wall tri of a tet is hit.
@@ -336,9 +294,9 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
 
         const Foam::face& f = pFaces[tetFaceI_];
 
-        bool own = (mesh.faceOwner()[tetFaceI_] == cellI_);
+        bool own = (mesh_.faceOwner()[tetFaceI_] == cellI_);
 
-        label tetBasePtI = mesh.tetBasePtIs()[tetFaceI_];
+        label tetBasePtI = mesh_.tetBasePtIs()[tetFaceI_];
 
         label basePtI = f[tetBasePtI];
 
@@ -376,9 +334,7 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
                 Pout<< "tracking rescue using tetCentre from " << position();
             }
 
-            position_ +=
-                Cloud<ParticleType>::trackingCorrectionTol
-               *(tet.centre() - position_);
+            position_ += trackingCorrectionTol*(tet.centre() - position_);
 
             if (debug)
             {
@@ -386,12 +342,12 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
                     << (tet.centre() - position_) << endl;
             }
 
-            cloud_.trackingRescue();
+            cloud.trackingRescue();
 
             return trackFraction;
         }
 
-        if (triI != -1 && mesh.moving())
+        if (triI != -1 && mesh_.moving())
         {
             // Mesh motion requires stepFraction to be correct for
             // each tracking portion, so trackToFace must return after
@@ -423,7 +379,14 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
 
         // Sets a value for lambdaMin and faceI_ if a wall face is hit
         // by the track.
-        hitWallFaces(position_, endPosition, lambdaMin, faceHitTetIs);
+        hitWallFaces
+        (
+            cloud,
+            position_,
+            endPosition,
+            lambdaMin,
+            faceHitTetIs
+        );
 
         // Did not hit any tet tri faces, and no wall face has been
         // found to hit.
@@ -544,10 +507,10 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
 
     } while (faceI_ < 0);
 
-    ParticleType& p = static_cast<ParticleType&>(*this);
+    particleType& p = static_cast<particleType&>(*this);
     p.hitFace(td);
 
-    if (cloud_.internalFace(faceI_))
+    if (internalFace(faceI_))
     {
         // Change tet ownership because a tri face has been crossed,
         // in general this is:
@@ -556,21 +519,18 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
         // No modifications are required for triI = 0, no call required to
         //     tetNeighbour(0);
 
-        if (cellI_ == mesh.faceOwner()[faceI_])
+        if (cellI_ == mesh_.faceOwner()[faceI_])
         {
-            cellI_ = mesh.faceNeighbour()[faceI_];
+            cellI_ = mesh_.faceNeighbour()[faceI_];
         }
-        else if (cellI_ == mesh.faceNeighbour()[faceI_])
+        else if (cellI_ == mesh_.faceNeighbour()[faceI_])
         {
-            cellI_ = mesh.faceOwner()[faceI_];
+            cellI_ = mesh_.faceOwner()[faceI_];
         }
         else
         {
-            FatalErrorIn
-            (
-                "Particle::trackToFace(const vector&, TrackData&)"
-            )   << "addressing failure" << nl
-                << abort(FatalError);
+            FatalErrorIn("Particle::trackToFace(const vector&, TrackData&)")
+                << "addressing failure" << abort(FatalError);
         }
     }
     else
@@ -585,7 +545,7 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
         (
             !p.hitPatch
             (
-                mesh.boundaryMesh()[patchI],
+                mesh_.boundaryMesh()[patchI],
                 td,
                 patchI,
                 trackFraction,
@@ -599,7 +559,7 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
                 patchI = patch(faceI_);
             }
 
-            const polyPatch& patch = mesh.boundaryMesh()[patchI];
+            const polyPatch& patch = mesh_.boundaryMesh()[patchI];
 
             if (isA<wedgePolyPatch>(patch))
             {
@@ -656,22 +616,20 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
                 << "from " << position();
         }
 
-        position_ +=
-            Cloud<ParticleType>::trackingCorrectionTol
-           *(tet.centre() - position_);
+        position_ += trackingCorrectionTol*(tet.centre() - position_);
 
         if
         (
-            cloud_.hasWallImpactDistance()
-            && !cloud_.internalFace(faceHitTetIs.face())
-            && cloud_.cellHasWallFaces()[faceHitTetIs.cell()]
+            cloud.hasWallImpactDistance()
+         && !internalFace(faceHitTetIs.face())
+         && cloud.cellHasWallFaces()[faceHitTetIs.cell()]
         )
         {
-            const polyBoundaryMesh& patches = mesh.boundaryMesh();
+            const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
             label fI = faceHitTetIs.face();
 
-            label patchI = patches.patchID()[fI - mesh.nInternalFaces()];
+            label patchI = patches.patchID()[fI - mesh_.nInternalFaces()];
 
             if (isA<wallPolyPatch>(patches[patchI]))
             {
@@ -686,9 +644,9 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
                 // position that hit the wall that is in need of a
                 // rescue correction.
 
-                triPointRef wallTri = faceHitTetIs.faceTri(mesh);
+                triPointRef wallTri = faceHitTetIs.faceTri(mesh_);
 
-                tetPointRef wallTet = faceHitTetIs.tet(mesh);
+                tetPointRef wallTet = faceHitTetIs.tet(mesh_);
 
                 vector nHat = wallTri.normal();
                 nHat /= mag(nHat);
@@ -701,7 +659,7 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
                 // normal direction is larger towards the wall than
                 // the new correction is away from it.
                 position_ +=
-                    Cloud<ParticleType>::trackingCorrectionTol
+                    trackingCorrectionTol
                    *(
                         (wallTet.centre() - (position_ + r*nHat))
                       - (nHat & (tet.centre() - position_))*nHat
@@ -714,50 +672,221 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
             Pout<< " to " << position() << endl;
         }
 
-        cloud_.trackingRescue();
+        cloud.trackingRescue();
     }
 
     return trackFraction;
 }
 
 
-template<class ParticleType>
-Foam::scalar Foam::Particle<ParticleType>::trackToFace
+template<class CloudType>
+void Foam::particle::hitWallFaces
 (
-    const vector& endPosition
+    const CloudType& cloud,
+    const vector& from,
+    const vector& to,
+    scalar& lambdaMin,
+    tetIndices& closestTetIs
 )
 {
-    int dummyTd;
-    return trackToFace(endPosition, dummyTd);
+    if (!(cloud.hasWallImpactDistance() && cloud.cellHasWallFaces()[cellI_]))
+    {
+        return;
+    }
+
+    const faceList& pFaces = mesh_.faces();
+
+    const Foam::cell& thisCell = mesh_.cells()[cellI_];
+
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    forAll(thisCell, cFI)
+    {
+        label fI = thisCell[cFI];
+
+        if (internalFace(fI))
+        {
+            continue;
+        }
+
+        label patchI = patches.patchID()[fI - mesh_.nInternalFaces()];
+
+        if (isA<wallPolyPatch>(patches[patchI]))
+        {
+            // Get the decomposition of this wall face
+
+            const List<tetIndices>& faceTetIs =
+                polyMeshTetDecomposition::faceTetIndices(mesh_, fI, cellI_);
+
+            const Foam::face& f = pFaces[fI];
+
+            forAll(faceTetIs, tI)
+            {
+                const tetIndices& tetIs = faceTetIs[tI];
+
+                triPointRef tri = tetIs.faceTri(mesh_);
+
+                vector n = tri.normal();
+
+                vector nHat = n/mag(n);
+
+                // Radius of particle with respect to this wall face
+                // triangle.  Assuming that the wallImpactDistance
+                // does not change as the particle or the mesh moves
+                // forward in time.
+                scalar r = wallImpactDistance(nHat);
+
+                vector toPlusRNHat = to + r*nHat;
+
+                // triI = 0 because it is the cell face tri of the tet
+                // we are concerned with.
+                scalar tetClambda = tetLambda
+                (
+                    tetIs.tet(mesh_).centre(),
+                    toPlusRNHat,
+                    0,
+                    n,
+                    f[tetIs.faceBasePt()],
+                    cellI_,
+                    fI,
+                    tetIs.tetPt()
+                );
+
+                if ((tetClambda <= 0.0) || (tetClambda >= 1.0))
+                {
+                    // toPlusRNHat is not on the outside of the plane of
+                    // the wall face tri, the tri cannot be hit.
+                    continue;
+                }
+
+                // Check if the actual trajectory of the near-tri
+                // points intersects the triangle.
+
+                vector fromPlusRNHat = from + r*nHat;
+
+                // triI = 0 because it is the cell face tri of the tet
+                // we are concerned with.
+                scalar lambda = tetLambda
+                (
+                    fromPlusRNHat,
+                    toPlusRNHat,
+                    0,
+                    n,
+                    f[tetIs.faceBasePt()],
+                    cellI_,
+                    fI,
+                    tetIs.tetPt()
+                );
+
+                pointHit hitInfo(vector::zero);
+
+                if (mesh_.moving())
+                {
+                    // For a moving mesh, the position of wall
+                    // triangle needs to be moved in time to be
+                    // consistent with the moment defined by the
+                    // current value of stepFraction and the value of
+                    // lambda just calculated.
+
+                    // Total fraction thought the timestep of the
+                    // motion, including stepFraction before the
+                    // current tracking step and the current
+                    // lambda
+                    // i.e.
+                    // let s = stepFraction, l = lambda
+                    // Motion of x in time:
+                    // |-----------------|---------|---------|
+                    // x00               x0        xi        x
+                    //
+                    // where xi is the correct value of x at the required
+                    // tracking instant.
+                    //
+                    // x0 = x00 + s*(x - x00) = s*x + (1 - s)*x00
+                    //
+                    // i.e. the motion covered by previous tracking portions
+                    // within this timestep, and
+                    //
+                    // xi = x0 + l*(x - x0)
+                    //    = l*x + (1 - l)*x0
+                    //    = l*x + (1 - l)*(s*x + (1 - s)*x00)
+                    //    = (s + l - s*l)*x + (1 - (s + l - s*l))*x00
+                    //
+                    // let m = (s + l - s*l)
+                    //
+                    // xi = m*x + (1 - m)*x00 = x00 + m*(x - x00);
+                    //
+                    // In the same form as before.
+
+                    // Clip lambda to 0.0-1.0 to ensure that sensible
+                    // positions are used for triangle intersections.
+                    scalar lam = max(0.0, min(1.0, lambda));
+
+                    scalar m = stepFraction_ + lam - (stepFraction_*lam);
+
+                    triPointRef tri00 = tetIs.oldFaceTri(mesh_);
+
+                    // Use SMALL positive tolerance to make the triangle
+                    // slightly "fat" to improve robustness.  Intersection
+                    // is calculated as the ray (from + r*nHat) -> (to +
+                    // r*nHat).
+
+                    point tPtA = tri00.a() + m*(tri.a() - tri00.a());
+                    point tPtB = tri00.b() + m*(tri.b() - tri00.b());
+                    point tPtC = tri00.c() + m*(tri.c() - tri00.c());
+
+                    triPointRef t(tPtA, tPtB, tPtC);
+
+                    // The point fromPlusRNHat + m*(to - from) is on the
+                    // plane of the triangle.  Determine the
+                    // intersection with this triangle by testing if
+                    // this point is inside or outside of the triangle.
+                    hitInfo = t.intersection
+                    (
+                        fromPlusRNHat + m*(to - from),
+                        t.normal(),
+                        intersection::FULL_RAY,
+                        SMALL
+                    );
+                }
+                else
+                {
+                    // Use SMALL positive tolerance to make the triangle
+                    // slightly "fat" to improve robustness.  Intersection
+                    // is calculated as the ray (from + r*nHat) -> (to +
+                    // r*nHat).
+                    hitInfo = tri.intersection
+                    (
+                        fromPlusRNHat,
+                        (to - from),
+                        intersection::FULL_RAY,
+                        SMALL
+                    );
+                }
+
+                if (hitInfo.hit())
+                {
+                    if (lambda < lambdaMin)
+                    {
+                        lambdaMin = lambda;
+
+                        faceI_ = fI;
+
+                        closestTetIs = tetIs;
+                    }
+                }
+            }
+        }
+    }
 }
 
 
-template<class ParticleType>
-void Foam::Particle<ParticleType>::transformPosition(const tensor& T)
-{
-    position_ = transform(T, position_);
-}
-
-
-template<class ParticleType>
-void Foam::Particle<ParticleType>::transformProperties(const tensor&)
-{}
-
-
-template<class ParticleType>
-void Foam::Particle<ParticleType>::transformProperties(const vector&)
-{}
-
-
-template<class ParticleType>
 template<class TrackData>
-void Foam::Particle<ParticleType>::hitFace(TrackData&)
+void Foam::particle::hitFace(TrackData&)
 {}
 
 
-template<class ParticleType>
 template<class TrackData>
-bool Foam::Particle<ParticleType>::hitPatch
+bool Foam::particle::hitPatch
 (
     const polyPatch&,
     TrackData&,
@@ -770,9 +899,8 @@ bool Foam::Particle<ParticleType>::hitPatch
 }
 
 
-template<class ParticleType>
 template<class TrackData>
-void Foam::Particle<ParticleType>::hitWedgePatch
+void Foam::particle::hitWedgePatch
 (
     const wedgePolyPatch& wpp,
     TrackData&
@@ -780,7 +908,7 @@ void Foam::Particle<ParticleType>::hitWedgePatch
 {
     FatalErrorIn
     (
-        "void Foam::Particle<ParticleType>::hitWedgePatch"
+        "void Foam::particle::hitWedgePatch"
         "("
             "const wedgePolyPatch& wpp, "
             "TrackData&"
@@ -791,13 +919,12 @@ void Foam::Particle<ParticleType>::hitWedgePatch
     vector nf = normal();
     nf /= mag(nf);
 
-    static_cast<ParticleType&>(*this).transformProperties(I - 2.0*nf*nf);
+    transformProperties(I - 2.0*nf*nf);
 }
 
 
-template<class ParticleType>
 template<class TrackData>
-void Foam::Particle<ParticleType>::hitSymmetryPatch
+void Foam::particle::hitSymmetryPatch
 (
     const symmetryPolyPatch& spp,
     TrackData&
@@ -806,28 +933,25 @@ void Foam::Particle<ParticleType>::hitSymmetryPatch
     vector nf = normal();
     nf /= mag(nf);
 
-    static_cast<ParticleType&>(*this).transformProperties(I - 2.0*nf*nf);
+    transformProperties(I - 2.0*nf*nf);
 }
 
 
-template<class ParticleType>
 template<class TrackData>
-void Foam::Particle<ParticleType>::hitCyclicPatch
+void Foam::particle::hitCyclicPatch
 (
     const cyclicPolyPatch& cpp,
-    TrackData&
+    TrackData& td
 )
 {
-    // label patchFaceI_ = cpp.whichFace(faceI_);
-
     faceI_ = cpp.transformGlobalFace(faceI_);
 
-    cellI_ = cloud_.polyMesh_.faceOwner()[faceI_];
+    cellI_ = mesh_.faceOwner()[faceI_];
 
     tetFaceI_ = faceI_;
 
     // See note in correctAfterParallelTransfer for tetPtI_ addressing.
-    tetPtI_ = cloud_.polyMesh_.faces()[tetFaceI_].size() - 1 - tetPtI_;
+    tetPtI_ = mesh_.faces()[tetFaceI_].size() - 1 - tetPtI_;
 
     const cyclicPolyPatch& receiveCpp = cpp.neighbPatch();
 
@@ -843,7 +967,7 @@ void Foam::Particle<ParticleType>::hitCyclicPatch
         );
 
         transformPosition(T);
-        static_cast<ParticleType&>(*this).transformProperties(T);
+        transformProperties(T);
     }
     else if (receiveCpp.separated())
     {
@@ -854,75 +978,29 @@ void Foam::Particle<ParticleType>::hitCyclicPatch
           : receiveCpp.separation()[receiveCpp.whichFace(faceI_)]
         );
         position_ -= s;
-        static_cast<ParticleType&>(*this).transformProperties
-        (
-            -s
-        );
+        transformProperties(-s);
     }
 }
 
 
-template<class ParticleType>
 template<class TrackData>
-void Foam::Particle<ParticleType>::hitProcessorPatch
-(
-    const processorPolyPatch& spp,
-    TrackData& td
-)
+void Foam::particle::hitProcessorPatch(const processorPolyPatch&, TrackData&)
 {}
 
 
-template<class ParticleType>
 template<class TrackData>
-void Foam::Particle<ParticleType>::hitWallPatch
+void Foam::particle::hitWallPatch
 (
-    const wallPolyPatch& spp,
+    const wallPolyPatch&,
     TrackData&,
     const tetIndices&
 )
 {}
 
 
-template<class ParticleType>
 template<class TrackData>
-void Foam::Particle<ParticleType>::hitPatch
-(
-    const polyPatch& spp,
-    TrackData&
-)
+void Foam::particle::hitPatch(const polyPatch&, TrackData&)
 {}
 
 
-// * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * //
-
-template<class ParticleType>
-bool Foam::operator==
-(
-    const Particle<ParticleType>& pA,
-    const Particle<ParticleType>& pB
-)
-{
-    return
-    (
-        pA.origProc() == pB.origProc()
-     && pA.origId() == pB.origId()
-    );
-}
-
-
-template<class ParticleType>
-bool Foam::operator!=
-(
-    const Particle<ParticleType>& pA,
-    const Particle<ParticleType>& pB
-)
-{
-    return !(pA == pB);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "ParticleIO.C"
-
 // ************************************************************************* //
diff --git a/src/lagrangian/basic/passiveParticle/passiveParticle.H b/src/lagrangian/basic/passiveParticle/passiveParticle.H
index 2052065155..23a28c9c12 100644
--- a/src/lagrangian/basic/passiveParticle/passiveParticle.H
+++ b/src/lagrangian/basic/passiveParticle/passiveParticle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,15 +25,17 @@ Class
     Foam::passiveParticle
 
 Description
+    Copy of base particle
 
 SourceFiles
+    passiveParticle.H
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef passiveParticle_H
 #define passiveParticle_H
 
-#include "Particle.H"
+#include "particle.H"
 #include "IOstream.H"
 #include "autoPtr.H"
 
@@ -48,7 +50,7 @@ namespace Foam
 
 class passiveParticle
 :
-    public Particle<passiveParticle>
+    public particle
 {
 
 public:
@@ -58,53 +60,50 @@ public:
         //- Construct from components
         passiveParticle
         (
-            const Cloud<passiveParticle>& c,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             const label tetFaceI,
             const label tetPtI
         )
         :
-            Particle<passiveParticle>(c, position, cellI, tetFaceI, tetPtI)
+            particle(mesh, position, cellI, tetFaceI, tetPtI)
         {}
 
         //- Construct from components, with searching for tetFace and
         //  tetPt unless disabled by doCellFacePt = false.
         passiveParticle
         (
-            const Cloud<passiveParticle>& c,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             bool doCellFacePt = true
         )
         :
-            Particle<passiveParticle>(c, position, cellI, doCellFacePt)
+            particle(mesh, position, cellI, doCellFacePt)
         {}
 
         //- Construct from Istream
         passiveParticle
         (
-            const Cloud<passiveParticle>& c,
+            const polyMesh& mesh,
             Istream& is,
             bool readFields = true
         )
         :
-            Particle<passiveParticle>(c, is, readFields)
+            particle(mesh, is, readFields)
         {}
 
         //- Construct as copy
         passiveParticle(const passiveParticle& p)
         :
-            Particle<passiveParticle>(p)
+            particle(p)
         {}
 
         //- Construct and return a clone
-        virtual autoPtr<Particle<passiveParticle> > clone() const
+        virtual autoPtr<particle> clone() const
         {
-            return autoPtr<Particle<passiveParticle> >
-            (
-                new passiveParticle(*this)
-            );
+            return autoPtr<particle>(new passiveParticle(*this));
         }
 };
 
diff --git a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C
index aaa509b42f..cbdaea70aa 100644
--- a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C
+++ b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,6 @@ License
 
 namespace Foam
 {
-    defineParticleTypeNameAndDebug(passiveParticle, 0);
     defineTemplateTypeNameAndDebug(Cloud<passiveParticle>, 0);
 }
 
diff --git a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H
index aa3d2c2659..b6ee6f12cc 100644
--- a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H
+++ b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,9 +62,6 @@ class passiveParticleCloud
 
 public:
 
-    //- Type of parcel the cloud was instantiated for
-    typedef passiveParticle parcelType;
-
     // Constructors
 
         //- Construct given mesh
diff --git a/src/lagrangian/coalCombustion/Make/files b/src/lagrangian/coalCombustion/Make/files
index 7f710449cf..019781420d 100644
--- a/src/lagrangian/coalCombustion/Make/files
+++ b/src/lagrangian/coalCombustion/Make/files
@@ -1,6 +1,4 @@
 /* Coal parcel and sub-models */
-coalParcel/coalParcel.C
-coalParcel/defineCoalParcel.C
 coalParcel/makeCoalParcelSubmodels.C
 
 LIB = $(FOAM_LIBBIN)/libcoalCombustion
diff --git a/src/lagrangian/coalCombustion/coalCloud/coalCloud.H b/src/lagrangian/coalCombustion/coalCloud/coalCloud.H
index 63271a0a79..e3df30011e 100644
--- a/src/lagrangian/coalCombustion/coalCloud/coalCloud.H
+++ b/src/lagrangian/coalCombustion/coalCloud/coalCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,13 +25,17 @@ Class
     CoalCloud
 
 Description
-    Coal cloud
+    Cloud class to introduce coal parcels
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef coalCloud_H
 #define coalCloud_H
 
+#include "Cloud.H"
+#include "KinematicCloud.H"
+#include "ThermoCloud.H"
+#include "ReactingCloud.H"
 #include "ReactingMultiphaseCloud.H"
 #include "coalParcel.H"
 
@@ -39,7 +43,22 @@ Description
 
 namespace Foam
 {
-    typedef ReactingMultiphaseCloud<coalParcel> coalCloud;
+    typedef ReactingMultiphaseCloud
+    <
+        ReactingCloud
+        <
+            ThermoCloud
+            <
+                KinematicCloud
+                <
+                    Cloud
+                    <
+                        coalParcel
+                    >
+                >
+            >
+        >
+    > coalCloud;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/coalCombustion/coalParcel/coalParcel.C b/src/lagrangian/coalCombustion/coalParcel/coalParcel.C
deleted file mode 100644
index c917219327..0000000000
--- a/src/lagrangian/coalCombustion/coalParcel/coalParcel.C
+++ /dev/null
@@ -1,130 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "coalParcel.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::coalParcel::coalParcel
-(
-    ReactingMultiphaseCloud<coalParcel>& owner,
-    const vector& position,
-    const label cellI,
-    const label tetFaceI,
-    const label tetPtI
-)
-:
-    ReactingMultiphaseParcel<coalParcel>
-    (
-        owner,
-        position,
-        cellI,
-        tetFaceI,
-        tetPtI
-    )
-{}
-
-
-Foam::coalParcel::coalParcel
-(
-    ReactingMultiphaseCloud<coalParcel>& owner,
-    const vector& position,
-    const label cellI,
-    const label tetFaceI,
-    const label tetPtI,
-    const label typeId,
-    const scalar nParticle0,
-    const scalar d0,
-    const scalar dTarget0,
-    const vector& U0,
-    const vector& f0,
-    const vector& pi0,
-    const vector& tau0,
-    const scalarField& YMixture0,
-    const scalarField& YGas0,
-    const scalarField& YLiquid0,
-    const scalarField& YSolid0,
-    const ReactingMultiphaseParcel<coalParcel>::constantProperties& constProps
-)
-:
-    ReactingMultiphaseParcel<coalParcel>
-    (
-        owner,
-        position,
-        cellI,
-        tetFaceI,
-        tetPtI,
-        typeId,
-        nParticle0,
-        d0,
-        dTarget0,
-        U0,
-        f0,
-        pi0,
-        tau0,
-        YMixture0,
-        YGas0,
-        YLiquid0,
-        YSolid0,
-        constProps
-    )
-{}
-
-
-Foam::coalParcel::coalParcel
-(
-    const Cloud<coalParcel>& cloud,
-    Istream& is,
-    bool readFields
-)
-:
-    ReactingMultiphaseParcel<coalParcel>(cloud, is, readFields)
-{}
-
-
-Foam::coalParcel::coalParcel(const coalParcel& p)
-:
-    ReactingMultiphaseParcel<coalParcel>(p)
-{
-}
-
-
-Foam::coalParcel::coalParcel
-(
-    const coalParcel& p,
-    const ReactingMultiphaseCloud<coalParcel>& c
-)
-:
-    ReactingMultiphaseParcel<coalParcel>(p, c)
-{}
-
-
-// * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
-
-Foam::coalParcel::~coalParcel()
-{}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/coalParcel/coalParcel.H b/src/lagrangian/coalCombustion/coalParcel/coalParcel.H
index e47364f50c..b9930c2456 100644
--- a/src/lagrangian/coalCombustion/coalParcel/coalParcel.H
+++ b/src/lagrangian/coalCombustion/coalParcel/coalParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ Class
     coalParcel
 
 Description
-    Coal parcel class
+    Definition of coal parcel
 
 SourceFiles
     CoalParcel.C
@@ -35,112 +35,37 @@ SourceFiles
 #ifndef coalParcel_H
 #define coalParcel_H
 
+#include "contiguous.H"
+#include "particle.H"
+#include "KinematicParcel.H"
+#include "ThermoParcel.H"
+#include "ReactingParcel.H"
 #include "ReactingMultiphaseParcel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    typedef ReactingMultiphaseParcel
+    <
+        ReactingParcel
+        <
+            ThermoParcel
+            <
+                KinematicParcel
+                <
+                    particle
+                >
+            >
+        >
+    > coalParcel;
 
-/*---------------------------------------------------------------------------*\
-                         Class coalParcel Declaration
-\*---------------------------------------------------------------------------*/
-
-class coalParcel
-:
-    public ReactingMultiphaseParcel<coalParcel>
-{
-public:
-
-    // Run-time type information
-    TypeName("coalParcel");
-
-    // Constructors
-
-        //- Construct from owner, position, and cloud owner
-        //  Other properties initialised as null
-        coalParcel
-        (
-             ReactingMultiphaseCloud<coalParcel>& owner,
-             const vector& position,
-             const label cellI,
-             const label tetFaceI,
-             const label tetPtI
-        );
-
-        //- Construct from components
-        coalParcel
-        (
-             ReactingMultiphaseCloud<coalParcel>& owner,
-             const vector& position,
-             const label cellI,
-             const label tetFaceI,
-             const label tetPtI,
-             const label typeId,
-             const scalar nParticle0,
-             const scalar d0,
-             const scalar dTarget0,
-             const vector& U0,
-             const vector& f0,
-             const vector& pi0,
-             const vector& tau0,
-             const scalarField& YMixture0,
-             const scalarField& YGas0,
-             const scalarField& YLiquid0,
-             const scalarField& YSolid0,
-             const ReactingMultiphaseParcel<coalParcel>::constantProperties&
-                 constProps
-        );
-
-        //- Construct from Istream
-        coalParcel
-        (
-            const Cloud<coalParcel>& c,
-            Istream& is,
-            bool readFields = true
-        );
-
-        //- Construct as a copy
-        coalParcel(const coalParcel& p);
-
-        //- Construct as a copy
-        coalParcel
-        (
-            const coalParcel& p,
-            const ReactingMultiphaseCloud<coalParcel>& c
-        );
-
-        //- Construct and return a (basic particle) clone
-        virtual autoPtr<Particle<coalParcel> > clone() const
-        {
-            return autoPtr<Particle<coalParcel> >(new coalParcel(*this));
-        }
-
-        //- Construct and return a (basic particle) clone
-        virtual autoPtr<Particle<coalParcel> > clone
-        (
-            const Cloud<coalParcel>& c
-        ) const
-        {
-            return autoPtr<Particle<coalParcel> >
-            (
-                new coalParcel
-                (
-                    *this,
-                    static_cast<const ReactingMultiphaseCloud<coalParcel>&>(c)
-                )
-            );
-        }
-
-
-    //- Destructor
-    virtual ~coalParcel();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    template<>
+    inline bool contiguous<coalParcel>()
+    {
+        return false;
+    }
+}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C b/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
index 66612e2e12..fa9e048bad 100644
--- a/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
+++ b/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
@@ -23,13 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "coalParcel.H"
+#include "coalCloud.H"
 
 // Kinematic
 #include "makeThermoParcelForces.H" // thermo variant
 #include "makeParcelDispersionModels.H"
 #include "makeReactingMultiphaseParcelInjectionModels.H" // MP variant
-#include "makeParcelCollisionModels.H"
 #include "makeParcelPatchInteractionModels.H"
 #include "makeParcelPostProcessingModels.H"
 
@@ -51,25 +50,28 @@ License
 
 namespace Foam
 {
+    typedef coalCloud::cloudType coalCloud_R;
+    typedef coalCloud_R::cloudType coalCloud_T;
+    typedef coalCloud_T::cloudType coalCloud_K;
+
     // Kinematic sub-models
-    makeThermoParcelForces(coalParcel);
-    makeParcelDispersionModels(coalParcel);
-    makeReactingMultiphaseParcelInjectionModels(coalParcel);
-    makeParcelCollisionModels(coalParcel);
-    makeParcelPatchInteractionModels(coalParcel);
-    makeParcelPostProcessingModels(coalParcel);
+    makeThermoParcelForces(coalCloud_K);
+    makeParcelDispersionModels(coalCloud_K);
+    makeReactingMultiphaseParcelInjectionModels(coalCloud_K);
+    makeParcelPatchInteractionModels(coalCloud_K);
+    makeParcelPostProcessingModels(coalCloud_K);
 
     // Thermo sub-models
-    makeParcelHeatTransferModels(coalParcel);
+    makeParcelHeatTransferModels(coalCloud_T);
 
     // Reacting sub-models
-    makeReactingMultiphaseParcelCompositionModels(coalParcel);
-    makeReactingParcelPhaseChangeModels(coalParcel);
+    makeReactingMultiphaseParcelCompositionModels(coalCloud_R);
+    makeReactingParcelPhaseChangeModels(coalCloud_R);
 
     // Reacting multiphase sub-models
-    makeReactingMultiphaseParcelDevolatilisationModels(coalParcel);
-    makeReactingParcelSurfaceFilmModels(coalParcel);
-    makeCoalParcelSurfaceReactionModels(coalParcel);
+    makeReactingMultiphaseParcelDevolatilisationModels(coalCloud);
+    makeReactingParcelSurfaceFilmModels(coalCloud_K);
+    makeCoalParcelSurfaceReactionModels(coalCloud);
 }
 
 
diff --git a/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
index 0e06345fb4..781f0c6d47 100644
--- a/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
+++ b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "ReactingMultiphaseCloud.H"
-
 #include "NoSurfaceReaction.H"
 #include "COxidationDiffusionLimitedRate.H"
 #include "COxidationKineticDiffusionLimitedRate.H"
@@ -37,34 +35,17 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeCoalParcelSurfaceReactionModels(ParcelType)                       \
+#define makeCoalParcelSurfaceReactionModels(CloudType)                        \
                                                                               \
-    makeSurfaceReactionModel(ReactingMultiphaseCloud<ParcelType>);            \
-                                                                              \
-    makeSurfaceReactionModelType                                              \
-    (                                                                         \
-        NoSurfaceReaction,                                                    \
-        ReactingMultiphaseCloud,                                              \
-        ParcelType                                                            \
-    );                                                                        \
-    makeSurfaceReactionModelType                                              \
-    (                                                                         \
-        COxidationDiffusionLimitedRate,                                       \
-        ReactingMultiphaseCloud,                                              \
-        ParcelType                                                            \
-    );                                                                        \
+    makeSurfaceReactionModel(CloudType);                                      \
+    makeSurfaceReactionModelType(NoSurfaceReaction, CloudType);               \
+    makeSurfaceReactionModelType(COxidationDiffusionLimitedRate, CloudType);  \
     makeSurfaceReactionModelType                                              \
     (                                                                         \
         COxidationKineticDiffusionLimitedRate,                                \
-        ReactingMultiphaseCloud,                                              \
-        ParcelType                                                            \
+        CloudType                                                             \
     );                                                                        \
-    makeSurfaceReactionModelType                                              \
-    (                                                                         \
-        COxidationMurphyShaddix,                                              \
-        ReactingMultiphaseCloud,                                              \
-        ParcelType                                                            \
-    );
+    makeSurfaceReactionModelType(COxidationMurphyShaddix, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/dieselSpray/parcel/boundaryTreatment.H b/src/lagrangian/dieselSpray/parcel/boundaryTreatment.H
index a2e03dc676..e4031d29c2 100644
--- a/src/lagrangian/dieselSpray/parcel/boundaryTreatment.H
+++ b/src/lagrangian/dieselSpray/parcel/boundaryTreatment.H
@@ -1,6 +1,6 @@
 if (isA<wallPolyPatch>(pbMesh[patch(face())]))
 {
-    keepParcel = sDB.wall().wallTreatment(*this, face());
+    td.keepParticle = sDB.wall().wallTreatment(*this, face());
 
     if (sDB.twoD())
     {
@@ -50,5 +50,5 @@ else if (isA<symmetryPolyPatch>(pbMesh[patch(face())]))
 else if (isType<polyPatch>(pbMesh[patch(face())]))
 {
     // Parcel has hit an inlet or outlet or some such so throw it away
-    keepParcel = false;
+    td.keepParticle = false;
 }
diff --git a/src/lagrangian/dieselSpray/parcel/parcel.C b/src/lagrangian/dieselSpray/parcel/parcel.C
index 2f25168139..3e127f7bcc 100644
--- a/src/lagrangian/dieselSpray/parcel/parcel.C
+++ b/src/lagrangian/dieselSpray/parcel/parcel.C
@@ -35,19 +35,11 @@ License
 #include "processorPolyPatch.H"
 #include "basicMultiComponentMixture.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineParticleTypeNameAndDebug(parcel, 0);
-    defineTemplateTypeNameAndDebug(Cloud<parcel>, 0);
-}
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::parcel::parcel
 (
-    const Cloud<parcel>& cloud,
+    const polyMesh& mesh,
     const vector& position,
     const label cellI,
     const label tetFaceI,
@@ -69,11 +61,8 @@ Foam::parcel::parcel
     const List<word>& liquidNames
 )
 :
-    Particle<parcel>(cloud, position, cellI, tetFaceI, tetPtI),
-    liquidComponents_
-    (
-        liquidNames
-    ),
+    particle(mesh, position, cellI, tetFaceI, tetPtI),
+    liquidComponents_(liquidNames),
     d_(d),
     T_(T),
     m_(m),
@@ -94,11 +83,14 @@ Foam::parcel::parcel
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::parcel::move(spray& sDB, const scalar trackTime)
+bool Foam::parcel::move(trackingData& td, const scalar trackTime)
 {
-    const polyMesh& mesh = cloud().pMesh();
-    const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
+    td.switchProcessor = false;
+    td.keepParticle = true;
 
+    const polyBoundaryMesh& pbMesh = mesh_.boundaryMesh();
+
+    spray& sDB = td.cloud();
     const liquidMixtureProperties& fuels = sDB.fuels();
 
     label Nf = fuels.components().size();
@@ -139,8 +131,6 @@ bool Foam::parcel::move(spray& sDB, const scalar trackTime)
     scalarField tauEvaporation(Nf, GREAT);
     scalarField tauBoiling(Nf, GREAT);
 
-    bool keepParcel = true;
-
     setRelaxationTimes
     (
         cell(),
@@ -185,7 +175,6 @@ bool Foam::parcel::move(spray& sDB, const scalar trackTime)
     // (10 000 seems high enough)
     dtMax = max(dtMax, 1.0e-4*tEnd);
 
-    bool switchProcessor = false;
     vector planeNormal = vector::zero;
     if (sDB.twoD())
     {
@@ -194,7 +183,7 @@ bool Foam::parcel::move(spray& sDB, const scalar trackTime)
     }
 
     // move the parcel until there is no 'timeLeft'
-    while (keepParcel && tEnd > SMALL && !switchProcessor)
+    while (td.keepParticle && !td.switchProcessor && tEnd > SMALL)
     {
         // set the lagrangian time-step
         scalar dt = min(dtMax, tEnd);
@@ -205,10 +194,10 @@ bool Foam::parcel::move(spray& sDB, const scalar trackTime)
         scalar p = sDB.p()[cellI];
 
         // track parcel to face, or end of trajectory
-        if (keepParcel)
+        if (td.keepParticle)
         {
             // Track and adjust the time step if the trajectory is not completed
-            dt *= trackToFace(position() + dt*U_, sDB);
+            dt *= trackToFace(position() + dt*U_, td);
 
             // Decrement the end-time acording to how much time the track took
             tEnd -= dt;
@@ -218,11 +207,11 @@ bool Foam::parcel::move(spray& sDB, const scalar trackTime)
 
             if (onBoundary()) // hit face
             {
-#               include "boundaryTreatment.H"
+                #include "boundaryTreatment.H"
             }
         }
 
-        if (keepParcel && sDB.twoD())
+        if (td.keepParticle && sDB.twoD())
         {
             scalar z = position() & sDB.axisOfSymmetry();
             vector r = position() - z*sDB.axisOfSymmetry();
@@ -297,7 +286,7 @@ bool Foam::parcel::move(spray& sDB, const scalar trackTime)
         // remove parcel if it is 'small'
         if (m() < 1.0e-12)
         {
-            keepParcel = false;
+            td.keepParticle = false;
 
             // ... and add the removed 'stuff' to the gas
             forAll(nMass, i)
@@ -309,19 +298,19 @@ bool Foam::parcel::move(spray& sDB, const scalar trackTime)
             sDB.shs()[cellI] += m()*(nH + nPE);
         }
 
-        if (onBoundary() && keepParcel)
+        if (onBoundary() && td.keepParticle)
         {
             if (face() > -1)
             {
                 if (isA<processorPolyPatch>(pbMesh[patch(face())]))
                 {
-                    switchProcessor = true;
+                    td.switchProcessor = true;
                 }
             }
         }
     }
 
-    return keepParcel;
+    return td.keepParticle;
 }
 
 
diff --git a/src/lagrangian/dieselSpray/parcel/parcel.H b/src/lagrangian/dieselSpray/parcel/parcel.H
index 6e10c71cf2..295f4ccac7 100644
--- a/src/lagrangian/dieselSpray/parcel/parcel.H
+++ b/src/lagrangian/dieselSpray/parcel/parcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Description
 #ifndef parcel_H
 #define parcel_H
 
-#include "Particle.H"
+#include "particle.H"
 #include "contiguous.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -48,7 +48,7 @@ class spray;
 
 class parcel
 :
-    public Particle<parcel>
+    public particle
 {
     // Private member data
 
@@ -142,13 +142,25 @@ public:
 
     friend class Cloud<parcel>;
 
+    //- Class used to pass tracking data to the trackToFace function
+    class trackingData
+    :
+        public particle::TrackingData<spray>
+    {
+    public:
+
+        trackingData(spray& cloud)
+        :
+            particle::TrackingData<spray>(cloud)
+        {}
+    };
 
     // Constructors
 
         //- Construct from components
         parcel
         (
-            const Cloud<parcel>& cloud,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             const label tetFaceI,
@@ -173,11 +185,30 @@ public:
         //- Construct from Istream reading field values if required
         parcel
         (
-            const Cloud<parcel>& cloud,
+            const polyMesh& mesh,
             Istream& is,
             bool readFields = true
         );
 
+        //- Factory class to read-construct particles used for
+        //  parallel transfer
+        class iNew
+        {
+            const polyMesh& mesh_;
+
+        public:
+
+            iNew(const polyMesh& mesh)
+            :
+                mesh_(mesh)
+            {}
+
+            autoPtr<parcel> operator()(Istream& is) const
+            {
+                return autoPtr<parcel>(new parcel(mesh_, is, true));
+            }
+        };
+
 
     // Member Functions
 
@@ -349,7 +380,7 @@ public:
 
         // Parcel operations
 
-            bool move(spray& sprayData, const scalar trackTime);
+            bool move(trackingData& td, const scalar trackTime);
 
             //- Transform the position and physical properties of the particle
             //  according to the given transformation tensor
diff --git a/src/lagrangian/dieselSpray/parcel/parcelI.H b/src/lagrangian/dieselSpray/parcel/parcelI.H
index 2b3b1786a5..e104a53bb2 100644
--- a/src/lagrangian/dieselSpray/parcel/parcelI.H
+++ b/src/lagrangian/dieselSpray/parcel/parcelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,182 +23,205 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-inline const List<word>& parcel::liquidNames() const
+inline const Foam::List<Foam::word>& Foam::parcel::liquidNames() const
 {
     return liquidComponents_;
 }
 
-inline const List<word>& parcel::fuelNames() const
+
+inline const Foam::List<Foam::word>& Foam::parcel::fuelNames() const
 {
     return liquidComponents_;
 }
 
-inline scalar parcel::d() const
+
+inline Foam::scalar Foam::parcel::d() const
 {
     return d_;
 }
 
-inline scalar& parcel::d()
+
+inline Foam::scalar& Foam::parcel::d()
 {
     return d_;
 }
 
-inline scalar parcel::T() const
+
+inline Foam::scalar Foam::parcel::T() const
 {
     return T_;
 }
 
-inline scalar& parcel::T()
+
+inline Foam::scalar& Foam::parcel::T()
 {
     return T_;
 }
 
-inline scalar parcel::m() const
+
+inline Foam::scalar Foam::parcel::m() const
 {
     return m_;
 }
 
-inline scalar& parcel::m()
+
+inline Foam::scalar& Foam::parcel::m()
 {
     return m_;
 }
 
-inline scalar parcel::dev() const
+
+inline Foam::scalar Foam::parcel::dev() const
 {
     return y_;
 }
 
-inline scalar& parcel::dev()
+
+inline Foam::scalar& Foam::parcel::dev()
 {
     return y_;
 }
 
-inline scalar parcel::ddev() const
+
+inline Foam::scalar Foam::parcel::ddev() const
 {
     return yDot_;
 }
 
-inline scalar& parcel::ddev()
+
+inline Foam::scalar& Foam::parcel::ddev()
 {
     return yDot_;
 }
 
-inline scalar parcel::ct() const
+
+inline Foam::scalar Foam::parcel::ct() const
 {
     return ct_;
 }
 
-inline scalar& parcel::ct()
+
+inline Foam::scalar& Foam::parcel::ct()
 {
     return ct_;
 }
 
-inline scalar& parcel::ms()
+
+inline Foam::scalar& Foam::parcel::ms()
 {
     return ms_;
 }
 
-inline scalar parcel::ms() const
+
+inline Foam::scalar Foam::parcel::ms() const
 {
     return ms_;
 }
 
-inline scalar& parcel::tTurb()
+
+inline Foam::scalar& Foam::parcel::tTurb()
 {
     return tTurb_;
 }
 
-inline scalar parcel::tTurb() const
+
+inline Foam::scalar Foam::parcel::tTurb() const
 {
     return tTurb_;
 }
 
-inline scalar& parcel::liquidCore()
+
+inline Foam::scalar& Foam::parcel::liquidCore()
 {
     return liquidCore_;
 }
 
-inline scalar parcel::liquidCore() const
+
+inline Foam::scalar Foam::parcel::liquidCore() const
 {
     return liquidCore_;
 }
 
-inline scalar& parcel::injector()
+
+inline Foam::scalar& Foam::parcel::injector()
 {
     return injector_;
 }
 
-inline scalar parcel::injector() const
+
+inline Foam::scalar Foam::parcel::injector() const
 {
     return injector_;
 }
 
-inline const vector& parcel::U() const
+
+inline const Foam::vector& Foam::parcel::U() const
 {
     return U_;
 }
 
-inline vector& parcel::U()
+
+inline Foam::vector& Foam::parcel::U()
 {
     return U_;
 }
 
-inline const vector& parcel::Uturb() const
+
+inline const Foam::vector& Foam::parcel::Uturb() const
 {
     return Uturb_;
 }
 
-inline vector& parcel::Uturb()
+
+inline Foam::vector& Foam::parcel::Uturb()
 {
     return Uturb_;
 }
 
-inline const vector& parcel::n() const
+
+inline const Foam::vector& Foam::parcel::n() const
 {
     return n_;
 }
 
-inline vector& parcel::n()
+
+inline Foam::vector& Foam::parcel::n()
 {
     return n_;
 }
 
-inline const scalarField& parcel::X() const
+
+inline const Foam::scalarField& Foam::parcel::X() const
 {
     return X_;
 }
 
-inline scalarField& parcel::X()
+
+inline Foam::scalarField& Foam::parcel::X()
 {
     return X_;
 }
 
-inline scalar& parcel::tMom()
+
+inline Foam::scalar& Foam::parcel::tMom()
 {
     return tMom_;
 }
 
-inline scalar parcel::tMom() const
+
+inline Foam::scalar Foam::parcel::tMom() const
 {
     return tMom_;
 }
 
-inline vector parcel::Urel(const vector& U) const
+
+inline Foam::vector Foam::parcel::Urel(const vector& U) const
 {
     return U_ - U;
 }
 
-inline void parcel::correctNormal
-(
-    const vector& sym
-)
+
+inline void Foam::parcel::correctNormal(const vector& sym)
 {
     scalar d = position() & sym;
     n_ = position() - d*sym;
@@ -206,8 +229,4 @@ inline void parcel::correctNormal
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/parcel/parcelIO.C b/src/lagrangian/dieselSpray/parcel/parcelIO.C
index 8c474c24ba..8ce302574d 100644
--- a/src/lagrangian/dieselSpray/parcel/parcelIO.C
+++ b/src/lagrangian/dieselSpray/parcel/parcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,17 +30,18 @@ License
 
 Foam::parcel::parcel
 (
-    const Cloud<parcel>& cloud,
+    const polyMesh& mesh,
     Istream& is,
     bool readFields
 )
 :
-    Particle<parcel>(cloud, is, readFields),
+    particle(mesh, is, readFields),
 
     liquidComponents_
     (
-        (cloud.pMesh().lookupObject<dictionary>("thermophysicalProperties"))
-       .lookup("liquidComponents")
+        (
+            mesh.lookupObject<dictionary>("thermophysicalProperties")
+        ).lookup("liquidComponents")
     ),
     X_(liquidComponents_.size(), 0.0),
 
@@ -102,7 +103,7 @@ void Foam::parcel::readFields(Cloud<parcel>& c)
         return;
     }
 
-    Particle<parcel>::readFields(c);
+    particle::readFields(c);
 
     IOField<scalar> d(c.fieldIOobject("d", IOobject::MUST_READ));
     c.checkFieldIOobject(c, d);
@@ -195,7 +196,7 @@ void Foam::parcel::readFields(Cloud<parcel>& c)
 
 void Foam::parcel::writeFields(const Cloud<parcel>& c)
 {
-    Particle<parcel>::writeFields(c);
+    particle::writeFields(c);
 
     label np = c.size();
 
@@ -289,10 +290,9 @@ void Foam::parcel::writeFields(const Cloud<parcel>& c)
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const parcel& p)
 {
-
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const Particle<parcel>&>(p)
+        os  << static_cast<const particle&>(p)
             << token::SPACE << p.d_
             << token::SPACE << p.T_
             << token::SPACE << p.m_
@@ -310,7 +310,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const parcel& p)
     }
     else
     {
-        os  << static_cast<const Particle<parcel>&>(p);
+        os  << static_cast<const particle>(p);
         os.write
         (
             reinterpret_cast<const char*>(&p.d_),
diff --git a/src/lagrangian/dieselSpray/spray/findInjectorCell.H b/src/lagrangian/dieselSpray/spray/findInjectorCell.H
index e9e8a7bfa8..c50d276b56 100644
--- a/src/lagrangian/dieselSpray/spray/findInjectorCell.H
+++ b/src/lagrangian/dieselSpray/spray/findInjectorCell.H
@@ -23,7 +23,7 @@ if (!foundCell)
 {
     injectionPosition = it->position(n);
 
-    findCellFacePt
+    mesh_.findCellFacePt
     (
         injectionPosition,
         injectorCell,
diff --git a/src/lagrangian/dieselSpray/spray/spray.C b/src/lagrangian/dieselSpray/spray/spray.C
index dbacb3bfa9..2d611823d6 100644
--- a/src/lagrangian/dieselSpray/spray/spray.C
+++ b/src/lagrangian/dieselSpray/spray/spray.C
@@ -46,6 +46,7 @@ License
 
 namespace Foam
 {
+    defineTemplateTypeNameAndDebug(Cloud<parcel>, 0);
     defineTemplateTypeNameAndDebug(IOPtrList<injector>, 0);
 }
 
diff --git a/src/lagrangian/dieselSpray/spray/sprayInject.C b/src/lagrangian/dieselSpray/spray/sprayInject.C
index 4b6d56d016..bea8272e39 100644
--- a/src/lagrangian/dieselSpray/spray/sprayInject.C
+++ b/src/lagrangian/dieselSpray/spray/sprayInject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,6 +36,8 @@ void Foam::spray::inject()
     scalar time = runTime_.value();
     scalar time0 = time0_;
 
+    parcel::trackingData td(*this);
+
     // Inject the parcels for each injector sequentially
     forAll(injectors_, i)
     {
@@ -111,7 +113,7 @@ void Foam::spray::inject()
                     label injectorTetFaceI = -1;
                     label injectorTetPtI = -1;
 
-                    findCellFacePt
+                    mesh_.findCellFacePt
                     (
                         injectionPosition,
                         injectorCell,
@@ -119,7 +121,7 @@ void Foam::spray::inject()
                         injectorTetPtI
                     );
 
-#                   include "findInjectorCell.H"
+                    #include "findInjectorCell.H"
 
                     if (injectorCell >= 0)
                     {
@@ -129,7 +131,7 @@ void Foam::spray::inject()
 
                         parcel* pPtr = new parcel
                         (
-                            *this,
+                            mesh_,
                             injectionPosition,
                             injectorCell,
                             injectorTetFaceI,
@@ -160,7 +162,7 @@ void Foam::spray::inject()
                            /runTime_.deltaTValue();
 
                         bool keepParcel =
-                            pPtr->move(*this, runTime_.deltaTValue());
+                            pPtr->move(td, runTime_.deltaTValue());
 
                         if (keepParcel)
                         {
diff --git a/src/lagrangian/dieselSpray/spray/sprayOps.C b/src/lagrangian/dieselSpray/spray/sprayOps.C
index a105ef3304..49915ed2db 100644
--- a/src/lagrangian/dieselSpray/spray/sprayOps.C
+++ b/src/lagrangian/dieselSpray/spray/sprayOps.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,8 @@ void Foam::spray::move()
         srhos_[i] = 0.0;
     }
 
-    Cloud<parcel>::move(*this, runTime_.deltaTValue());
+    parcel::trackingData td(*this);
+    Cloud<parcel>::move(td, runTime_.deltaTValue());
 }
 
 
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
index 7e4ba37eeb..a4ff12b6bb 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
@@ -233,7 +233,7 @@ void Foam::SHF::breakupParcel
             (
                 new parcel
                 (
-                    spray_,
+                    p.mesh(),
                     p.position(),
                     p.cell(),
                     p.tetFace(),
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
index 51b714f831..357409bce9 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
@@ -195,7 +195,7 @@ void Foam::reitzKHRT::breakupParcel
                 (
                     new parcel
                     (
-                        spray_,
+                        p.mesh(),
                         p.position(),
                         p.cell(),
                         p.tetFace(),
diff --git a/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C
index 7084be4275..dd73227733 100644
--- a/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C
+++ b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C
@@ -34,9 +34,9 @@ Foam::distributionModels::distributionModel::New
     cachedRandom& rndGen
 )
 {
-    const word modelType(dict.lookup("distributionModelType"));
+    const word modelType(dict.lookup("type"));
 
-    Info<< "Selecting distributionModelType " << modelType << endl;
+    Info<< "Selecting distribution model " << modelType << endl;
 
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(modelType);
@@ -51,8 +51,8 @@ Foam::distributionModels::distributionModel::New
                 "cachedRandom&"
             ")"
         )
-            << "Unknown distributionModel type " << modelType << nl << nl
-            << "Valid distributionModel types are:" << nl
+            << "Unknown distribution model type " << modelType << nl << nl
+            << "Valid distribution model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
index 793bc39fc9..b23817d98e 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -501,7 +501,7 @@ void Foam::DsmcCloud<ParcelType>::addNewParcel
 {
     ParcelType* pPtr = new ParcelType
     (
-        *this,
+        mesh_,
         position,
         U,
         Ei,
@@ -970,7 +970,7 @@ Foam::DsmcCloud<ParcelType>::~DsmcCloud()
 template<class ParcelType>
 void Foam::DsmcCloud<ParcelType>::evolve()
 {
-    typename ParcelType::trackData td(*this);
+    typename ParcelType::trackingData td(*this);
 
     // Reset the data collection fields
     resetFields();
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C
index 843a96456f..fa79ac2ddd 100644
--- a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,13 +30,10 @@ License
 
 template<class ParcelType>
 template<class TrackData>
-bool Foam::DsmcParcel<ParcelType>::move
-(
-    TrackData& td,
-    const scalar trackTime
-)
+bool Foam::DsmcParcel<ParcelType>::move(TrackData& td, const scalar trackTime)
 {
-    ParcelType& p = static_cast<ParcelType&>(*this);
+    typename TrackData::cloudType::parcelType& p =
+        static_cast<typename TrackData::cloudType::parcelType&>(*this);
 
     td.switchProcessor = false;
     td.keepParticle = true;
@@ -113,15 +110,6 @@ void Foam::DsmcParcel<ParcelType>::hitProcessorPatch
 }
 
 
-template<class ParcelType>
-void Foam::DsmcParcel<ParcelType>::hitProcessorPatch
-(
-    const processorPolyPatch&,
-    int&
-)
-{}
-
-
 template<class ParcelType>
 template<class TrackData>
 void Foam::DsmcParcel<ParcelType>::hitWallPatch
@@ -174,7 +162,7 @@ void Foam::DsmcParcel<ParcelType>::hitWallPatch
 
     td.cloud().wallInteraction().correct
     (
-        static_cast<ParcelType&>(*this),
+        static_cast<DsmcParcel<ParcelType> &>(*this),
         wpp
     );
 
@@ -215,44 +203,18 @@ void Foam::DsmcParcel<ParcelType>::hitWallPatch
 }
 
 
-template<class ParcelType>
-void Foam::DsmcParcel<ParcelType>::hitWallPatch
-(
-    const wallPolyPatch&,
-    int&,
-    const tetIndices&
-)
-{}
-
-
 template<class ParcelType>
 template<class TrackData>
-void Foam::DsmcParcel<ParcelType>::hitPatch
-(
-    const polyPatch&,
-    TrackData& td
-)
+void Foam::DsmcParcel<ParcelType>::hitPatch(const polyPatch&, TrackData& td)
 {
     td.keepParticle = false;
 }
 
 
 template<class ParcelType>
-void Foam::DsmcParcel<ParcelType>::hitPatch
-(
-    const polyPatch&,
-    int&
-)
-{}
-
-
-template<class ParcelType>
-void Foam::DsmcParcel<ParcelType>::transformProperties
-(
-    const tensor& T
-)
+void Foam::DsmcParcel<ParcelType>::transformProperties(const tensor& T)
 {
-    Particle<ParcelType>::transformProperties(T);
+    ParcelType::transformProperties(T);
     U_ = transform(T, U_);
 }
 
@@ -263,7 +225,7 @@ void Foam::DsmcParcel<ParcelType>::transformProperties
     const vector& separation
 )
 {
-    Particle<ParcelType>::transformProperties(separation);
+    ParcelType::transformProperties(separation);
 }
 
 
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
index 6047911db0..2ddd8ef060 100644
--- a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ SourceFiles
 #ifndef DsmcParcel_H
 #define DsmcParcel_H
 
-#include "Particle.H"
+#include "particle.H"
 #include "IOstream.H"
 #include "autoPtr.H"
 #include "contiguous.H"
@@ -68,7 +68,7 @@ Ostream& operator<<
 template<class ParcelType>
 class DsmcParcel
 :
-    public Particle<ParcelType>
+    public ParcelType
 {
 public:
 
@@ -123,31 +123,22 @@ public:
 
 
     //- Class used to pass kinematic tracking data to the trackToFace function
-    class trackData
+    class trackingData
     :
-        public Particle<ParcelType>::trackData
+        public particle::TrackingData<DsmcCloud<DsmcParcel<ParcelType> > >
     {
-        // Private data
-
-            //- Reference to the cloud containing this particle
-            DsmcCloud<ParcelType>& cloud_;
-
-
     public:
 
         // Constructors
 
             //- Construct from components
-            inline trackData
-            (
-                DsmcCloud<ParcelType>& cloud
-            );
-
-
-        // Member functions
-
-            //- Return access to the owner cloud
-            inline DsmcCloud<ParcelType>& cloud();
+            trackingData(DsmcCloud<DsmcParcel<ParcelType> >& cloud)
+            :
+                particle::TrackingData<DsmcCloud<DsmcParcel<ParcelType> > >
+                (
+                    cloud
+                )
+            {}
     };
 
 
@@ -181,7 +172,7 @@ public:
         //- Construct from components
         inline DsmcParcel
         (
-            DsmcCloud<ParcelType>& owner,
+            const polyMesh& mesh,
             const vector& position,
             const vector& U,
             const scalar Ei,
@@ -194,21 +185,41 @@ public:
         //- Construct from Istream
         DsmcParcel
         (
-            const Cloud<ParcelType>& c,
+            const polyMesh& mesh,
             Istream& is,
             bool readFields = true
         );
 
         //- Construct and return a clone
-        virtual autoPtr<Particle<ParcelType> > clone() const
+        virtual autoPtr<particle> clone() const
         {
-            return autoPtr<Particle<ParcelType> >
-            (
-                new DsmcParcel<ParcelType>(*this)
-            );
+            return autoPtr<particle>(new DsmcParcel<ParcelType>(*this));
         }
 
 
+        //- Factory class to read-construct particles used for
+        //  parallel transfer
+        class iNew
+        {
+            const polyMesh& mesh_;
+
+        public:
+
+            iNew(const polyMesh& mesh)
+            :
+                mesh_(mesh)
+            {}
+
+            autoPtr<DsmcParcel<ParcelType> > operator()(Istream& is) const
+            {
+                return autoPtr<DsmcParcel<ParcelType> >
+                (
+                    new DsmcParcel<ParcelType>(mesh_, is, true)
+                );
+            }
+        };
+
+
     // Member Functions
 
         // Access
@@ -263,14 +274,6 @@ public:
                 TrackData& td
             );
 
-            //- Overridable function to handle the particle hitting a
-            //  processorPatch without trackData
-            void hitProcessorPatch
-            (
-                const processorPolyPatch&,
-                int&
-            );
-
             //- Overridable function to handle the particle hitting a wallPatch
             template<class TrackData>
             void hitWallPatch
@@ -280,15 +283,6 @@ public:
                 const tetIndices&
             );
 
-            //- Overridable function to handle the particle hitting a wallPatch
-            //  without trackData
-            void hitWallPatch
-            (
-                const wallPolyPatch&,
-                int&,
-                const tetIndices&
-            );
-
             //- Overridable function to handle the particle hitting a polyPatch
             template<class TrackData>
             void hitPatch
@@ -297,14 +291,6 @@ public:
                 TrackData& td
             );
 
-            //- Overridable function to handle the particle hitting a polyPatch
-            //- without trackData
-            void hitPatch
-            (
-                const polyPatch&,
-                int&
-            );
-
             //- Transform the physical properties of the particle
             //  according to the given transformation tensor
             void transformProperties(const tensor& T);
@@ -316,9 +302,9 @@ public:
 
         // I-O
 
-            static void readFields(Cloud<ParcelType>& c);
+            static void readFields(Cloud<DsmcParcel<ParcelType> >& c);
 
-            static void writeFields(const Cloud<ParcelType>& c);
+            static void writeFields(const Cloud<DsmcParcel<ParcelType> >& c);
 
 
     // Ostream Operator
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelI.H b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelI.H
index 5bfc61b44b..de021a15e1 100644
--- a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelI.H
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template <class ParcelType>
+template<class ParcelType>
 inline Foam::DsmcParcel<ParcelType>::constantProperties::constantProperties()
 :
     mass_(0),
@@ -35,7 +35,7 @@ inline Foam::DsmcParcel<ParcelType>::constantProperties::constantProperties()
 {}
 
 
-template <class ParcelType>
+template<class ParcelType>
 inline Foam::DsmcParcel<ParcelType>::constantProperties::constantProperties
 (
     const dictionary& dict
@@ -51,21 +51,10 @@ inline Foam::DsmcParcel<ParcelType>::constantProperties::constantProperties
 {}
 
 
-template <class ParcelType>
-inline Foam::DsmcParcel<ParcelType>::trackData::trackData
-(
-    DsmcCloud<ParcelType>& cloud
-)
-:
-    Particle<ParcelType>::trackData(cloud),
-    cloud_(cloud)
-{}
-
-
-template <class ParcelType>
+template<class ParcelType>
 inline Foam::DsmcParcel<ParcelType>::DsmcParcel
 (
-    DsmcCloud<ParcelType>& owner,
+    const polyMesh& mesh,
     const vector& position,
     const vector& U,
     const scalar Ei,
@@ -75,7 +64,7 @@ inline Foam::DsmcParcel<ParcelType>::DsmcParcel
     const label typeId
 )
 :
-    Particle<ParcelType>(owner, position, cellI, tetFaceI, tetPtI),
+    ParcelType(mesh, position, cellI, tetFaceI, tetPtI),
     U_(U),
     Ei_(Ei),
     typeId_(typeId)
@@ -84,7 +73,7 @@ inline Foam::DsmcParcel<ParcelType>::DsmcParcel
 
 // * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
 
-template <class ParcelType>
+template<class ParcelType>
 inline Foam::scalar
 Foam::DsmcParcel<ParcelType>::constantProperties::mass() const
 {
@@ -92,15 +81,14 @@ Foam::DsmcParcel<ParcelType>::constantProperties::mass() const
 }
 
 
-template <class ParcelType>
-inline Foam::scalar
-Foam::DsmcParcel<ParcelType>::constantProperties::d() const
+template<class ParcelType>
+inline Foam::scalar Foam::DsmcParcel<ParcelType>::constantProperties::d() const
 {
     return d_;
 }
 
 
-template <class ParcelType>
+template<class ParcelType>
 inline Foam::scalar
 Foam::DsmcParcel<ParcelType>::constantProperties::sigmaT() const
 {
@@ -108,7 +96,7 @@ Foam::DsmcParcel<ParcelType>::constantProperties::sigmaT() const
 }
 
 
-template <class ParcelType>
+template<class ParcelType>
 inline Foam::scalar
 Foam::DsmcParcel<ParcelType>::constantProperties::internalDegreesOfFreedom()
 const
@@ -117,7 +105,7 @@ const
 }
 
 
-template <class ParcelType>
+template<class ParcelType>
 inline Foam::scalar
 Foam::DsmcParcel<ParcelType>::constantProperties::omega() const
 {
@@ -125,47 +113,37 @@ Foam::DsmcParcel<ParcelType>::constantProperties::omega() const
 }
 
 
-// * * * * * * * * * * * trackData Member Functions  * * * * * * * * * * * * //
-
-template <class ParcelType>
-inline Foam::DsmcCloud<ParcelType>&
-Foam::DsmcParcel<ParcelType>::trackData::cloud()
-{
-    return cloud_;
-}
-
-
 // * * * * * * * * * * DsmcParcel Member Functions  * * * * * * * * * * //
 
-template <class ParcelType>
+template<class ParcelType>
 inline Foam::label Foam::DsmcParcel<ParcelType>::typeId() const
 {
     return typeId_;
 }
 
 
-template <class ParcelType>
+template<class ParcelType>
 inline const Foam::vector& Foam::DsmcParcel<ParcelType>::U() const
 {
     return U_;
 }
 
 
-template <class ParcelType>
+template<class ParcelType>
 inline Foam::scalar Foam::DsmcParcel<ParcelType>::Ei() const
 {
     return Ei_;
 }
 
 
-template <class ParcelType>
+template<class ParcelType>
 inline Foam::vector& Foam::DsmcParcel<ParcelType>::U()
 {
     return U_;
 }
 
 
-template <class ParcelType>
+template<class ParcelType>
 inline Foam::scalar& Foam::DsmcParcel<ParcelType>::Ei()
 {
     return Ei_;
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C
index b95cd14a88..203ddd3fd3 100644
--- a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,12 +33,12 @@ License
 template <class ParcelType>
 Foam::DsmcParcel<ParcelType>::DsmcParcel
 (
-    const Cloud<ParcelType>& cloud,
+    const polyMesh& mesh,
     Istream& is,
     bool readFields
 )
 :
-    Particle<ParcelType>(cloud, is, readFields),
+    ParcelType(mesh, is, readFields),
     U_(vector::zero),
     Ei_(0.0),
     typeId_(-1)
@@ -73,14 +73,14 @@ Foam::DsmcParcel<ParcelType>::DsmcParcel
 
 
 template<class ParcelType>
-void Foam::DsmcParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
+void Foam::DsmcParcel<ParcelType>::readFields(Cloud<DsmcParcel<ParcelType> >& c)
 {
     if (!c.size())
     {
         return;
     }
 
-    Particle<ParcelType>::readFields(c);
+    ParcelType::readFields(c);
 
     IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ));
     c.checkFieldIOobject(c, U);
@@ -92,9 +92,9 @@ void Foam::DsmcParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
     c.checkFieldIOobject(c, typeId);
 
     label i = 0;
-    forAllIter(typename Cloud<ParcelType>, c, iter)
+    forAllIter(typename Cloud<DsmcParcel<ParcelType> >, c, iter)
     {
-        ParcelType& p = iter();
+        DsmcParcel<ParcelType>& p = iter();
 
         p.U_ = U[i];
         p.Ei_ = Ei[i];
@@ -105,9 +105,12 @@ void Foam::DsmcParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
 
 
 template<class ParcelType>
-void Foam::DsmcParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
+void Foam::DsmcParcel<ParcelType>::writeFields
+(
+    const Cloud<DsmcParcel<ParcelType> >& c
+)
 {
-    Particle<ParcelType>::writeFields(c);
+    ParcelType::writeFields(c);
 
     label np =  c.size();
 
@@ -116,7 +119,7 @@ void Foam::DsmcParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
     IOField<label> typeId(c.fieldIOobject("typeId", IOobject::NO_READ), np);
 
     label i = 0;
-    forAllConstIter(typename Cloud<ParcelType>, c, iter)
+    forAllConstIter(typename Cloud<DsmcParcel<ParcelType> >, c, iter)
     {
         const DsmcParcel<ParcelType>& p = iter();
 
@@ -143,14 +146,14 @@ Foam::Ostream& Foam::operator<<
 {
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const Particle<ParcelType>& >(p)
+        os  << static_cast<const ParcelType& >(p)
             << token::SPACE << p.U()
             << token::SPACE << p.Ei()
             << token::SPACE << p.typeId();
     }
     else
     {
-        os  << static_cast<const Particle<ParcelType>& >(p);
+        os  << static_cast<const ParcelType& >(p);
         os.write
         (
             reinterpret_cast<const char*>(&p.U_),
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/defineDsmcParcel.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/defineDsmcParcel.C
index 2c3040e9ac..5edf63d406 100644
--- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/defineDsmcParcel.C
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/defineDsmcParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,13 +24,13 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "dsmcParcel.H"
+#include "DsmcParcel.H"
 #include "DsmcCloud.H"
 
 namespace Foam
 {
+    defineTemplateTypeNameAndDebug(DsmcParcel<particle>, 0);
     defineTemplateTypeNameAndDebug(Cloud<dsmcParcel>, 0);
-
-    defineParcelTypeNameAndDebug(DsmcCloud<dsmcParcel>, 0);
 }
 
 
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
index ec18136d38..c05fb93aed 100644
--- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,14 +24,14 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "dsmcParcel.H"
-
+/*
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineTypeNameAndDebug(dsmcParcel, 0);
-    defineParticleTypeNameAndDebug(dsmcParcel, 0);
-    defineParcelTypeNameAndDebug(dsmcParcel, 0);
+//    defineTypeNameAndDebug(dsmcParcel, 0);
+//    defineParticleTypeNameAndDebug(dsmcParcel, 0);
+//    defineParcelTypeNameAndDebug(dsmcParcel, 0);
 }
 
 
@@ -39,7 +39,7 @@ namespace Foam
 
 Foam::dsmcParcel::dsmcParcel
 (
-    DsmcCloud<dsmcParcel>& owner,
+    c& owner,
     const vector& position,
     const vector& U,
     const scalar Ei,
@@ -78,6 +78,6 @@ Foam::dsmcParcel::dsmcParcel
 
 Foam::dsmcParcel::~dsmcParcel()
 {}
-
+*/
 
 // ************************************************************************* //
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H
index 35a6c2d486..66845e7234 100644
--- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ Class
     Foam::dsmcParcel
 
 Description
-
+    Declaration of dsmc parcel type
 
 SourceFiles
     dsmcParcel.C
@@ -35,6 +35,7 @@ SourceFiles
 #ifndef dsmcParcel_H
 #define dsmcParcel_H
 
+#include "particle.H"
 #include "DsmcParcel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -42,10 +43,11 @@ SourceFiles
 namespace Foam
 {
 
+    typedef DsmcParcel<particle> dsmcParcel;
 /*---------------------------------------------------------------------------*\
                          Class dsmcParcel Declaration
 \*---------------------------------------------------------------------------*/
-
+/*
 class dsmcParcel
 :
     public DsmcParcel<dsmcParcel>
@@ -100,7 +102,7 @@ inline bool contiguous<dsmcParcel>()
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
+*/
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C
index f8f8d7f17a..70621b71c4 100644
--- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,29 +29,18 @@ License
 #include "VariableHardSphere.H"
 #include "LarsenBorgnakkeVariableHardSphere.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
+    typedef DsmcCloud<dsmcParcel> CloudType;
+
     makeBinaryCollisionModel(DsmcCloud<dsmcParcel>);
 
     // Add instances of collision model to the table
-    makeBinaryCollisionModelType
-    (
-        NoBinaryCollision,
-        DsmcCloud,
-        dsmcParcel
-    );
-    makeBinaryCollisionModelType
-    (
-        VariableHardSphere,
-        DsmcCloud,
-        dsmcParcel
-    );
-    makeBinaryCollisionModelType
-    (
-        LarsenBorgnakkeVariableHardSphere,
-        DsmcCloud,
-        dsmcParcel
-    );
+    makeBinaryCollisionModelType(NoBinaryCollision, CloudType);
+    makeBinaryCollisionModelType(VariableHardSphere, CloudType);
+    makeBinaryCollisionModelType(LarsenBorgnakkeVariableHardSphere, CloudType);
 }
 
 
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelInflowBoundaryModels.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelInflowBoundaryModels.C
index d12204e473..9fc669465c 100644
--- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelInflowBoundaryModels.C
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelInflowBoundaryModels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,23 +28,17 @@ License
 #include "FreeStream.H"
 #include "NoInflow.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
-    makeInflowBoundaryModel(DsmcCloud<dsmcParcel>);
+    typedef DsmcCloud<dsmcParcel> CloudType;
+
+    makeInflowBoundaryModel(CloudType);
 
     // Add instances of inflow boundary model to the table
-    makeInflowBoundaryModelType
-    (
-        FreeStream,
-        DsmcCloud,
-        dsmcParcel
-    );
-    makeInflowBoundaryModelType
-    (
-        NoInflow,
-        DsmcCloud,
-        dsmcParcel
-    );
+    makeInflowBoundaryModelType(FreeStream, CloudType);
+    makeInflowBoundaryModelType(NoInflow, CloudType);
 }
 
 
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelWallInteractionModels.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelWallInteractionModels.C
index 6a6d389161..08dc511e31 100644
--- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelWallInteractionModels.C
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelWallInteractionModels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,29 +29,18 @@ License
 #include "SpecularReflection.H"
 #include "MixedDiffuseSpecular.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
-    makeWallInteractionModel(DsmcCloud<dsmcParcel>);
+    typedef DsmcCloud<dsmcParcel> CloudType;
+
+    makeWallInteractionModel(CloudType);
 
     // Add instances of wall interaction model to the table
-    makeWallInteractionModelType
-    (
-        MaxwellianThermal,
-        DsmcCloud,
-        dsmcParcel
-    );
-    makeWallInteractionModelType
-    (
-        SpecularReflection,
-        DsmcCloud,
-        dsmcParcel
-    );
-    makeWallInteractionModelType
-    (
-        MixedDiffuseSpecular,
-        DsmcCloud,
-        dsmcParcel
-    );
+    makeWallInteractionModelType(MaxwellianThermal, CloudType);
+    makeWallInteractionModelType(SpecularReflection, CloudType);
+    makeWallInteractionModelType(MixedDiffuseSpecular, CloudType);
 }
 
 
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
index bd0ce0fa31..fa44b38b67 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -166,13 +166,13 @@ public:
     );
 
 
-#define makeBinaryCollisionModelType(SS, CloudType, ParcelType)               \
+#define makeBinaryCollisionModelType(SS, CloudType)                           \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
-    BinaryCollisionModel<CloudType<ParcelType> >::                            \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    BinaryCollisionModel<CloudType>::                                         \
+        adddictionaryConstructorToTable<SS<CloudType> >                       \
+            add##SS##CloudType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
index e58fb30a6d..4b80d36bba 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -146,13 +146,13 @@ public:
     );
 
 
-#define makeInflowBoundaryModelType(SS, CloudType, ParcelType)                \
+#define makeInflowBoundaryModelType(SS, CloudType)                            \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
-    InflowBoundaryModel<CloudType<ParcelType> >::                             \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    InflowBoundaryModel<CloudType>::                                          \
+        adddictionaryConstructorToTable<SS<CloudType> >                       \
+            add##SS##CloudType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
index e0af2025a9..79ce948b2a 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -152,13 +152,13 @@ public:
     );
 
 
-#define makeWallInteractionModelType(SS, CloudType, ParcelType)               \
+#define makeWallInteractionModelType(SS, CloudType)                           \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
-    WallInteractionModel<CloudType<ParcelType> >::                            \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    WallInteractionModel<CloudType>::                                         \
+        adddictionaryConstructorToTable<SS<CloudType> >                       \
+            add##SS##CloudType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
index d84e44bbba..15697136b2 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
@@ -51,7 +51,7 @@ class Analytical
 public:
 
     //- Runtime type information
-    TypeName("Analytical");
+    TypeName("analytical");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
index 1cefd5ef59..93726d261f 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
@@ -128,7 +128,7 @@ private:
 public:
 
     //- Runtime type information
-    TypeName("IntegrationScheme");
+    TypeName("integrationScheme");
 
 
     //- Declare runtime constructor selection table
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
index 121ad0cf9d..d88a191de6 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
@@ -38,7 +38,7 @@ Foam::IntegrationScheme<Type>::New
 {
     const word schemeName(dict.lookup(phiName));
 
-    Info<< "Selecting " << phiName << " IntegrationScheme "
+    Info<< "Selecting " << phiName << " integration scheme "
         << schemeName << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
@@ -49,9 +49,9 @@ Foam::IntegrationScheme<Type>::New
         FatalErrorIn
         (
             "IntegrationScheme::New(const dictionary&)"
-        )   << "Unknown IntegrationScheme type "
+        )   << "Unknown integration scheme type "
             << schemeName << nl << nl
-            << "Valid IntegrationScheme types are:" << nl
+            << "Valid integration scheme types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index 2a1ea126f0..f3a6866a97 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -7,10 +7,6 @@ BASECLOUDS=$(CLOUDS)/baseClasses
 DERIVEDCLOUDS=$(CLOUDS)/derived
 
 
-/* Parcels */
-$(BASEPARCELS)/reactingParcel/reactingParcel.C
-
-
 /* Cloud base classes */
 $(BASECLOUDS)/kinematicCloud/kinematicCloud.C
 $(BASECLOUDS)/thermoCloud/thermoCloud.C
@@ -20,28 +16,28 @@ $(BASECLOUDS)/reactingMultiphaseCloud/reactingMultiphaseCloud.C
 
 /* kinematic parcel sub-models */
 KINEMATICPARCEL=$(DERIVEDPARCELS)/basicKinematicParcel
-$(KINEMATICPARCEL)/basicKinematicParcel.C
 $(KINEMATICPARCEL)/defineBasicKinematicParcel.C
 $(KINEMATICPARCEL)/makeBasicKinematicParcelSubmodels.C
 
+KINEMATICCOLLIDINGPARCEL=$(DERIVEDPARCELS)/basicKinematicCollidingParcel
+$(KINEMATICCOLLIDINGPARCEL)/defineBasicKinematicCollidingParcel.C
+$(KINEMATICCOLLIDINGPARCEL)/makeBasicKinematicCollidingParcelSubmodels.C
+
 
 /* thermo parcel sub-models */
 THERMOPARCEL=$(DERIVEDPARCELS)/basicThermoParcel
-$(THERMOPARCEL)/basicThermoParcel.C
 $(THERMOPARCEL)/defineBasicThermoParcel.C
 $(THERMOPARCEL)/makeBasicThermoParcelSubmodels.C
 
 
 /* reacting parcel sub-models */
 REACTINGPARCEL=$(DERIVEDPARCELS)/basicReactingParcel
-$(REACTINGPARCEL)/basicReactingParcel.C
 $(REACTINGPARCEL)/defineBasicReactingParcel.C
 $(REACTINGPARCEL)/makeBasicReactingParcelSubmodels.C
 
 
 /* reacting multiphase parcel sub-models */
 REACTINGMPPARCEL=$(DERIVEDPARCELS)/basicReactingMultiphaseParcel
-$(REACTINGMPPARCEL)/basicReactingMultiphaseParcel.C
 $(REACTINGMPPARCEL)/defineBasicReactingMultiphaseParcel.C
 $(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelSubmodels.C
 
@@ -63,6 +59,7 @@ $(THERMOINJECTION)/ThermoLookupTableInjection/thermoParcelInjectionData.C
 $(THERMOINJECTION)/ThermoLookupTableInjection/thermoParcelInjectionDataIO.C
 $(THERMOINJECTION)/ThermoLookupTableInjection/thermoParcelInjectionDataIOList.C
 
+
 REACTINGINJECTION=submodels/Reacting/InjectionModel
 $(REACTINGINJECTION)/ReactingLookupTableInjection/reactingParcelInjectionData.C
 $(REACTINGINJECTION)/ReactingLookupTableInjection/reactingParcelInjectionDataIO.C
@@ -83,5 +80,8 @@ phaseProperties/phaseProperties/phaseProperties.C
 phaseProperties/phaseProperties/phasePropertiesIO.C
 phaseProperties/phasePropertiesList/phasePropertiesList.C
 
+/* Additional helper classes */
+clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
+
 
 LIB = $(FOAM_LIBBIN)/liblagrangianIntermediate
diff --git a/src/lagrangian/intermediate/Make/files.old b/src/lagrangian/intermediate/Make/files.old
new file mode 100644
index 0000000000..b5ccca4ed2
--- /dev/null
+++ b/src/lagrangian/intermediate/Make/files.old
@@ -0,0 +1,70 @@
+PARCELS=parcels
+BASEPARCELS=$(PARCELS)/baseClasses
+DERIVEDPARCELS=$(PARCELS)/derived
+
+
+CLOUDS=clouds
+BASECLOUDS=$(CLOUDS)/baseClasses
+DERIVEDCLOUDS=$(CLOUDS)/derived
+
+
+/* Parcels */
+$(BASEPARCELS)/reactingParcel/reactingParcel.C
+
+
+/* Cloud base classes */
+$(BASECLOUDS)/kinematicCloud/kinematicCloud.C
+$(BASECLOUDS)/thermoCloud/thermoCloud.C
+$(BASECLOUDS)/reactingCloud/reactingCloud.C
+
+
+/* kinematic parcel sub-models */
+KINEMATICPARCEL=$(DERIVEDPARCELS)/basicKinematicParcel
+$(KINEMATICPARCEL)/basicKinematicParcel.C
+$(KINEMATICPARCEL)/defineBasicKinematicParcel.C
+$(KINEMATICPARCEL)/makeBasicKinematicParcelSubmodels.C
+
+/* thermo parcel sub-models */
+THERMOPARCEL=$(DERIVEDPARCELS)/basicThermoParcel
+$(THERMOPARCEL)/basicThermoParcel.C
+$(THERMOPARCEL)/defineBasicThermoParcel.C
+$(THERMOPARCEL)/makeBasicThermoParcelSubmodels.C
+
+/* reacting parcel sub-models */
+REACTINGPARCEL=$(DERIVEDPARCELS)/basicReactingParcel
+$(REACTINGPARCEL)/basicReactingParcel.C
+$(REACTINGPARCEL)/defineBasicReactingParcel.C
+$(REACTINGPARCEL)/makeBasicReactingParcelSubmodels.C
+
+
+/* bolt-on models */
+
+submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C
+
+KINEMATICINJECTION=submodels/Kinematic/InjectionModel
+$(KINEMATICINJECTION)/KinematicLookupTableInjection/kinematicParcelInjectionData.C
+$(KINEMATICINJECTION)/KinematicLookupTableInjection/kinematicParcelInjectionDataIO.C
+$(KINEMATICINJECTION)/KinematicLookupTableInjection/kinematicParcelInjectionDataIOList.C
+
+THERMOINJECTION=submodels/Thermodynamic/InjectionModel
+$(THERMOINJECTION)/ThermoLookupTableInjection/thermoParcelInjectionData.C
+$(THERMOINJECTION)/ThermoLookupTableInjection/thermoParcelInjectionDataIO.C
+$(THERMOINJECTION)/ThermoLookupTableInjection/thermoParcelInjectionDataIOList.C
+
+REACTINGINJECTION=submodels/Reacting/InjectionModel
+$(REACTINGINJECTION)/ReactingLookupTableInjection/reactingParcelInjectionData.C
+$(REACTINGINJECTION)/ReactingLookupTableInjection/reactingParcelInjectionDataIO.C
+$(REACTINGINJECTION)/ReactingLookupTableInjection/reactingParcelInjectionDataIOList.C
+
+
+/* integration schemes */
+IntegrationScheme/makeIntegrationSchemes.C
+
+
+/* phase properties */
+phaseProperties/phaseProperties/phaseProperties.C
+phaseProperties/phaseProperties/phasePropertiesIO.C
+phaseProperties/phasePropertiesList/phasePropertiesList.C
+
+
+LIB = $(FOAM_LIBBIN)/liblagrangianIntermediate
diff --git a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C
new file mode 100644
index 0000000000..eac5aac69a
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C
@@ -0,0 +1,226 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "CollidingCloud.H"
+#include "CollisionModel.H"
+
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::CollidingCloud<CloudType>::setModels()
+{
+    collisionModel_.reset
+    (
+        CollisionModel<CollidingCloud<CloudType> >::New
+        (
+            this->subModelProperties(),
+            *this
+        ).ptr()
+    );
+}
+
+
+template<class CloudType>
+template<class TrackData>
+void  Foam::CollidingCloud<CloudType>::moveCollide(TrackData& td)
+{
+    td.part() = TrackData::tpVelocityHalfStep;
+    CloudType::move(td,  this->solution().deltaT());
+
+    td.part() = TrackData::tpLinearTrack;
+    CloudType::move(td,  this->solution().deltaT());
+
+    // td.part() = TrackData::tpRotationalTrack;
+    // CloudType::move(td);
+
+    this->updateCellOccupancy();
+
+    this->collision().collide();
+
+    td.part() = TrackData::tpVelocityHalfStep;
+    CloudType::move(td,  this->solution().deltaT());
+}
+
+
+
+template<class CloudType>
+void Foam::CollidingCloud<CloudType>::cloudReset(CollidingCloud<CloudType>& c)
+{
+    CloudType::cloudReset(c);
+
+    collisionModel_.reset(c.collisionModel_.ptr());
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::CollidingCloud<CloudType>::CollidingCloud
+(
+    const word& cloudName,
+    const volScalarField& rho,
+    const volVectorField& U,
+    const volScalarField& mu,
+    const dimensionedVector& g,
+    bool readFields
+)
+:
+    CloudType(cloudName, rho, U, mu, g, false),
+    collisionModel_(NULL)
+{
+    if (this->solution().steadyState())
+    {
+        FatalErrorIn
+        (
+            "Foam::CollidingCloud<CloudType>::CollidingCloud"
+            "("
+                "const word&, "
+                "const volScalarField&, "
+                "const volVectorField&, "
+                "const volScalarField&, "
+                "const dimensionedVector&, "
+                "bool"
+            ")"
+        )   << "Collision modelling not currently available for steady state "
+            << "calculations" << exit(FatalError);
+    }
+
+    if (this->solution().active())
+    {
+        setModels();
+    }
+
+    if (readFields)
+    {
+        parcelType::readFields(*this);
+    }
+}
+
+
+template<class CloudType>
+Foam::CollidingCloud<CloudType>::CollidingCloud
+(
+    CollidingCloud<CloudType>& c,
+    const word& name
+)
+:
+    CloudType(c, name),
+    collisionModel_(c.collisionModel_->clone())
+{}
+
+
+template<class CloudType>
+Foam::CollidingCloud<CloudType>::CollidingCloud
+(
+    const fvMesh& mesh,
+    const word& name,
+    const CollidingCloud<CloudType>& c
+)
+:
+    CloudType(mesh, name, c),
+    collisionModel_(NULL)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::CollidingCloud<CloudType>::~CollidingCloud()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::CollidingCloud<CloudType>::storeState()
+{
+    cloudCopyPtr_.reset
+    (
+        static_cast<CollidingCloud<CloudType>*>
+        (
+            clone(this->name() + "Copy").ptr()
+        )
+    );
+}
+
+
+template<class CloudType>
+void Foam::CollidingCloud<CloudType>::restoreState()
+{
+    cloudReset(cloudCopyPtr_());
+    cloudCopyPtr_.clear();
+}
+
+
+template<class CloudType>
+void Foam::CollidingCloud<CloudType>::evolve()
+{
+    if (this->solution().canEvolve())
+    {
+        typename parcelType::template
+            TrackingData<CollidingCloud<CloudType> > td(*this);
+
+        this->solve(td);
+    }
+}
+
+
+template<class CloudType>
+template<class TrackData>
+void  Foam::CollidingCloud<CloudType>::motion(TrackData& td)
+{
+    // Sympletic leapfrog integration of particle forces:
+    // + apply half deltaV with stored force
+    // + move positions with new velocity
+    // + calculate forces in new position
+    // + apply half deltaV with new force
+
+    label nSubCycles = collision().nSubCycles();
+
+    if (nSubCycles > 1)
+    {
+        Info<< "    " << nSubCycles << " move-collide subCycles" << endl;
+
+        subCycleTime moveCollideSubCycle
+        (
+            const_cast<Time&>(this->db().time()),
+            nSubCycles
+        );
+
+        while(!(++moveCollideSubCycle).end())
+        {
+            moveCollide(td);
+        }
+
+        moveCollideSubCycle.endSubCycle();
+    }
+    else
+    {
+        moveCollide(td);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
new file mode 100644
index 0000000000..9ca29cfd56
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
@@ -0,0 +1,232 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::CollidingCloud
+
+Description
+    Adds coolisions to kinematic clouds
+
+SourceFiles
+    CollidingCloudI.H
+    CollidingCloud.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef CollidingCloud_H
+#define CollidingCloud_H
+
+#include "particle.H"
+#include "Cloud.H"
+#include "IOdictionary.H"
+#include "autoPtr.H"
+#include "fvMesh.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+
+template<class CloudType>
+class CollisionModel;
+
+/*---------------------------------------------------------------------------*\
+                       Class CollidingCloud Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class CollidingCloud
+:
+    public CloudType
+{
+public:
+
+    // Public typedefs
+
+        //- Redefine particle type as parcel type
+        typedef typename CloudType::particleType parcelType;
+
+
+private:
+
+    // Private data
+
+        //- Cloud copy pointer
+        autoPtr<CollidingCloud<CloudType> > cloudCopyPtr_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        CollidingCloud(const CollidingCloud&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const CollidingCloud&);
+
+
+protected:
+
+    // Protected data
+
+        // References to the cloud sub-models
+
+            //- Collision model
+            autoPtr<CollisionModel<CollidingCloud<CloudType> > >
+                collisionModel_;
+
+
+        // Initialisation
+
+            //- Set cloud sub-models
+            void setModels();
+
+
+        // Cloud evolution functions
+
+            //- Move-collide particles
+            template<class TrackData>
+            void moveCollide(TrackData& td);
+
+            //- Reset state of cloud
+            void cloudReset(CollidingCloud<CloudType>& c);
+
+
+public:
+
+    typedef CloudType cloudType;
+
+    // Constructors
+
+        //- Construct given carrier gas fields
+        CollidingCloud
+        (
+            const word& cloudName,
+            const volScalarField& rho,
+            const volVectorField& U,
+            const volScalarField& mu,
+            const dimensionedVector& g,
+            bool readFields = true
+        );
+
+        //- Copy constructor with new name
+        CollidingCloud
+        (
+            CollidingCloud<CloudType>& c,
+            const word& name
+        );
+
+        //- Copy constructor with new name - creates bare cloud
+        CollidingCloud
+        (
+            const fvMesh& mesh,
+            const word& name,
+            const CollidingCloud<CloudType>& c
+        );
+
+        //- Construct and return clone based on (this) with new name
+        virtual autoPtr<Cloud<parcelType> > clone(const word& name)
+        {
+            return autoPtr<Cloud<parcelType> >
+            (
+                new CollidingCloud(*this, name)
+            );
+        }
+
+        //- Construct and return bare clone based on (this) with new name
+        virtual autoPtr<Cloud<parcelType> > cloneBare(const word& name) const
+        {
+            return autoPtr<Cloud<parcelType> >
+            (
+                new CollidingCloud(this->mesh(), name, *this)
+            );
+        }
+
+
+    //- Destructor
+    virtual ~CollidingCloud();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return a reference to the cloud copy
+            inline const CollidingCloud& cloudCopy() const;
+
+            //- If the collision model controls the wall interaction,
+            //  then the wall impact distance should be zero.
+            //  Otherwise, it should be allowed to be the value from
+            //  the Parcel.
+            inline bool hasWallImpactDistance() const;
+
+
+            // Sub-models
+
+                //- Return const access to the collision model
+                inline const CollisionModel<CollidingCloud<CloudType> >&
+                    collision() const;
+
+                //- Return reference to the collision model
+                inline CollisionModel<CollidingCloud<CloudType> >&
+                    collision();
+
+
+        // Evolution
+
+            //- Store the current cloud state
+            void storeState();
+
+            //- Reset the current cloud to the previously stored state
+            void restoreState();
+
+            //- Evolve the cloud
+            void evolve();
+
+            //- Particle motion
+            template<class TrackData>
+            void motion(TrackData& td);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "CollidingCloudI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "CollidingCloud.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloudI.H
new file mode 100644
index 0000000000..fb473bc0b3
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloudI.H
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2008-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+inline const Foam::CollidingCloud<CloudType>&
+Foam::CollidingCloud<CloudType>::cloudCopy() const
+{
+    return cloudCopyPtr_();
+}
+
+
+template<class CloudType>
+inline bool Foam::CollidingCloud<CloudType>::hasWallImpactDistance() const
+{
+    return !collision().controlsWallInteraction();
+}
+
+
+template<class CloudType>
+inline const Foam::CollisionModel<Foam::CollidingCloud<CloudType> >&
+Foam::CollidingCloud<CloudType>::collision() const
+{
+    return collisionModel_();
+}
+
+
+template<class CloudType>
+inline Foam::CollisionModel<Foam::CollidingCloud<CloudType> >&
+Foam::CollidingCloud<CloudType>::collision()
+{
+    return collisionModel_();
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index d48136443d..4275cf78f8 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -28,180 +28,20 @@ License
 #include "interpolation.H"
 #include "subCycleTime.H"
 
-#include "CollisionModel.H"
 #include "DispersionModel.H"
 #include "InjectionModel.H"
 #include "PatchInteractionModel.H"
 #include "PostProcessingModel.H"
 #include "SurfaceFilmModel.H"
 
-// * * * * * * * * * * * * * * cloudSolution * * * * * * * * * * * * * * * * //
-
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::cloudSolution::read()
-{
-    dict_.lookup("transient") >> transient_;
-    dict_.lookup("coupled") >> coupled_;
-    dict_.lookup("cellValueSourceCorrection") >> cellValueSourceCorrection_;
-
-    if (steadyState())
-    {
-        dict_.lookup("calcFrequency") >> calcFrequency_;
-        dict_.lookup("maxCo") >> maxCo_;
-        dict_.lookup("maxTrackTime") >> maxTrackTime_;
-        dict_.subDict("sourceTerms").lookup("resetOnStartup")
-            >> resetSourcesOnStartup_;
-    }
-}
-
-
-template<class ParcelType>
-Foam::KinematicCloud<ParcelType>::cloudSolution::cloudSolution
-(
-    const fvMesh& mesh,
-    const dictionary& dict
-)
-:
-    mesh_(mesh),
-    dict_(dict),
-    active_(dict.lookup("active")),
-    transient_(false),
-    calcFrequency_(1),
-    maxCo_(0.3),
-    iter_(1),
-    deltaT_(0.0),
-    coupled_(false),
-    cellValueSourceCorrection_(false),
-    maxTrackTime_(0.0),
-    resetSourcesOnStartup_(true)
-{
-    if (active_)
-    {
-        read();
-    }
-}
-
-
-template<class ParcelType>
-Foam::KinematicCloud<ParcelType>::cloudSolution::cloudSolution
-(
-    const cloudSolution& cs
-)
-:
-    mesh_(cs.mesh_),
-    dict_(cs.dict_),
-    active_(cs.active_),
-    transient_(cs.transient_),
-    calcFrequency_(cs.calcFrequency_),
-    maxCo_(cs.maxCo_),
-    iter_(cs.iter_),
-    deltaT_(cs.deltaT_),
-    coupled_(cs.coupled_),
-    cellValueSourceCorrection_(cs.cellValueSourceCorrection_),
-    maxTrackTime_(cs.maxTrackTime_),
-    resetSourcesOnStartup_(cs.resetSourcesOnStartup_)
-{}
-
-
-template<class ParcelType>
-Foam::KinematicCloud<ParcelType>::cloudSolution::cloudSolution
-(
-    const fvMesh& mesh
-)
-:
-    mesh_(mesh),
-    dict_(dictionary::null),
-    active_(false),
-    transient_(false),
-    calcFrequency_(0),
-    maxCo_(GREAT),
-    iter_(0),
-    deltaT_(0.0),
-    coupled_(false),
-    cellValueSourceCorrection_(false),
-    maxTrackTime_(0.0),
-    resetSourcesOnStartup_(false)
-{}
-
-
-template<class ParcelType>
-Foam::KinematicCloud<ParcelType>::cloudSolution::~cloudSolution()
-{}
-
-
-template<class ParcelType>
-Foam::scalar Foam::KinematicCloud<ParcelType>::cloudSolution::relaxCoeff
-(
-    const word& fieldName
-) const
-{
-    return readScalar(sourceTermDict().subDict(fieldName).lookup("alpha"));
-}
-
-
-template<class ParcelType>
-bool Foam::KinematicCloud<ParcelType>::cloudSolution::semiImplicit
-(
-    const word& fieldName
-) const
-{
-    return readBool(sourceTermDict().subDict(fieldName).lookup("semiImplicit"));
-}
-
-
-template<class ParcelType>
-bool Foam::KinematicCloud<ParcelType>::cloudSolution::solveThisStep() const
-{
-    return
-        active_
-     && (
-            mesh_.time().outputTime()
-         || (mesh_.time().timeIndex() % calcFrequency_ == 0)
-        );
-}
-
-
-template<class ParcelType>
-bool Foam::KinematicCloud<ParcelType>::cloudSolution::canEvolve()
-{
-    // Set the calculation time step
-    if (transient_)
-    {
-        deltaT_ = mesh_.time().deltaTValue();
-    }
-    else
-    {
-        deltaT_ = maxTrackTime_;
-    }
-
-    return solveThisStep();
-}
-
-
-template<class ParcelType>
-bool Foam::KinematicCloud<ParcelType>::cloudSolution::output() const
-{
-    return active_ && mesh_.time().outputTime();
-}
-
-
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
 
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::setModels()
+template<class CloudType>
+void Foam::KinematicCloud<CloudType>::setModels()
 {
-    collisionModel_.reset
-    (
-        CollisionModel<KinematicCloud<ParcelType> >::New
-        (
-            subModelProperties_,
-            *this
-        ).ptr()
-    );
-
     dispersionModel_.reset
     (
-        DispersionModel<KinematicCloud<ParcelType> >::New
+        DispersionModel<KinematicCloud<CloudType> >::New
         (
             subModelProperties_,
             *this
@@ -210,7 +50,7 @@ void Foam::KinematicCloud<ParcelType>::setModels()
 
     injectionModel_.reset
     (
-        InjectionModel<KinematicCloud<ParcelType> >::New
+        InjectionModel<KinematicCloud<CloudType> >::New
         (
             subModelProperties_,
             *this
@@ -219,7 +59,7 @@ void Foam::KinematicCloud<ParcelType>::setModels()
 
     patchInteractionModel_.reset
     (
-        PatchInteractionModel<KinematicCloud<ParcelType> >::New
+        PatchInteractionModel<KinematicCloud<CloudType> >::New
         (
             subModelProperties_,
             *this
@@ -228,7 +68,7 @@ void Foam::KinematicCloud<ParcelType>::setModels()
 
     postProcessingModel_.reset
     (
-        PostProcessingModel<KinematicCloud<ParcelType> >::New
+        PostProcessingModel<KinematicCloud<CloudType> >::New
         (
             subModelProperties_,
             *this
@@ -237,7 +77,7 @@ void Foam::KinematicCloud<ParcelType>::setModels()
 
     surfaceFilmModel_.reset
     (
-        SurfaceFilmModel<KinematicCloud<ParcelType> >::New
+        SurfaceFilmModel<KinematicCloud<CloudType> >::New
         (
             subModelProperties_,
             *this,
@@ -256,11 +96,9 @@ void Foam::KinematicCloud<ParcelType>::setModels()
 }
 
 
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::solve
-(
-    typename ParcelType::trackData& td
-)
+template<class CloudType>
+template<class TrackData>
+void Foam::KinematicCloud<CloudType>::solve(TrackData& td)
 {
     if (solution_.transient())
     {
@@ -290,8 +128,8 @@ void Foam::KinematicCloud<ParcelType>::solve
 }
 
 
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::preEvolve()
+template<class CloudType>
+void Foam::KinematicCloud<CloudType>::preEvolve()
 {
     Info<< "\nSolving cloud " << this->name() << endl;
 
@@ -301,14 +139,14 @@ void Foam::KinematicCloud<ParcelType>::preEvolve()
 }
 
 
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::buildCellOccupancy()
+template<class CloudType>
+void Foam::KinematicCloud<CloudType>::buildCellOccupancy()
 {
     if (cellOccupancyPtr_.empty())
     {
         cellOccupancyPtr_.reset
         (
-            new List<DynamicList<ParcelType*> >(mesh_.nCells())
+            new List<DynamicList<parcelType*> >(mesh_.nCells())
         );
     }
     else if (cellOccupancyPtr_().size() != mesh_.nCells())
@@ -319,22 +157,22 @@ void Foam::KinematicCloud<ParcelType>::buildCellOccupancy()
         cellOccupancyPtr_().setSize(mesh_.nCells());
     }
 
-    List<DynamicList<ParcelType*> >& cellOccupancy = cellOccupancyPtr_();
+    List<DynamicList<parcelType*> >& cellOccupancy = cellOccupancyPtr_();
 
     forAll(cellOccupancy, cO)
     {
         cellOccupancy[cO].clear();
     }
 
-    forAllIter(typename KinematicCloud<ParcelType>, *this, iter)
+    forAllIter(typename KinematicCloud<CloudType>, *this, iter)
     {
         cellOccupancy[iter().cell()].append(&iter());
     }
 }
 
 
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::updateCellOccupancy()
+template<class CloudType>
+void Foam::KinematicCloud<CloudType>::updateCellOccupancy()
 {
     // Only build the cellOccupancy if the pointer is set, i.e. it has
     // been requested before.
@@ -346,11 +184,9 @@ void Foam::KinematicCloud<ParcelType>::updateCellOccupancy()
 }
 
 
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::evolveCloud
-(
-    typename ParcelType::trackData& td
-)
+template<class CloudType>
+template<class TrackData>
+void Foam::KinematicCloud<CloudType>::evolveCloud(TrackData& td)
 {
     if (solution_.coupled())
     {
@@ -376,7 +212,7 @@ void Foam::KinematicCloud<ParcelType>::evolveCloud
 
         // Assume that motion will update the cellOccupancy as necessary
         // before it is required.
-        motion(td);
+        td.cloud().motion(td);
     }
     else
     {
@@ -384,76 +220,14 @@ void Foam::KinematicCloud<ParcelType>::evolveCloud
 
         this->injection().injectSteadyState(td, solution_.deltaT());
 
-        td.part() = ParcelType::trackData::tpLinearTrack;
-        Cloud<ParcelType>::move(td,  solution_.deltaT());
+        td.part() = TrackData::tpLinearTrack;
+        CloudType::move(td,  solution_.deltaT());
     }
 }
 
 
-template<class ParcelType>
-void  Foam::KinematicCloud<ParcelType>::motion
-(
-    typename ParcelType::trackData& td
-)
-{
-    // Sympletic leapfrog integration of particle forces:
-    // + apply half deltaV with stored force
-    // + move positions with new velocity
-    // + calculate forces in new position
-    // + apply half deltaV with new force
-
-    label nSubCycles = collision().nSubCycles();
-
-    if (nSubCycles > 1)
-    {
-        Info<< "    " << nSubCycles << " move-collide subCycles" << endl;
-
-        subCycleTime moveCollideSubCycle
-        (
-            const_cast<Time&>(this->db().time()),
-            nSubCycles
-        );
-
-        while(!(++moveCollideSubCycle).end())
-        {
-            moveCollide(td);
-        }
-
-        moveCollideSubCycle.endSubCycle();
-    }
-    else
-    {
-        moveCollide(td);
-    }
-}
-
-
-template<class ParcelType>
-void  Foam::KinematicCloud<ParcelType>::moveCollide
-(
-    typename ParcelType::trackData& td
-)
-{
-    td.part() = ParcelType::trackData::tpVelocityHalfStep;
-    Cloud<ParcelType>::move(td,  solution_.deltaT());
-
-    td.part() = ParcelType::trackData::tpLinearTrack;
-    Cloud<ParcelType>::move(td,  solution_.deltaT());
-
-    // td.part() = ParcelType::trackData::tpRotationalTrack;
-    // Cloud<ParcelType>::move(td);
-
-    updateCellOccupancy();
-
-    this->collision().collide();
-
-    td.part() = ParcelType::trackData::tpVelocityHalfStep;
-    Cloud<ParcelType>::move(td,  solution_.deltaT());
-}
-
-
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::postEvolve()
+template<class CloudType>
+void Foam::KinematicCloud<CloudType>::postEvolve()
 {
     Info<< endl;
 
@@ -471,16 +245,15 @@ void Foam::KinematicCloud<ParcelType>::postEvolve()
 }
 
 
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::cloudReset(KinematicCloud<ParcelType>& c)
+template<class CloudType>
+void Foam::KinematicCloud<CloudType>::cloudReset(KinematicCloud<CloudType>& c)
 {
-    Cloud<ParcelType>::cloudReset(c);
+    CloudType::cloudReset(c);
 
     rndGen_ = c.rndGen_;
 
     forces_.transfer(c.forces_);
 
-    collisionModel_.reset(c.collisionModel_.ptr());
     dispersionModel_.reset(c.dispersionModel_.ptr());
     injectionModel_.reset(c.injectionModel_.ptr());
     patchInteractionModel_.reset(c.patchInteractionModel_.ptr());
@@ -492,8 +265,8 @@ void Foam::KinematicCloud<ParcelType>::cloudReset(KinematicCloud<ParcelType>& c)
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class ParcelType>
-Foam::KinematicCloud<ParcelType>::KinematicCloud
+template<class CloudType>
+Foam::KinematicCloud<CloudType>::KinematicCloud
 (
     const word& cloudName,
     const volScalarField& rho,
@@ -503,7 +276,7 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
     bool readFields
 )
 :
-    Cloud<ParcelType>(rho.mesh(), cloudName, false),
+    CloudType(rho.mesh(), cloudName, false),
     kinematicCloud(),
     cloudCopyPtr_(NULL),
     mesh_(rho.mesh()),
@@ -545,7 +318,6 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
         ),
         solution_.active()
     ),
-    collisionModel_(NULL),
     dispersionModel_(NULL),
     injectionModel_(NULL),
     patchInteractionModel_(NULL),
@@ -592,7 +364,7 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
 
     if (readFields)
     {
-        ParcelType::readFields(*this);
+        parcelType::readFields(*this);
     }
 
     if (solution_.resetSourcesOnStartup())
@@ -602,14 +374,14 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
 }
 
 
-template<class ParcelType>
-Foam::KinematicCloud<ParcelType>::KinematicCloud
+template<class CloudType>
+Foam::KinematicCloud<CloudType>::KinematicCloud
 (
-    KinematicCloud<ParcelType>& c,
+    KinematicCloud<CloudType>& c,
     const word& name
 )
 :
-    Cloud<ParcelType>(c.mesh_, name, c),
+    CloudType(c.mesh_, name, c),
     kinematicCloud(),
     cloudCopyPtr_(NULL),
     mesh_(c.mesh_),
@@ -624,7 +396,6 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
     mu_(c.mu_),
     g_(c.g_),
     forces_(c.forces_),
-    collisionModel_(c.collisionModel_->clone()),
     dispersionModel_(c.dispersionModel_->clone()),
     injectionModel_(c.injectionModel_->clone()),
     patchInteractionModel_(c.patchInteractionModel_->clone()),
@@ -666,15 +437,15 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
 {}
 
 
-template<class ParcelType>
-Foam::KinematicCloud<ParcelType>::KinematicCloud
+template<class CloudType>
+Foam::KinematicCloud<CloudType>::KinematicCloud
 (
     const fvMesh& mesh,
     const word& name,
-    const KinematicCloud<ParcelType>& c
+    const KinematicCloud<CloudType>& c
 )
 :
-    Cloud<ParcelType>(mesh, name, IDLList<ParcelType>()),
+    CloudType(mesh, name, IDLList<parcelType>()),
     kinematicCloud(),
     cloudCopyPtr_(NULL),
     mesh_(mesh),
@@ -700,7 +471,6 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
     mu_(c.mu_),
     g_(c.g_),
     forces_(*this, mesh),
-    collisionModel_(NULL),
     dispersionModel_(NULL),
     injectionModel_(NULL),
     patchInteractionModel_(NULL),
@@ -714,17 +484,17 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class ParcelType>
-Foam::KinematicCloud<ParcelType>::~KinematicCloud()
+template<class CloudType>
+Foam::KinematicCloud<CloudType>::~KinematicCloud()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::checkParcelProperties
+template<class CloudType>
+void Foam::KinematicCloud<CloudType>::checkParcelProperties
 (
-    ParcelType& parcel,
+    parcelType& parcel,
     const scalar lagrangianDt,
     const bool fullyDescribed
 )
@@ -736,15 +506,16 @@ void Foam::KinematicCloud<ParcelType>::checkParcelProperties
 
     const scalar carrierDt = this->db().time().deltaTValue();
     parcel.stepFraction() = (carrierDt - lagrangianDt)/carrierDt;
+    parcel.typeId() = constProps_.parcelTypeId();
 }
 
 
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::storeState()
+template<class CloudType>
+void Foam::KinematicCloud<CloudType>::storeState()
 {
     cloudCopyPtr_.reset
     (
-        static_cast<KinematicCloud<ParcelType>*>
+        static_cast<KinematicCloud<CloudType>*>
         (
             clone(this->name() + "Copy").ptr()
         )
@@ -752,25 +523,25 @@ void Foam::KinematicCloud<ParcelType>::storeState()
 }
 
 
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::restoreState()
+template<class CloudType>
+void Foam::KinematicCloud<CloudType>::restoreState()
 {
     cloudReset(cloudCopyPtr_());
     cloudCopyPtr_.clear();
 }
 
 
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::resetSourceTerms()
+template<class CloudType>
+void Foam::KinematicCloud<CloudType>::resetSourceTerms()
 {
     UTrans().field() = vector::zero;
     UCoeff().field() = 0.0;
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 template<class Type>
-void Foam::KinematicCloud<ParcelType>::relax
+void Foam::KinematicCloud<CloudType>::relax
 (
     DimensionedField<Type, volMesh>& field,
     const DimensionedField<Type, volMesh>& field0,
@@ -783,30 +554,42 @@ void Foam::KinematicCloud<ParcelType>::relax
 }
 
 
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::relaxSources
+template<class CloudType>
+void Foam::KinematicCloud<CloudType>::relaxSources
 (
-    const KinematicCloud<ParcelType>& cloudOldTime
+    const KinematicCloud<CloudType>& cloudOldTime
 )
 {
     this->relax(UTrans_(), cloudOldTime.UTrans(), "U");
 }
 
 
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::evolve()
+template<class CloudType>
+void Foam::KinematicCloud<CloudType>::evolve()
 {
     if (solution_.canEvolve())
     {
-        typename ParcelType::trackData td(*this);
+        typename parcelType::template
+            TrackingData<KinematicCloud<CloudType> > td(*this);
 
         solve(td);
     }
 }
 
 
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::info() const
+template<class CloudType>
+template<class TrackData>
+void  Foam::KinematicCloud<CloudType>::motion(TrackData& td)
+{
+    td.part() = TrackData::tpLinearTrack;
+    CloudType::move(td,  solution_.deltaT());
+
+    updateCellOccupancy();
+}
+
+
+template<class CloudType>
+void Foam::KinematicCloud<CloudType>::info() const
 {
     vector linearMomentum = linearMomentumOfSystem();
     reduce(linearMomentum, sumOp<vector>());
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 50e8d182aa..5a124609f6 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -27,15 +27,12 @@ Class
 Description
     Templated base class for kinematic cloud
 
-    - holds a 'cloudSolution' class that stores all relevant solution info
-
     - particle forces
       - buoyancy
       - drag
       - pressure gradient
 
     - sub-models:
-      - Collision model
       - Dispersion model
       - Injection model
       - Patch interaction model
@@ -51,6 +48,7 @@ SourceFiles
 #ifndef KinematicCloud_H
 #define KinematicCloud_H
 
+#include "particle.H"
 #include "Cloud.H"
 #include "kinematicCloud.H"
 #include "IOdictionary.H"
@@ -59,8 +57,10 @@ SourceFiles
 #include "fvMesh.H"
 #include "volFields.H"
 #include "fvMatrices.H"
-
 #include "IntegrationSchemesFwd.H"
+#include "cloudSolution.H"
+
+#include "ParticleForceList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -69,9 +69,6 @@ namespace Foam
 
 // Forward declaration of classes
 
-template<class CloudType>
-class CollisionModel;
-
 template<class CloudType>
 class DispersionModel;
 
@@ -92,16 +89,21 @@ class SurfaceFilmModel;
                        Class KinematicCloud Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class ParcelType>
+template<class CloudType>
 class KinematicCloud
 :
-    public Cloud<ParcelType>,
+    public CloudType,
     public kinematicCloud
 {
 public:
 
-    //- Type of parcel the cloud was instantiated for
-    typedef ParcelType parcelType;
+    // Public typedefs
+
+        //- Redefine particle type as parcel type
+        typedef typename CloudType::particleType parcelType;
+
+        //- Force type
+        typedef ParticleForceList<KinematicCloud<CloudType> > forceType;
 
 
 private:
@@ -109,7 +111,7 @@ private:
     // Private data
 
         //- Cloud copy pointer
-        autoPtr<KinematicCloud<ParcelType> > cloudCopyPtr_;
+        autoPtr<KinematicCloud<CloudType> > cloudCopyPtr_;
 
 
     // Private Member Functions
@@ -121,164 +123,6 @@ private:
         void operator=(const KinematicCloud&);
 
 
-public:
-
-    // Cloud solution helper class
-    class cloudSolution
-    {
-        // Private Data
-
-            //- Reference to the mesh
-            const fvMesh& mesh_;
-
-            //- Dictionary used during construction
-            dictionary dict_;
-
-            //- Cloud active flag
-            const Switch active_;
-
-            //- Transient flag
-            Switch transient_;
-
-            //- Calculation frequency - carrier steps per cloud step
-            //  NOTE: Steady operation only
-            label calcFrequency_;
-
-            //- Maximum particle Courant number
-            //  Max fraction of current cell that can be traversed in a single
-            //  step
-            scalar maxCo_;
-
-            //- Current cloud iteration
-            label iter_;
-
-            //- Cloud solution time step
-            scalar deltaT_;
-
-
-            // Run-time options
-
-                //- Flag to indicate whether parcels are coupled to the carrier
-                //  phase, i.e. whether or not to generate source terms for
-                //  carrier phase
-                Switch coupled_;
-
-                //- Flag to correct cell values with latest transfer information
-                //  during the lagrangian timestep
-                Switch cellValueSourceCorrection_;
-
-                //- Maximum particle track time [s]
-                scalar maxTrackTime_;
-
-                //- Flag to indicate whether coupling source terms should be
-                //  reset on start-up/first read
-                Switch resetSourcesOnStartup_;
-
-
-        // Private Member Functions
-
-            //- Disallow default bitwise assignment
-            void operator=(const cloudSolution&);
-
-
-    public:
-
-        // Constructors
-
-            //- Construct null from mesh reference
-            cloudSolution(const fvMesh& mesh);
-
-            //- Construct from mesh and dictionary
-            cloudSolution(const fvMesh& mesh, const dictionary& dict);
-
-            //- Construct copy
-            cloudSolution(const cloudSolution& cs);
-
-
-        //- Destructor
-        virtual ~cloudSolution();
-
-
-        // Member functions
-
-            //- Read properties from dictionary
-            void read();
-
-
-            // Access
-
-                //- Return relaxation coefficient for field
-                scalar relaxCoeff(const word& fieldName) const;
-
-                //- Return semi-implicit flag coefficient for field
-                bool semiImplicit(const word& fieldName) const;
-
-                //- Return reference to the mesh
-                inline const fvMesh& mesh() const;
-
-                //- Return const access to the dictionary
-                inline const dictionary& dict() const;
-
-                //- Return the active flag
-                inline const Switch active() const;
-
-                //- Return const access to the transient flag
-                inline const Switch transient() const;
-
-                //- Return const access to the steady flag
-                inline const Switch steadyState() const;
-
-                //- Return const access to the calculation frequency
-                inline label calcFrequency() const;
-
-                //- Return const access to the max particle Courant number
-                inline scalar maxCo() const;
-
-                //- Return const access to the current cloud iteration
-                inline label iter() const;
-
-                //- Increment and return iter counter
-                inline label nextIter();
-
-                //- Return the time step
-                inline scalar deltaT() const;
-
-                //- Return const access to the coupled flag
-                inline const Switch coupled() const;
-
-                //- Return const access to the cell value correction flag
-                inline const Switch cellValueSourceCorrection() const;
-
-                //- Return const access to the particle track time
-                inline scalar maxTrackTime() const;
-
-                //- Return const access to the reset sources flag
-                inline const Switch resetSourcesOnStartup() const;
-
-                //- Source terms dictionary
-                inline const dictionary& sourceTermDict() const;
-
-                //- Interpolation schemes dictionary
-                inline const dictionary& interpolationSchemes() const;
-
-                //- Integration schemes dictionary
-                inline const dictionary& integrationSchemes() const;
-
-
-        // Helper functions
-
-            //- Returns true if performing a cloud iteration this calc step
-            bool solveThisStep() const;
-
-            //- Returns true if possible to evolve the cloud and sets timestep
-            //  parameters
-            bool canEvolve();
-
-            //- Returns true if writing this step
-            bool output() const;
-    };
-
-
 protected:
 
     // Protected data
@@ -293,7 +137,7 @@ protected:
         cloudSolution solution_;
 
         //- Parcel constant properties
-        typename ParcelType::constantProperties constProps_;
+        typename parcelType::constantProperties constProps_;
 
         //- Sub-models dictionary
         const dictionary subModelProperties_;
@@ -302,7 +146,7 @@ protected:
         cachedRandom rndGen_;
 
         //- Cell occupancy information for each parcel, (demand driven)
-        autoPtr<List<DynamicList<ParcelType*> > > cellOccupancyPtr_;
+        autoPtr<List<DynamicList<parcelType*> > > cellOccupancyPtr_;
 
 
         // References to the carrier gas fields
@@ -324,33 +168,29 @@ protected:
 
 
         //- Optional particle forces
-        typename ParcelType::forceType forces_;
+        forceType forces_;
 
 
         // References to the cloud sub-models
 
-            //- Collision model
-            autoPtr<CollisionModel<KinematicCloud<ParcelType> > >
-                collisionModel_;
-
             //- Dispersion model
-            autoPtr<DispersionModel<KinematicCloud<ParcelType> > >
+            autoPtr<DispersionModel<KinematicCloud<CloudType> > >
                 dispersionModel_;
 
             //- Injector model
-            autoPtr<InjectionModel<KinematicCloud<ParcelType> > >
+            autoPtr<InjectionModel<KinematicCloud<CloudType> > >
                 injectionModel_;
 
             //- Patch interaction model
-            autoPtr<PatchInteractionModel<KinematicCloud<ParcelType> > >
+            autoPtr<PatchInteractionModel<KinematicCloud<CloudType> > >
                 patchInteractionModel_;
 
             //- Post-processing model
-            autoPtr<PostProcessingModel<KinematicCloud<ParcelType> > >
+            autoPtr<PostProcessingModel<KinematicCloud<CloudType> > >
                 postProcessingModel_;
 
             //- Surface film model
-            autoPtr<SurfaceFilmModel<KinematicCloud<ParcelType> > >
+            autoPtr<SurfaceFilmModel<KinematicCloud<CloudType> > >
                 surfaceFilmModel_;
 
 
@@ -378,7 +218,8 @@ protected:
         // Cloud evolution functions
 
             //- Solve the cloud - calls all evolution functions
-            void solve(typename ParcelType::trackData& td);
+            template<class TrackData>
+            void solve(TrackData& td);
 
             //- Pre-evolve
             void preEvolve();
@@ -391,23 +232,20 @@ protected:
             void updateCellOccupancy();
 
             //- Evolve the cloud
-            void evolveCloud(typename ParcelType::trackData& td);
-
-            //- Particle motion
-            void motion(typename ParcelType::trackData& td);
-
-            //- Move-collide particles
-            void moveCollide(typename ParcelType::trackData& td);
+            template<class TrackData>
+            void evolveCloud(TrackData& td);
 
             //- Post-evolve
             void postEvolve();
 
             //- Reset state of cloud
-            void cloudReset(KinematicCloud<ParcelType>& c);
+            void cloudReset(KinematicCloud<CloudType>& c);
 
 
 public:
 
+    typedef CloudType cloudType;
+
     // Constructors
 
         //- Construct given carrier gas fields
@@ -422,29 +260,33 @@ public:
         );
 
         //- Copy constructor with new name
-        KinematicCloud(KinematicCloud<ParcelType>& c, const word& name);
+        KinematicCloud
+        (
+            KinematicCloud<CloudType>& c,
+            const word& name
+        );
 
         //- Copy constructor with new name - creates bare cloud
         KinematicCloud
         (
             const fvMesh& mesh,
             const word& name,
-            const KinematicCloud<ParcelType>& c
+            const KinematicCloud<CloudType>& c
         );
 
         //- Construct and return clone based on (this) with new name
-        virtual autoPtr<Cloud<ParcelType> > clone(const word& name)
+        virtual autoPtr<Cloud<parcelType> > clone(const word& name)
         {
-            return autoPtr<Cloud<ParcelType> >
+            return autoPtr<Cloud<parcelType> >
             (
                 new KinematicCloud(*this, name)
             );
         }
 
         //- Construct and return bare clone based on (this) with new name
-        virtual autoPtr<Cloud<ParcelType> > cloneBare(const word& name) const
+        virtual autoPtr<Cloud<parcelType> > cloneBare(const word& name) const
         {
-            return autoPtr<Cloud<ParcelType> >
+            return autoPtr<Cloud<parcelType> >
             (
                 new KinematicCloud(this->mesh(), name, *this)
             );
@@ -462,16 +304,10 @@ public:
             //- Return a reference to the cloud copy
             inline const KinematicCloud& cloudCopy() const;
 
-            //- If the collision model controls the wall interaction,
-            //  then the wall impact distance should be zero.
-            //  Otherwise, it should be allowed to be the value from
-            //  the Parcel.
-            inline bool hasWallImpactDistance() const;
-
 
             // References to the mesh and databases
 
-                //- Return refernce to the mesh
+                //- Return reference to the mesh
                 inline const fvMesh& mesh() const;
 
                 //- Return particle properties dictionary
@@ -484,7 +320,7 @@ public:
                 inline cloudSolution& solution();
 
                 //- Return the constant properties
-                inline const typename ParcelType::constantProperties&
+                inline const typename parcelType::constantProperties&
                     constProps() const;
 
                     //- Return reference to the sub-models dictionary
@@ -493,14 +329,14 @@ public:
 
             // Cloud data
 
-                //- Return refernce to the random object
+                //- Return reference to the random object
                 inline cachedRandom& rndGen();
 
                 //- Return the cell occupancy information for each
                 //  parcel, non-const access, the caller is
                 //  responsible for updating it for its own purposes
                 //  if particles are removed or created.
-                inline List<DynamicList<ParcelType*> >& cellOccupancy();
+                inline List<DynamicList<parcelType*> >& cellOccupancy();
 
 
             // References to the carrier gas fields
@@ -522,53 +358,46 @@ public:
 
 
             //- Optional particle forces
-            inline const typename ParcelType::forceType& forces() const;
+//            inline const typename parcelType::forceType& forces() const;
+            inline const forceType& forces() const;
 
 
             // Sub-models
 
-                //- Return const access to the collision model
-                inline const CollisionModel<KinematicCloud<ParcelType> >&
-                    collision() const;
-
-                //- Return reference to the collision model
-                inline CollisionModel<KinematicCloud<ParcelType> >&
-                    collision();
-
                 //- Return const-access to the dispersion model
-                inline const DispersionModel<KinematicCloud<ParcelType> >&
+                inline const DispersionModel<KinematicCloud<CloudType> >&
                     dispersion() const;
 
                 //- Return reference to the dispersion model
-                inline DispersionModel<KinematicCloud<ParcelType> >&
+                inline DispersionModel<KinematicCloud<CloudType> >&
                     dispersion();
 
                 //- Return const access to the injection model
-                inline const InjectionModel<KinematicCloud<ParcelType> >&
+                inline const InjectionModel<KinematicCloud<CloudType> >&
                     injection() const;
 
                 //- Return reference to the injection model
-                inline InjectionModel<KinematicCloud<ParcelType> >&
+                inline InjectionModel<KinematicCloud<CloudType> >&
                     injection();
 
                 //- Return const-access to the patch interaction model
-                inline const PatchInteractionModel<KinematicCloud<ParcelType> >&
+                inline const PatchInteractionModel<KinematicCloud<CloudType> >&
                     patchInteraction() const;
 
                 //- Return reference to the patch interaction model
-                inline PatchInteractionModel<KinematicCloud<ParcelType> >&
+                inline PatchInteractionModel<KinematicCloud<CloudType> >&
                     patchInteraction();
 
                 //- Return reference to post-processing model
-                inline PostProcessingModel<KinematicCloud<ParcelType> >&
+                inline PostProcessingModel<KinematicCloud<CloudType> >&
                     postProcessing();
 
                 //- Return const-access to the surface film model
-                inline const SurfaceFilmModel<KinematicCloud<ParcelType> >&
+                inline const SurfaceFilmModel<KinematicCloud<CloudType> >&
                     surfaceFilm() const;
 
                 //- Return reference to the surface film model
-                inline SurfaceFilmModel<KinematicCloud<ParcelType> >&
+                inline SurfaceFilmModel<KinematicCloud<CloudType> >&
                     surfaceFilm();
 
 
@@ -638,7 +467,7 @@ public:
             //- Check parcel properties
             void checkParcelProperties
             (
-                ParcelType& parcel,
+                parcelType& parcel,
                 const scalar lagrangianDt,
                 const bool fullyDescribed
             );
@@ -662,11 +491,15 @@ public:
             ) const;
 
             //- Apply relaxation to (steady state) cloud sources
-            void relaxSources(const KinematicCloud<ParcelType>& cloudOldTime);
+            void relaxSources(const KinematicCloud<CloudType>& cloudOldTime);
 
             //- Evolve the cloud
             void evolve();
 
+            //- Particle motion
+            template<class TrackData>
+            void motion(TrackData& td);
+
             //- Print cloud information
             void info() const;
 };
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 4c710fa797..baa0f0141d 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -25,348 +25,186 @@ License
 
 #include "fvmSup.H"
 
-// * * * * * * * * * * * cloudSolution Member Functions  * * * * * * * * * * //
-
-template<class ParcelType>
-inline const Foam::fvMesh&
-Foam::KinematicCloud<ParcelType>::cloudSolution::mesh() const
-{
-    return mesh_;
-}
-
-
-template<class ParcelType>
-inline const Foam::dictionary&
-Foam::KinematicCloud<ParcelType>::cloudSolution::dict() const
-{
-    return dict_;
-}
-
-
-template<class ParcelType>
-inline const Foam::Switch
-Foam::KinematicCloud<ParcelType>::cloudSolution::active() const
-{
-    return active_;
-}
-
-
-template<class ParcelType>
-inline const Foam::dictionary&
-Foam::KinematicCloud<ParcelType>::cloudSolution::sourceTermDict() const
-{
-    return dict_.subDict("sourceTerms");
-}
-
-
-template<class ParcelType>
-inline const Foam::dictionary&
-Foam::KinematicCloud<ParcelType>::cloudSolution::interpolationSchemes() const
-{
-    return dict_.subDict("interpolationSchemes");
-}
-
-
-template<class ParcelType>
-inline const Foam::dictionary&
-Foam::KinematicCloud<ParcelType>::cloudSolution::integrationSchemes() const
-{
-    return dict_.subDict("integrationSchemes");
-}
-
-
-template<class ParcelType>
-inline const Foam::Switch
-Foam::KinematicCloud<ParcelType>::cloudSolution::transient() const
-{
-    return transient_;
-}
-
-
-template<class ParcelType>
-inline const Foam::Switch
-Foam::KinematicCloud<ParcelType>::cloudSolution::steadyState() const
-{
-    return !transient_;
-}
-
-
-template<class ParcelType>
-inline Foam::label
-Foam::KinematicCloud<ParcelType>::cloudSolution::calcFrequency() const
-{
-    return calcFrequency_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalar
-Foam::KinematicCloud<ParcelType>::cloudSolution::maxCo() const
-{
-    return maxCo_;
-}
-
-
-template<class ParcelType>
-inline Foam::label Foam::KinematicCloud<ParcelType>::cloudSolution::iter() const
-{
-    return iter_;
-}
-
-
-template<class ParcelType>
-inline Foam::label Foam::KinematicCloud<ParcelType>::cloudSolution::nextIter()
-{
-    return ++iter_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalar
-Foam::KinematicCloud<ParcelType>::cloudSolution::deltaT() const
-{
-    return deltaT_;
-}
-
-
-template<class ParcelType>
-inline const Foam::Switch
-Foam::KinematicCloud<ParcelType>::cloudSolution::coupled() const
-{
-    return coupled_;
-}
-
-
-template<class ParcelType>
-inline const Foam::Switch
-Foam::KinematicCloud<ParcelType>::cloudSolution::cellValueSourceCorrection()
-const
-{
-    return cellValueSourceCorrection_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalar
-Foam::KinematicCloud<ParcelType>::cloudSolution::maxTrackTime() const
-{
-    return maxTrackTime_;
-}
-
-
-template<class ParcelType>
-inline const Foam::Switch
-Foam::KinematicCloud<ParcelType>::cloudSolution::resetSourcesOnStartup() const
-{
-    return resetSourcesOnStartup_;
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class ParcelType>
-inline const Foam::KinematicCloud<ParcelType>&
-Foam::KinematicCloud<ParcelType>::cloudCopy() const
+template<class CloudType>
+inline const Foam::KinematicCloud<CloudType>&
+Foam::KinematicCloud<CloudType>::cloudCopy() const
 {
     return cloudCopyPtr_();
 }
 
 
-template<class ParcelType>
-inline bool Foam::KinematicCloud<ParcelType>::hasWallImpactDistance() const
-{
-    return !collision().controlsWallInteraction();
-}
-
-
-template<class ParcelType>
-inline const Foam::fvMesh& Foam::KinematicCloud<ParcelType>::mesh() const
+template<class CloudType>
+inline const Foam::fvMesh& Foam::KinematicCloud<CloudType>::mesh() const
 {
     return mesh_;
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline const Foam::IOdictionary&
-Foam::KinematicCloud<ParcelType>::particleProperties() const
+Foam::KinematicCloud<CloudType>::particleProperties() const
 {
     return particleProperties_;
 }
 
 
-template<class ParcelType>
-inline const typename Foam::KinematicCloud<ParcelType>::cloudSolution&
-Foam::KinematicCloud<ParcelType>::solution() const
+template<class CloudType>
+inline const Foam::cloudSolution&
+Foam::KinematicCloud<CloudType>::solution() const
 {
     return solution_;
 }
 
 
-template<class ParcelType>
-inline typename Foam::KinematicCloud<ParcelType>::cloudSolution&
-Foam::KinematicCloud<ParcelType>::solution()
+template<class CloudType>
+inline Foam::cloudSolution& Foam::KinematicCloud<CloudType>::solution()
 {
     return solution_;
 }
 
 
-template<class ParcelType>
-inline const typename ParcelType::constantProperties&
-Foam::KinematicCloud<ParcelType>::constProps() const
+template<class CloudType>
+inline const typename CloudType::particleType::constantProperties&
+Foam::KinematicCloud<CloudType>::constProps() const
 {
     return constProps_;
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline const Foam::dictionary&
-Foam::KinematicCloud<ParcelType>::subModelProperties() const
+Foam::KinematicCloud<CloudType>::subModelProperties() const
 {
     return subModelProperties_;
 }
 
 
-template<class ParcelType>
-inline const Foam::volScalarField&
-Foam::KinematicCloud<ParcelType>::rho() const
+template<class CloudType>
+inline const Foam::volScalarField& Foam::KinematicCloud<CloudType>::rho() const
 {
     return rho_;
 }
 
 
-template<class ParcelType>
-inline const Foam::volVectorField& Foam::KinematicCloud<ParcelType>::U() const
+template<class CloudType>
+inline const Foam::volVectorField& Foam::KinematicCloud<CloudType>::U() const
 {
     return U_;
 }
 
 
-template<class ParcelType>
-inline const Foam::volScalarField& Foam::KinematicCloud<ParcelType>::mu() const
+template<class CloudType>
+inline const Foam::volScalarField& Foam::KinematicCloud<CloudType>::mu() const
 {
     return mu_;
 }
 
 
-template<class ParcelType>
-inline const Foam::dimensionedVector&
-Foam::KinematicCloud<ParcelType>::g() const
+template<class CloudType>
+inline const Foam::dimensionedVector& Foam::KinematicCloud<CloudType>::g() const
 {
     return g_;
 }
 
 
-template<class ParcelType>
-inline const typename ParcelType::forceType&
-Foam::KinematicCloud<ParcelType>::forces() const
+template<class CloudType>
+//inline const typename CloudType::parcelType::forceType&
+inline const typename Foam::KinematicCloud<CloudType>::forceType&
+Foam::KinematicCloud<CloudType>::forces() const
 {
     return forces_;
 }
 
 
-template<class ParcelType>
-inline const Foam::CollisionModel<Foam::KinematicCloud<ParcelType> >&
-Foam::KinematicCloud<ParcelType>::collision() const
-{
-    return collisionModel_();
-}
-
-
-template<class ParcelType>
-inline Foam::CollisionModel<Foam::KinematicCloud<ParcelType> >&
-Foam::KinematicCloud<ParcelType>::collision()
-{
-    return collisionModel_();
-}
-
-
-template<class ParcelType>
-inline const Foam::DispersionModel<Foam::KinematicCloud<ParcelType> >&
-Foam::KinematicCloud<ParcelType>::dispersion() const
+template<class CloudType>
+inline const Foam::DispersionModel<Foam::KinematicCloud<CloudType> >&
+Foam::KinematicCloud<CloudType>::dispersion() const
 {
     return dispersionModel_;
 }
 
 
-template<class ParcelType>
-inline Foam::DispersionModel<Foam::KinematicCloud<ParcelType> >&
-Foam::KinematicCloud<ParcelType>::dispersion()
+template<class CloudType>
+inline Foam::DispersionModel<Foam::KinematicCloud<CloudType> >&
+Foam::KinematicCloud<CloudType>::dispersion()
 {
     return dispersionModel_();
 }
 
 
-template<class ParcelType>
-inline const Foam::InjectionModel<Foam::KinematicCloud<ParcelType> >&
-Foam::KinematicCloud<ParcelType>::injection() const
+template<class CloudType>
+inline const Foam::InjectionModel<Foam::KinematicCloud<CloudType> >&
+Foam::KinematicCloud<CloudType>::injection() const
 {
     return injectionModel_;
 }
 
 
-template<class ParcelType>
-inline const Foam::PatchInteractionModel<Foam::KinematicCloud<ParcelType> >&
-Foam::KinematicCloud<ParcelType>::patchInteraction() const
+template<class CloudType>
+inline const Foam::PatchInteractionModel<Foam::KinematicCloud<CloudType> >&
+Foam::KinematicCloud<CloudType>::patchInteraction() const
 {
     return patchInteractionModel_;
 }
 
 
-template<class ParcelType>
-inline Foam::PatchInteractionModel<Foam::KinematicCloud<ParcelType> >&
-Foam::KinematicCloud<ParcelType>::patchInteraction()
+template<class CloudType>
+inline Foam::PatchInteractionModel<Foam::KinematicCloud<CloudType> >&
+Foam::KinematicCloud<CloudType>::patchInteraction()
 {
     return patchInteractionModel_();
 }
 
 
-template<class ParcelType>
-inline Foam::InjectionModel<Foam::KinematicCloud<ParcelType> >&
-Foam::KinematicCloud<ParcelType>::injection()
+template<class CloudType>
+inline Foam::InjectionModel<Foam::KinematicCloud<CloudType> >&
+Foam::KinematicCloud<CloudType>::injection()
 {
     return injectionModel_();
 }
 
 
-template<class ParcelType>
-inline Foam::PostProcessingModel<Foam::KinematicCloud<ParcelType> >&
-Foam::KinematicCloud<ParcelType>::postProcessing()
+template<class CloudType>
+inline Foam::PostProcessingModel<Foam::KinematicCloud<CloudType> >&
+Foam::KinematicCloud<CloudType>::postProcessing()
 {
     return postProcessingModel_();
 }
 
 
-template<class ParcelType>
-inline const Foam::SurfaceFilmModel<Foam::KinematicCloud<ParcelType> >&
-Foam::KinematicCloud<ParcelType>::surfaceFilm() const
+template<class CloudType>
+inline const Foam::SurfaceFilmModel<Foam::KinematicCloud<CloudType> >&
+Foam::KinematicCloud<CloudType>::surfaceFilm() const
 {
     return surfaceFilmModel_();
 }
 
 
-template<class ParcelType>
-inline Foam::SurfaceFilmModel<Foam::KinematicCloud<ParcelType> >&
-Foam::KinematicCloud<ParcelType>::surfaceFilm()
+template<class CloudType>
+inline Foam::SurfaceFilmModel<Foam::KinematicCloud<CloudType> >&
+Foam::KinematicCloud<CloudType>::surfaceFilm()
 {
     return surfaceFilmModel_();
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline const Foam::vectorIntegrationScheme&
-Foam::KinematicCloud<ParcelType>::UIntegrator() const
+Foam::KinematicCloud<CloudType>::UIntegrator() const
 {
     return UIntegrator_;
 }
 
 
-template<class ParcelType>
-inline Foam::scalar Foam::KinematicCloud<ParcelType>::massInSystem() const
+template<class CloudType>
+inline Foam::scalar Foam::KinematicCloud<CloudType>::massInSystem() const
 {
     scalar sysMass = 0.0;
-    forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)
+    forAllConstIter(typename KinematicCloud<CloudType>, *this, iter)
     {
-         const ParcelType& p = iter();
+         const parcelType& p = iter();
          sysMass += p.mass()*p.nParticle();
     }
 
@@ -374,15 +212,15 @@ inline Foam::scalar Foam::KinematicCloud<ParcelType>::massInSystem() const
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline Foam::vector
-Foam::KinematicCloud<ParcelType>::linearMomentumOfSystem() const
+Foam::KinematicCloud<CloudType>::linearMomentumOfSystem() const
 {
     vector linearMomentum(vector::zero);
 
-    forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)
+    forAllConstIter(typename KinematicCloud<CloudType>, *this, iter)
     {
-        const ParcelType& p = iter();
+        const parcelType& p = iter();
 
         linearMomentum += p.mass()*p.U();
     }
@@ -391,15 +229,15 @@ Foam::KinematicCloud<ParcelType>::linearMomentumOfSystem() const
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline Foam::scalar
-Foam::KinematicCloud<ParcelType>::linearKineticEnergyOfSystem() const
+Foam::KinematicCloud<CloudType>::linearKineticEnergyOfSystem() const
 {
     scalar linearKineticEnergy = 0.0;
 
-    forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)
+    forAllConstIter(typename KinematicCloud<CloudType>, *this, iter)
     {
-        const ParcelType& p = iter();
+        const parcelType& p = iter();
 
         linearKineticEnergy += 0.5*p.mass()*(p.U() & p.U());
     }
@@ -408,16 +246,15 @@ Foam::KinematicCloud<ParcelType>::linearKineticEnergyOfSystem() const
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline Foam::scalar
-Foam::KinematicCloud<ParcelType>::
-rotationalKineticEnergyOfSystem() const
+Foam::KinematicCloud<CloudType>::rotationalKineticEnergyOfSystem() const
 {
     scalar rotationalKineticEnergy = 0.0;
 
-    forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)
+    forAllConstIter(typename KinematicCloud<CloudType>, *this, iter)
     {
-        const ParcelType& p = iter();
+        const parcelType& p = iter();
 
         rotationalKineticEnergy +=
             0.5*p.momentOfInertia()*(p.omega() & p.omega());
@@ -427,16 +264,16 @@ rotationalKineticEnergyOfSystem() const
 }
 
 
-template<class ParcelType>
-inline Foam::cachedRandom& Foam::KinematicCloud<ParcelType>::rndGen()
+template<class CloudType>
+inline Foam::cachedRandom& Foam::KinematicCloud<CloudType>::rndGen()
 {
     return rndGen_;
 }
 
 
-template<class ParcelType>
-inline Foam::List<Foam::DynamicList<ParcelType*> >&
-Foam::KinematicCloud<ParcelType>::cellOccupancy()
+template<class CloudType>
+inline Foam::List<Foam::DynamicList<typename CloudType::particleType*> >&
+Foam::KinematicCloud<CloudType>::cellOccupancy()
 {
     if (cellOccupancyPtr_.empty())
     {
@@ -447,41 +284,41 @@ Foam::KinematicCloud<ParcelType>::cellOccupancy()
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline Foam::DimensionedField<Foam::vector, Foam::volMesh>&
-Foam::KinematicCloud<ParcelType>::UTrans()
+Foam::KinematicCloud<CloudType>::UTrans()
 {
     return UTrans_();
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline const Foam::DimensionedField<Foam::vector, Foam::volMesh>&
-Foam::KinematicCloud<ParcelType>::UTrans() const
+Foam::KinematicCloud<CloudType>::UTrans() const
 {
     return UTrans_();
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
-Foam::KinematicCloud<ParcelType>::UCoeff()
+Foam::KinematicCloud<CloudType>::UCoeff()
 {
     return UCoeff_();
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline const Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
-Foam::KinematicCloud<ParcelType>::UCoeff() const
+Foam::KinematicCloud<CloudType>::UCoeff() const
 {
     return UCoeff_();
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline Foam::tmp<Foam::fvVectorMatrix>
-Foam::KinematicCloud<ParcelType>::SU(volVectorField& U) const
+Foam::KinematicCloud<CloudType>::SU(volVectorField& U) const
 {
     if (debug)
     {
@@ -497,7 +334,7 @@ Foam::KinematicCloud<ParcelType>::SU(volVectorField& U) const
         {
             return
                 UTrans()/(mesh_.V()*this->db().time().deltaT())
-              + fvm::SuSp(-UCoeff()/mesh_.V(), U)
+              - fvm::Sp(UCoeff()/mesh_.V(), U)
               + UCoeff()/mesh_.V()*U;
         }
         else
@@ -515,9 +352,9 @@ Foam::KinematicCloud<ParcelType>::SU(volVectorField& U) const
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline const Foam::tmp<Foam::volScalarField>
-Foam::KinematicCloud<ParcelType>::theta() const
+Foam::KinematicCloud<CloudType>::theta() const
 {
     tmp<volScalarField> ttheta
     (
@@ -538,9 +375,9 @@ Foam::KinematicCloud<ParcelType>::theta() const
     );
 
     scalarField& theta = ttheta().internalField();
-    forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)
+    forAllConstIter(typename KinematicCloud<CloudType>, *this, iter)
     {
-        const ParcelType& p = iter();
+        const parcelType& p = iter();
         const label cellI = p.cell();
 
         theta[cellI] += p.nParticle()*p.volume();
@@ -552,9 +389,9 @@ Foam::KinematicCloud<ParcelType>::theta() const
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline const Foam::tmp<Foam::volScalarField>
-Foam::KinematicCloud<ParcelType>::alpha() const
+Foam::KinematicCloud<CloudType>::alpha() const
 {
     tmp<volScalarField> talpha
     (
@@ -575,9 +412,9 @@ Foam::KinematicCloud<ParcelType>::alpha() const
     );
 
     scalarField& alpha = talpha().internalField();
-    forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)
+    forAllConstIter(typename KinematicCloud<CloudType>, *this, iter)
     {
-        const ParcelType& p = iter();
+        const parcelType& p = iter();
         const label cellI = p.cell();
 
         alpha[cellI] += p.nParticle()*p.mass();
@@ -589,9 +426,9 @@ Foam::KinematicCloud<ParcelType>::alpha() const
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline const Foam::tmp<Foam::volScalarField>
-Foam::KinematicCloud<ParcelType>::rhoEff() const
+Foam::KinematicCloud<CloudType>::rhoEff() const
 {
     tmp<volScalarField> trhoEff
     (
@@ -612,9 +449,9 @@ Foam::KinematicCloud<ParcelType>::rhoEff() const
     );
 
     scalarField& rhoEff = trhoEff().internalField();
-    forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)
+    forAllConstIter(typename KinematicCloud<CloudType>, *this, iter)
     {
-        const ParcelType& p = iter();
+        const parcelType& p = iter();
         const label cellI = p.cell();
 
         rhoEff[cellI] += p.nParticle()*p.mass();
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
new file mode 100644
index 0000000000..6a6b0c8ce2
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
@@ -0,0 +1,225 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "cloudSolution.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::cloudSolution::cloudSolution
+(
+    const fvMesh& mesh,
+    const dictionary& dict
+)
+:
+    mesh_(mesh),
+    dict_(dict),
+    active_(dict.lookup("active")),
+    transient_(false),
+    calcFrequency_(1),
+    maxCo_(0.3),
+    iter_(1),
+    deltaT_(0.0),
+    coupled_(false),
+    cellValueSourceCorrection_(false),
+    maxTrackTime_(0.0),
+    resetSourcesOnStartup_(true),
+    schemes_()
+{
+    if (active_)
+    {
+        read();
+    }
+}
+
+
+Foam::cloudSolution::cloudSolution
+(
+    const cloudSolution& cs
+)
+:
+    mesh_(cs.mesh_),
+    dict_(cs.dict_),
+    active_(cs.active_),
+    transient_(cs.transient_),
+    calcFrequency_(cs.calcFrequency_),
+    maxCo_(cs.maxCo_),
+    iter_(cs.iter_),
+    deltaT_(cs.deltaT_),
+    coupled_(cs.coupled_),
+    cellValueSourceCorrection_(cs.cellValueSourceCorrection_),
+    maxTrackTime_(cs.maxTrackTime_),
+    resetSourcesOnStartup_(cs.resetSourcesOnStartup_),
+    schemes_(cs.schemes_)
+{}
+
+
+Foam::cloudSolution::cloudSolution
+(
+    const fvMesh& mesh
+)
+:
+    mesh_(mesh),
+    dict_(dictionary::null),
+    active_(false),
+    transient_(false),
+    calcFrequency_(0),
+    maxCo_(GREAT),
+    iter_(0),
+    deltaT_(0.0),
+    coupled_(false),
+    cellValueSourceCorrection_(false),
+    maxTrackTime_(0.0),
+    resetSourcesOnStartup_(false),
+    schemes_()
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::cloudSolution::~cloudSolution()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::cloudSolution::read()
+{
+    dict_.lookup("transient") >> transient_;
+    dict_.lookup("coupled") >> coupled_;
+    dict_.lookup("cellValueSourceCorrection") >> cellValueSourceCorrection_;
+
+    if (steadyState())
+    {
+        dict_.lookup("calcFrequency") >> calcFrequency_;
+        dict_.lookup("maxCo") >> maxCo_;
+        dict_.lookup("maxTrackTime") >> maxTrackTime_;
+        dict_.subDict("sourceTerms").lookup("resetOnStartup")
+            >> resetSourcesOnStartup_;
+    }
+
+    const dictionary&
+        schemesDict(dict_.subDict("sourceTerms").subDict("schemes"));
+
+    wordList vars(schemesDict.toc());
+    schemes_.setSize(vars.size());
+    forAll(vars, i)
+    {
+        schemes_[i].first() = vars[i];
+
+        Istream& is = schemesDict.lookup(vars[i]);
+        const word scheme(is);
+        if (scheme == "semiImplicit")
+        {
+            is >> schemes_[i].second();
+        }
+        else if (scheme == "explicit")
+        {
+            schemes_[i].second() = -1;
+        }
+        else
+        {
+            FatalErrorIn("void cloudSolution::read()")
+                << "Invalid scheme " << scheme << ". Valid schemes are "
+                << "explicit and semiImplicit" << exit(FatalError);
+        }
+    }
+}
+
+
+Foam::scalar Foam::cloudSolution::relaxCoeff(const word& fieldName) const
+{
+    forAll(schemes_, i)
+    {
+        if (fieldName == schemes_[i].first())
+        {
+            return schemes_[i].second();
+        }
+    }
+
+    FatalErrorIn
+    (
+        "scalar cloudSolution::relaxCoeff(const word& fieldName) const"
+    )   << "Field name " << fieldName << " not found in schemes"
+        << abort(FatalError);
+
+    return 1.0;
+}
+
+
+bool Foam::cloudSolution::semiImplicit(const word& fieldName) const
+{
+    forAll(schemes_, i)
+    {
+        if (fieldName == schemes_[i].first())
+        {
+            return schemes_[i].second() >= 0;
+        }
+    }
+
+    FatalErrorIn
+    (
+        "bool cloudSolution::semiImplicit(const word& fieldName) const"
+    )   << "Field name " << fieldName << " not found in schemes"
+        << abort(FatalError);
+
+    return false;
+}
+
+
+bool Foam::cloudSolution::solveThisStep() const
+{
+    return
+        active_
+     && (
+            mesh_.time().outputTime()
+         || (mesh_.time().timeIndex() % calcFrequency_ == 0)
+        );
+}
+
+
+bool Foam::cloudSolution::canEvolve()
+{
+    // Set the calculation time step
+    if (transient_)
+    {
+        deltaT_ = mesh_.time().deltaTValue();
+    }
+    else
+    {
+        deltaT_ = maxTrackTime_;
+    }
+
+    return solveThisStep();
+}
+
+
+bool Foam::cloudSolution::output() const
+{
+    return active_ && mesh_.time().outputTime();
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
new file mode 100644
index 0000000000..1162df6506
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
@@ -0,0 +1,222 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::cloudSolution
+
+Description
+    - Stores all relevant solution info
+
+SourceFiles
+    cloudSolutionI.H
+    cloudSolution.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cloudSolution_H
+#define cloudSolution_H
+
+#include "fvMesh.H"
+#include "Switch.H"
+#include "Tuple2.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class cloudSolution Declaration
+\*---------------------------------------------------------------------------*/
+
+class cloudSolution
+{
+    // Private Data
+
+        //- Reference to the mesh
+        const fvMesh& mesh_;
+
+        //- Dictionary used during construction
+        dictionary dict_;
+
+        //- Cloud active flag
+        const Switch active_;
+
+        //- Transient flag
+        Switch transient_;
+
+        //- Calculation frequency - carrier steps per cloud step
+        //  NOTE: Steady operation only
+        label calcFrequency_;
+
+        //- Maximum particle Courant number
+        //  Max fraction of current cell that can be traversed in a single
+        //  step
+        scalar maxCo_;
+
+        //- Current cloud iteration
+        label iter_;
+
+        //- Cloud solution time step
+        scalar deltaT_;
+
+
+        // Run-time options
+
+            //- Flag to indicate whether parcels are coupled to the carrier
+            //  phase, i.e. whether or not to generate source terms for
+            //  carrier phase
+            Switch coupled_;
+
+            //- Flag to correct cell values with latest transfer information
+            //  during the lagrangian timestep
+            Switch cellValueSourceCorrection_;
+
+            //- Maximum particle track time [s]
+            scalar maxTrackTime_;
+
+            //- Flag to indicate whether coupling source terms should be
+            //  reset on start-up/first read
+            Switch resetSourcesOnStartup_;
+
+            //- List schemes, e.g. U semiImplicit 1
+            List<Tuple2<word, scalar> > schemes_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise assignment
+        void operator=(const cloudSolution&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct null from mesh reference
+        cloudSolution(const fvMesh& mesh);
+
+        //- Construct from mesh and dictionary
+        cloudSolution(const fvMesh& mesh, const dictionary& dict);
+
+        //- Construct copy
+        cloudSolution(const cloudSolution& cs);
+
+
+    //- Destructor
+    virtual ~cloudSolution();
+
+
+    // Member functions
+
+        //- Read properties from dictionary
+        void read();
+
+
+        // Access
+
+            //- Return relaxation coefficient for field
+            scalar relaxCoeff(const word& fieldName) const;
+
+            //- Return semi-implicit flag coefficient for field
+            bool semiImplicit(const word& fieldName) const;
+
+            //- Return reference to the mesh
+            inline const fvMesh& mesh() const;
+
+            //- Return const access to the dictionary
+            inline const dictionary& dict() const;
+
+            //- Return the active flag
+            inline const Switch active() const;
+
+            //- Return const access to the transient flag
+            inline const Switch transient() const;
+
+            //- Return const access to the steady flag
+            inline const Switch steadyState() const;
+
+            //- Return const access to the calculation frequency
+            inline label calcFrequency() const;
+
+            //- Return const access to the max particle Courant number
+            inline scalar maxCo() const;
+
+            //- Return const access to the current cloud iteration
+            inline label iter() const;
+
+            //- Increment and return iter counter
+            inline label nextIter();
+
+            //- Return the time step
+            inline scalar deltaT() const;
+
+            //- Return const access to the coupled flag
+            inline const Switch coupled() const;
+
+            //- Return const access to the cell value correction flag
+            inline const Switch cellValueSourceCorrection() const;
+
+            //- Return const access to the particle track time
+            inline scalar maxTrackTime() const;
+
+            //- Return const access to the reset sources flag
+            inline const Switch resetSourcesOnStartup() const;
+
+            //- Source terms dictionary
+            inline const dictionary& sourceTermDict() const;
+
+            //- Interpolation schemes dictionary
+            inline const dictionary& interpolationSchemes() const;
+
+            //- Integration schemes dictionary
+            inline const dictionary& integrationSchemes() const;
+
+
+    // Helper functions
+
+        //- Returns true if performing a cloud iteration this calc step
+        bool solveThisStep() const;
+
+        //- Returns true if possible to evolve the cloud and sets timestep
+        //  parameters
+        bool canEvolve();
+
+        //- Returns true if writing this step
+        bool output() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "cloudSolutionI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolutionI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolutionI.H
new file mode 100644
index 0000000000..37aad4dbdf
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolutionI.H
@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+inline const Foam::fvMesh& Foam::cloudSolution::mesh() const
+{
+    return mesh_;
+}
+
+
+inline const Foam::dictionary& Foam::cloudSolution::dict() const
+{
+    return dict_;
+}
+
+
+inline const Foam::Switch Foam::cloudSolution::active() const
+{
+    return active_;
+}
+
+
+inline const Foam::dictionary& Foam::cloudSolution::sourceTermDict() const
+{
+    return dict_.subDict("sourceTerms");
+}
+
+
+inline const Foam::dictionary& Foam::cloudSolution::interpolationSchemes() const
+{
+    return dict_.subDict("interpolationSchemes");
+}
+
+
+inline const Foam::dictionary& Foam::cloudSolution::integrationSchemes() const
+{
+    return dict_.subDict("integrationSchemes");
+}
+
+
+inline const Foam::Switch Foam::cloudSolution::transient() const
+{
+    return transient_;
+}
+
+
+inline const Foam::Switch Foam::cloudSolution::steadyState() const
+{
+    return !transient_;
+}
+
+
+inline Foam::label Foam::cloudSolution::calcFrequency() const
+{
+    return calcFrequency_;
+}
+
+
+inline Foam::scalar Foam::cloudSolution::maxCo() const
+{
+    return maxCo_;
+}
+
+
+inline Foam::label Foam::cloudSolution::iter() const
+{
+    return iter_;
+}
+
+
+inline Foam::label Foam::cloudSolution::nextIter()
+{
+    return ++iter_;
+}
+
+
+inline Foam::scalar Foam::cloudSolution::deltaT() const
+{
+    return deltaT_;
+}
+
+
+inline const Foam::Switch Foam::cloudSolution::coupled() const
+{
+    return coupled_;
+}
+
+
+inline const Foam::Switch Foam::cloudSolution::cellValueSourceCorrection() const
+{
+    return cellValueSourceCorrection_;
+}
+
+
+inline Foam::scalar Foam::cloudSolution::maxTrackTime() const
+{
+    return maxTrackTime_;
+}
+
+
+inline const Foam::Switch Foam::cloudSolution::resetSourcesOnStartup() const
+{
+    return resetSourcesOnStartup_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index fdbf524781..1c465fc450 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -30,12 +30,12 @@ License
 
 // * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
 
-template<class ParcelType>
-void Foam::ReactingCloud<ParcelType>::setModels()
+template<class CloudType>
+void Foam::ReactingCloud<CloudType>::setModels()
 {
     compositionModel_.reset
     (
-        CompositionModel<ReactingCloud<ParcelType> >::New
+        CompositionModel<ReactingCloud<CloudType> >::New
         (
             this->subModelProperties(),
             *this
@@ -44,7 +44,7 @@ void Foam::ReactingCloud<ParcelType>::setModels()
 
     phaseChangeModel_.reset
     (
-        PhaseChangeModel<ReactingCloud<ParcelType> >::New
+        PhaseChangeModel<ReactingCloud<CloudType> >::New
         (
             this->subModelProperties(),
             *this
@@ -53,8 +53,8 @@ void Foam::ReactingCloud<ParcelType>::setModels()
 }
 
 
-template<class ParcelType>
-void Foam::ReactingCloud<ParcelType>::checkSuppliedComposition
+template<class CloudType>
+void Foam::ReactingCloud<CloudType>::checkSuppliedComposition
 (
     const scalarField& YSupplied,
     const scalarField& Y,
@@ -65,7 +65,7 @@ void Foam::ReactingCloud<ParcelType>::checkSuppliedComposition
     {
         FatalErrorIn
         (
-            "ReactingCloud<ParcelType>::checkSuppliedComposition"
+            "ReactingCloud<CloudType>::checkSuppliedComposition"
             "("
                 "const scalarField&, "
                 "const scalarField&, "
@@ -80,10 +80,10 @@ void Foam::ReactingCloud<ParcelType>::checkSuppliedComposition
 }
 
 
-template<class ParcelType>
-void Foam::ReactingCloud<ParcelType>::cloudReset(ReactingCloud<ParcelType>& c)
+template<class CloudType>
+void Foam::ReactingCloud<CloudType>::cloudReset(ReactingCloud<CloudType>& c)
 {
-    ThermoCloud<ParcelType>::cloudReset(c);
+    CloudType::cloudReset(c);
 
     compositionModel_.reset(c.compositionModel_.ptr());
     phaseChangeModel_.reset(c.phaseChangeModel_.ptr());
@@ -94,8 +94,8 @@ void Foam::ReactingCloud<ParcelType>::cloudReset(ReactingCloud<ParcelType>& c)
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class ParcelType>
-Foam::ReactingCloud<ParcelType>::ReactingCloud
+template<class CloudType>
+Foam::ReactingCloud<CloudType>::ReactingCloud
 (
     const word& cloudName,
     const volScalarField& rho,
@@ -105,7 +105,7 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
     bool readFields
 )
 :
-    ThermoCloud<ParcelType>(cloudName, rho, U, g, thermo, false),
+    CloudType(cloudName, rho, U, g, thermo, false),
     reactingCloud(),
     cloudCopyPtr_(NULL),
     constProps_(this->particleProperties(), this->solution().active()),
@@ -144,7 +144,7 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
 
     if (readFields)
     {
-        ParcelType::readFields(*this);
+        parcelType::readFields(*this, this->composition());
     }
 
     if (this->solution().resetSourcesOnStartup())
@@ -154,14 +154,14 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
 }
 
 
-template<class ParcelType>
-Foam::ReactingCloud<ParcelType>::ReactingCloud
+template<class CloudType>
+Foam::ReactingCloud<CloudType>::ReactingCloud
 (
-    ReactingCloud<ParcelType>& c,
+    ReactingCloud<CloudType>& c,
     const word& name
 )
 :
-    ThermoCloud<ParcelType>(c, name),
+    CloudType(c, name),
     reactingCloud(),
     cloudCopyPtr_(NULL),
     constProps_(c.constProps_),
@@ -194,15 +194,15 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
 }
 
 
-template<class ParcelType>
-Foam::ReactingCloud<ParcelType>::ReactingCloud
+template<class CloudType>
+Foam::ReactingCloud<CloudType>::ReactingCloud
 (
     const fvMesh& mesh,
     const word& name,
-    const ReactingCloud<ParcelType>& c
+    const ReactingCloud<CloudType>& c
 )
 :
-    ThermoCloud<ParcelType>(mesh, name, c),
+    CloudType(mesh, name, c),
     reactingCloud(),
     cloudCopyPtr_(NULL),
     constProps_(),
@@ -216,22 +216,22 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class ParcelType>
-Foam::ReactingCloud<ParcelType>::~ReactingCloud()
+template<class CloudType>
+Foam::ReactingCloud<CloudType>::~ReactingCloud()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class ParcelType>
-void Foam::ReactingCloud<ParcelType>::checkParcelProperties
+template<class CloudType>
+void Foam::ReactingCloud<CloudType>::checkParcelProperties
 (
-    ParcelType& parcel,
+    parcelType& parcel,
     const scalar lagrangianDt,
     const bool fullyDescribed
 )
 {
-    ThermoCloud<ParcelType>::checkParcelProperties
+    CloudType::checkParcelProperties
     (
         parcel,
         lagrangianDt,
@@ -257,12 +257,12 @@ void Foam::ReactingCloud<ParcelType>::checkParcelProperties
 }
 
 
-template<class ParcelType>
-void Foam::ReactingCloud<ParcelType>::storeState()
+template<class CloudType>
+void Foam::ReactingCloud<CloudType>::storeState()
 {
     cloudCopyPtr_.reset
     (
-        static_cast<ReactingCloud<ParcelType>*>
+        static_cast<ReactingCloud<CloudType>*>
         (
             clone(this->name() + "Copy").ptr()
         )
@@ -270,18 +270,18 @@ void Foam::ReactingCloud<ParcelType>::storeState()
 }
 
 
-template<class ParcelType>
-void Foam::ReactingCloud<ParcelType>::restoreState()
+template<class CloudType>
+void Foam::ReactingCloud<CloudType>::restoreState()
 {
     cloudReset(cloudCopyPtr_());
     cloudCopyPtr_.clear();
 }
 
 
-template<class ParcelType>
-void Foam::ReactingCloud<ParcelType>::resetSourceTerms()
+template<class CloudType>
+void Foam::ReactingCloud<CloudType>::resetSourceTerms()
 {
-    ThermoCloud<ParcelType>::resetSourceTerms();
+    CloudType::resetSourceTerms();
     forAll(rhoTrans_, i)
     {
         rhoTrans_[i].field() = 0.0;
@@ -289,15 +289,15 @@ void Foam::ReactingCloud<ParcelType>::resetSourceTerms()
 }
 
 
-template<class ParcelType>
-void Foam::ReactingCloud<ParcelType>::relaxSources
+template<class CloudType>
+void Foam::ReactingCloud<CloudType>::relaxSources
 (
-    const ReactingCloud<ParcelType>& cloudOldTime
+    const ReactingCloud<CloudType>& cloudOldTime
 )
 {
     typedef DimensionedField<scalar, volMesh> dsfType;
 
-    ThermoCloud<ParcelType>::relaxSources(cloudOldTime);
+    CloudType::relaxSources(cloudOldTime);
 
     forAll(rhoTrans_, fieldI)
     {
@@ -308,33 +308,44 @@ void Foam::ReactingCloud<ParcelType>::relaxSources
 }
 
 
-template<class ParcelType>
-void Foam::ReactingCloud<ParcelType>::evolve()
+template<class CloudType>
+void Foam::ReactingCloud<CloudType>::evolve()
 {
     if (this->solution().canEvolve())
     {
-        typename ParcelType::trackData td(*this);
+        typename parcelType::template
+            TrackingData<ReactingCloud<CloudType> > td(*this);
 
         this->solve(td);
     }
 }
 
 
-template<class ParcelType>
-void Foam::ReactingCloud<ParcelType>::addToMassPhaseChange(const scalar dMass)
+template<class CloudType>
+void Foam::ReactingCloud<CloudType>::addToMassPhaseChange(const scalar dMass)
 {
     dMassPhaseChange_ += dMass;
 }
 
 
-template<class ParcelType>
-void Foam::ReactingCloud<ParcelType>::info() const
+template<class CloudType>
+void Foam::ReactingCloud<CloudType>::info() const
 {
-    ThermoCloud<ParcelType>::info();
+    CloudType::info();
 
     Info<< "    Mass transfer phase change      = "
         << returnReduce(dMassPhaseChange_, sumOp<scalar>()) << nl;
 }
 
 
+template<class CloudType>
+void Foam::ReactingCloud<CloudType>::writeFields() const
+{
+    if (this->size())
+    {
+        CloudType::particleType::writeFields(*this, this->composition());
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index 9db309ff09..6b67a73721 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -40,7 +40,6 @@ SourceFiles
 #ifndef ReactingCloud_H
 #define ReactingCloud_H
 
-#include "ThermoCloud.H"
 #include "reactingCloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,19 +59,24 @@ class PhaseChangeModel;
                       Class ReactingCloud Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class ParcelType>
+template<class CloudType>
 class ReactingCloud
 :
-    public ThermoCloud<ParcelType>,
+    public CloudType,
     public reactingCloud
 {
+public:
+
+    //- Type of parcel the cloud was instantiated for
+    typedef typename CloudType::particleType parcelType;
+
 
 private:
 
     // Private data
 
         //- Cloud copy pointer
-        autoPtr<ReactingCloud<ParcelType> > cloudCopyPtr_;
+        autoPtr<ReactingCloud<CloudType> > cloudCopyPtr_;
 
 
     // Private member functions
@@ -89,17 +93,17 @@ protected:
     // Protected data
 
         //- Parcel constant properties
-        typename ParcelType::constantProperties constProps_;
+        typename parcelType::constantProperties constProps_;
 
 
         // References to the cloud sub-models
 
             //- Reacting composition model
-            autoPtr<CompositionModel<ReactingCloud<ParcelType> > >
+            autoPtr<CompositionModel<ReactingCloud<CloudType> > >
                 compositionModel_;
 
             //- Reacting phase change model
-            autoPtr<PhaseChangeModel<ReactingCloud<ParcelType> > >
+            autoPtr<PhaseChangeModel<ReactingCloud<CloudType> > >
                 phaseChangeModel_;
 
 
@@ -137,11 +141,13 @@ protected:
         // Cloud evolution functions
 
             //- Reset state of cloud
-            void cloudReset(ReactingCloud<ParcelType>& c);
+            void cloudReset(ReactingCloud<CloudType>& c);
 
 
 public:
 
+    typedef CloudType cloudType;
+
     // Constructors
 
         //- Construct given carrier gas fields
@@ -156,29 +162,29 @@ public:
         );
 
         //- Copy constructor with new name
-        ReactingCloud(ReactingCloud<ParcelType>& c, const word& name);
+        ReactingCloud(ReactingCloud<CloudType>& c, const word& name);
 
         //- Copy constructor with new name - creates bare cloud
         ReactingCloud
         (
             const fvMesh& mesh,
             const word& name,
-            const ReactingCloud<ParcelType>& c
+            const ReactingCloud<CloudType>& c
         );
 
         //- Construct and return clone based on (this) with new name
-        virtual autoPtr<Cloud<ParcelType> > clone(const word& name)
+        virtual autoPtr<Cloud<parcelType> > clone(const word& name)
         {
-            return autoPtr<Cloud<ParcelType> >
+            return autoPtr<Cloud<parcelType> >
             (
                 new ReactingCloud(*this, name)
             );
         }
 
         //- Construct and return bare clone based on (this) with new name
-        virtual autoPtr<Cloud<ParcelType> > cloneBare(const word& name) const
+        virtual autoPtr<Cloud<parcelType> > cloneBare(const word& name) const
         {
-            return autoPtr<Cloud<ParcelType> >
+            return autoPtr<Cloud<parcelType> >
             (
                 new ReactingCloud(this->mesh(), name, *this)
             );
@@ -189,10 +195,6 @@ public:
     virtual ~ReactingCloud();
 
 
-    //- Type of parcel the cloud was instantiated for
-    typedef ParcelType parcelType;
-
-
     // Member Functions
 
         // Access
@@ -201,18 +203,18 @@ public:
             inline const ReactingCloud& cloudCopy() const;
 
             //- Return the constant properties
-            inline const typename ParcelType::constantProperties&
+            inline const typename parcelType::constantProperties&
                 constProps() const;
 
 
             // Sub-models
 
                 //- Return reference to reacting composition model
-                inline const CompositionModel<ReactingCloud<ParcelType> >&
+                inline const CompositionModel<ReactingCloud<CloudType> >&
                     composition() const;
 
                 //- Return reference to reacting phase change model
-                inline const PhaseChangeModel<ReactingCloud<ParcelType> >&
+                inline const PhaseChangeModel<ReactingCloud<CloudType> >&
                     phaseChange() const;
 
 
@@ -262,7 +264,7 @@ public:
             //- Check parcel properties
             void checkParcelProperties
             (
-                ParcelType& parcel,
+                parcelType& parcel,
                 const scalar lagrangianDt,
                 const bool fullyDescribed
             );
@@ -277,13 +279,19 @@ public:
             void resetSourceTerms();
 
             //- Apply relaxation to (steady state) cloud sources
-            void relaxSources(const ReactingCloud<ParcelType>& cloudOldTime);
+            void relaxSources(const ReactingCloud<CloudType>& cloudOldTime);
 
             //- Evolve the cloud
             void evolve();
 
             //- Print cloud information
             void info() const;
+
+
+        // I-O
+
+            //- Write the field data for the cloud
+            virtual void writeFields() const;
 };
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 9d32a24134..79b66f87ff 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -25,66 +25,65 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class ParcelType>
-inline const Foam::ReactingCloud<ParcelType>&
-Foam::ReactingCloud<ParcelType>::cloudCopy() const
+template<class CloudType>
+inline const Foam::ReactingCloud<CloudType>&
+Foam::ReactingCloud<CloudType>::cloudCopy() const
 {
     return cloudCopyPtr_();
 }
 
 
-template<class ParcelType>
-inline const typename ParcelType::constantProperties&
-Foam::ReactingCloud<ParcelType>::constProps() const
+template<class CloudType>
+inline const typename CloudType::particleType::constantProperties&
+Foam::ReactingCloud<CloudType>::constProps() const
 {
     return constProps_;
 }
 
 
-template<class ParcelType>
-inline const Foam::CompositionModel<Foam::ReactingCloud<ParcelType> >&
-Foam::ReactingCloud<ParcelType>::composition() const
+template<class CloudType>
+inline const Foam::CompositionModel<Foam::ReactingCloud<CloudType> >&
+Foam::ReactingCloud<CloudType>::composition() const
 {
     return compositionModel_;
 }
 
 
-template<class ParcelType>
-inline const Foam::PhaseChangeModel<Foam::ReactingCloud<ParcelType> >&
-Foam::ReactingCloud<ParcelType>::phaseChange() const
+template<class CloudType>
+inline const Foam::PhaseChangeModel<Foam::ReactingCloud<CloudType> >&
+Foam::ReactingCloud<CloudType>::phaseChange() const
 {
     return phaseChangeModel_;
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
-Foam::ReactingCloud<ParcelType>::rhoTrans(const label i)
+Foam::ReactingCloud<CloudType>::rhoTrans(const label i)
 {
     return rhoTrans_[i];
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline
 const Foam::PtrList<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >&
-Foam::ReactingCloud<ParcelType>::rhoTrans() const
+Foam::ReactingCloud<CloudType>::rhoTrans() const
 {
     return rhoTrans_;
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline Foam::PtrList<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >&
-Foam::ReactingCloud<ParcelType>::rhoTrans()
+Foam::ReactingCloud<CloudType>::rhoTrans()
 {
     return rhoTrans_;
 }
 
 
-template<class ParcelType>
-inline Foam::tmp<Foam::fvScalarMatrix>
-Foam::ReactingCloud<ParcelType>::SYi
+template<class CloudType>
+inline Foam::tmp<Foam::fvScalarMatrix> Foam::ReactingCloud<CloudType>::SYi
 (
     const label i,
     volScalarField& Yi
@@ -138,9 +137,9 @@ Foam::ReactingCloud<ParcelType>::SYi
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
-Foam::ReactingCloud<ParcelType>::Srho(const label i) const
+Foam::ReactingCloud<CloudType>::Srho(const label i) const
 {
     tmp<DimensionedField<scalar, volMesh> > tRhoi
     (
@@ -175,9 +174,9 @@ Foam::ReactingCloud<ParcelType>::Srho(const label i) const
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
-Foam::ReactingCloud<ParcelType>::Srho() const
+Foam::ReactingCloud<CloudType>::Srho() const
 {
     tmp<DimensionedField<scalar, volMesh> > trhoTrans
     (
@@ -217,9 +216,9 @@ Foam::ReactingCloud<ParcelType>::Srho() const
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline Foam::tmp<Foam::fvScalarMatrix>
-Foam::ReactingCloud<ParcelType>::Srho(volScalarField& rho) const
+Foam::ReactingCloud<CloudType>::Srho(volScalarField& rho) const
 {
     if (this->solution().coupled())
     {
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 7cd42b7355..89374ecb48 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -30,12 +30,12 @@ License
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
 
-template<class ParcelType>
-void Foam::ReactingMultiphaseCloud<ParcelType>::setModels()
+template<class CloudType>
+void Foam::ReactingMultiphaseCloud<CloudType>::setModels()
 {
     devolatilisationModel_.reset
     (
-        DevolatilisationModel<ReactingMultiphaseCloud<ParcelType> >::New
+        DevolatilisationModel<ReactingMultiphaseCloud<CloudType> >::New
         (
             this->subModelProperties(),
             *this
@@ -44,7 +44,7 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::setModels()
 
     surfaceReactionModel_.reset
     (
-        SurfaceReactionModel<ReactingMultiphaseCloud<ParcelType> >::New
+        SurfaceReactionModel<ReactingMultiphaseCloud<CloudType> >::New
         (
             this->subModelProperties(),
             *this
@@ -53,13 +53,13 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::setModels()
 }
 
 
-template<class ParcelType>
-void Foam::ReactingMultiphaseCloud<ParcelType>::cloudReset
+template<class CloudType>
+void Foam::ReactingMultiphaseCloud<CloudType>::cloudReset
 (
-    ReactingMultiphaseCloud<ParcelType>& c
+    ReactingMultiphaseCloud<CloudType>& c
 )
 {
-    ReactingCloud<ParcelType>::cloudReset(c);
+    CloudType::cloudReset(c);
 
     devolatilisationModel_.reset(c.devolatilisationModel_.ptr());
     surfaceReactionModel_.reset(c.surfaceReactionModel_.ptr());
@@ -71,8 +71,8 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::cloudReset
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class ParcelType>
-Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
+template<class CloudType>
+Foam::ReactingMultiphaseCloud<CloudType>::ReactingMultiphaseCloud
 (
     const word& cloudName,
     const volScalarField& rho,
@@ -82,7 +82,7 @@ Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
     bool readFields
 )
 :
-    ReactingCloud<ParcelType>(cloudName, rho, U, g, thermo, false),
+    CloudType(cloudName, rho, U, g, thermo, false),
     reactingMultiphaseCloud(),
     cloudCopyPtr_(NULL),
     constProps_(this->particleProperties(), this->solution().active()),
@@ -98,7 +98,7 @@ Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
 
     if (readFields)
     {
-        ParcelType::readFields(*this);
+        parcelType::readFields(*this, this->composition());
     }
 
     if (this->solution().resetSourcesOnStartup())
@@ -108,14 +108,14 @@ Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
 }
 
 
-template<class ParcelType>
-Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
+template<class CloudType>
+Foam::ReactingMultiphaseCloud<CloudType>::ReactingMultiphaseCloud
 (
-    ReactingMultiphaseCloud<ParcelType>& c,
+    ReactingMultiphaseCloud<CloudType>& c,
     const word& name
 )
 :
-    ReactingCloud<ParcelType>(c, name),
+    CloudType(c, name),
     reactingMultiphaseCloud(),
     cloudCopyPtr_(NULL),
     constProps_(c.constProps_),
@@ -126,15 +126,15 @@ Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
 {}
 
 
-template<class ParcelType>
-Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
+template<class CloudType>
+Foam::ReactingMultiphaseCloud<CloudType>::ReactingMultiphaseCloud
 (
     const fvMesh& mesh,
     const word& name,
-    const ReactingMultiphaseCloud<ParcelType>& c
+    const ReactingMultiphaseCloud<CloudType>& c
 )
 :
-    ReactingCloud<ParcelType>(mesh, name, c),
+    CloudType(mesh, name, c),
     reactingMultiphaseCloud(),
     cloudCopyPtr_(NULL),
     constProps_(),
@@ -147,22 +147,22 @@ Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class ParcelType>
-Foam::ReactingMultiphaseCloud<ParcelType>::~ReactingMultiphaseCloud()
+template<class CloudType>
+Foam::ReactingMultiphaseCloud<CloudType>::~ReactingMultiphaseCloud()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class ParcelType>
-void Foam::ReactingMultiphaseCloud<ParcelType>::checkParcelProperties
+template<class CloudType>
+void Foam::ReactingMultiphaseCloud<CloudType>::checkParcelProperties
 (
-    ParcelType& parcel,
+    parcelType& parcel,
     const scalar lagrangianDt,
     const bool fullyDescribed
 )
 {
-    ReactingCloud<ParcelType>::checkParcelProperties
+    CloudType::checkParcelProperties
     (
         parcel,
         lagrangianDt,
@@ -203,12 +203,12 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::checkParcelProperties
 }
 
 
-template<class ParcelType>
-void Foam::ReactingMultiphaseCloud<ParcelType>::storeState()
+template<class CloudType>
+void Foam::ReactingMultiphaseCloud<CloudType>::storeState()
 {
     cloudCopyPtr_.reset
     (
-        static_cast<ReactingMultiphaseCloud<ParcelType>*>
+        static_cast<ReactingMultiphaseCloud<CloudType>*>
         (
             clone(this->name() + "Copy").ptr()
         )
@@ -216,35 +216,36 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::storeState()
 }
 
 
-template<class ParcelType>
-void Foam::ReactingMultiphaseCloud<ParcelType>::restoreState()
+template<class CloudType>
+void Foam::ReactingMultiphaseCloud<CloudType>::restoreState()
 {
     cloudReset(cloudCopyPtr_());
     cloudCopyPtr_.clear();
 }
 
 
-template<class ParcelType>
-void Foam::ReactingMultiphaseCloud<ParcelType>::resetSourceTerms()
+template<class CloudType>
+void Foam::ReactingMultiphaseCloud<CloudType>::resetSourceTerms()
 {
-    ReactingCloud<ParcelType>::resetSourceTerms();
+    CloudType::resetSourceTerms();
 }
 
 
-template<class ParcelType>
-void Foam::ReactingMultiphaseCloud<ParcelType>::evolve()
+template<class CloudType>
+void Foam::ReactingMultiphaseCloud<CloudType>::evolve()
 {
     if (this->solution().canEvolve())
     {
-        typename ParcelType::trackData td(*this);
+        typename parcelType::template
+            TrackingData<ReactingMultiphaseCloud<CloudType> > td(*this);
 
         this->solve(td);
     }
 }
 
 
-template<class ParcelType>
-void Foam::ReactingMultiphaseCloud<ParcelType>::addToMassDevolatilisation
+template<class CloudType>
+void Foam::ReactingMultiphaseCloud<CloudType>::addToMassDevolatilisation
 (
     const scalar dMass
 )
@@ -253,8 +254,8 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::addToMassDevolatilisation
 }
 
 
-template<class ParcelType>
-void Foam::ReactingMultiphaseCloud<ParcelType>::addToMassSurfaceReaction
+template<class CloudType>
+void Foam::ReactingMultiphaseCloud<CloudType>::addToMassSurfaceReaction
 (
     const scalar dMass
 )
@@ -263,10 +264,10 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::addToMassSurfaceReaction
 }
 
 
-template<class ParcelType>
-void Foam::ReactingMultiphaseCloud<ParcelType>::info() const
+template<class CloudType>
+void Foam::ReactingMultiphaseCloud<CloudType>::info() const
 {
-    ReactingCloud<ParcelType>::info();
+    CloudType::info();
     Info<< "    Mass transfer devolatilisation  = "
         << returnReduce(dMassDevolatilisation_, sumOp<scalar>()) << nl;
     Info<< "    Mass transfer surface reaction  = "
@@ -274,4 +275,14 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::info() const
 }
 
 
+template<class CloudType>
+void Foam::ReactingMultiphaseCloud<CloudType>::writeFields() const
+{
+    if (this->size())
+    {
+        CloudType::particleType::writeFields(*this, this->composition());
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index 2c71a6b475..f2e13b02a6 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -61,16 +61,24 @@ class SurfaceReactionModel;
                    Class ReactingMultiphaseCloud Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class ParcelType>
+template<class CloudType>
 class ReactingMultiphaseCloud
 :
-    public ReactingCloud<ParcelType>,
+    public CloudType,
     public reactingMultiphaseCloud
 {
+public:
+
+    //- Type of parcel the cloud was instantiated for
+    typedef typename CloudType::particleType parcelType;
+
+
+private:
+
     // Private data
 
         //- Cloud copy pointer
-        autoPtr<ReactingMultiphaseCloud<ParcelType> > cloudCopyPtr_;
+        autoPtr<ReactingMultiphaseCloud<CloudType> > cloudCopyPtr_;
 
 
     // Private member functions
@@ -87,7 +95,7 @@ protected:
     // Protected data
 
         //- Parcel constant properties
-        typename ParcelType::constantProperties constProps_;
+        typename parcelType::constantProperties constProps_;
 
 
         // References to the cloud sub-models
@@ -95,14 +103,14 @@ protected:
             //- Devolatilisation model
             autoPtr
             <
-                DevolatilisationModel<ReactingMultiphaseCloud<ParcelType> >
+                DevolatilisationModel<ReactingMultiphaseCloud<CloudType> >
             >
             devolatilisationModel_;
 
             //- Surface reaction model
             autoPtr
             <
-                SurfaceReactionModel<ReactingMultiphaseCloud<ParcelType> >
+                SurfaceReactionModel<ReactingMultiphaseCloud<CloudType> >
             >
             surfaceReactionModel_;
 
@@ -128,11 +136,13 @@ protected:
         // Cloud evolution functions
 
             //- Reset state of cloud
-            void cloudReset(ReactingMultiphaseCloud<ParcelType>& c);
+            void cloudReset(ReactingMultiphaseCloud<CloudType>& c);
 
 
 public:
 
+    typedef CloudType cloudType;
+
     // Constructors
 
         //- Construct given carrier gas fields
@@ -150,7 +160,7 @@ public:
         //- Copy constructor with new name
         ReactingMultiphaseCloud
         (
-            ReactingMultiphaseCloud<ParcelType>& c,
+            ReactingMultiphaseCloud<CloudType>& c,
             const word& name
         );
 
@@ -159,22 +169,22 @@ public:
         (
             const fvMesh& mesh,
             const word& name,
-            const ReactingMultiphaseCloud<ParcelType>& c
+            const ReactingMultiphaseCloud<CloudType>& c
         );
 
         //- Construct and return clone based on (this) with new name
-        virtual autoPtr<Cloud<ParcelType> > clone(const word& name)
+        virtual autoPtr<Cloud<parcelType> > clone(const word& name)
         {
-            return autoPtr<Cloud<ParcelType> >
+            return autoPtr<Cloud<parcelType> >
             (
                 new ReactingMultiphaseCloud(*this, name)
             );
         }
 
         //- Construct and return bare clone based on (this) with new name
-        virtual autoPtr<Cloud<ParcelType> > cloneBare(const word& name) const
+        virtual autoPtr<Cloud<parcelType> > cloneBare(const word& name) const
         {
-            return autoPtr<Cloud<ParcelType> >
+            return autoPtr<Cloud<parcelType> >
             (
                 new ReactingMultiphaseCloud(this->mesh(), name, *this)
             );
@@ -185,10 +195,6 @@ public:
     virtual ~ReactingMultiphaseCloud();
 
 
-    //- Type of parcel the cloud was instantiated for
-    typedef ParcelType parcelType;
-
-
     // Member Functions
 
         // Access
@@ -197,7 +203,7 @@ public:
             inline const ReactingMultiphaseCloud& cloudCopy() const;
 
             //- Return the constant properties
-            inline const typename ParcelType::constantProperties&
+            inline const typename parcelType::constantProperties&
                 constProps() const;
 
 
@@ -206,14 +212,14 @@ public:
                 //- Return reference to devolatilisation model
                 inline const DevolatilisationModel
                 <
-                    ReactingMultiphaseCloud<ParcelType>
+                    ReactingMultiphaseCloud<CloudType>
                 >&
                 devolatilisation() const;
 
                 //- Return reference to reacting surface reaction model
                 inline const SurfaceReactionModel
                 <
-                    ReactingMultiphaseCloud<ParcelType>
+                    ReactingMultiphaseCloud<CloudType>
                 >&
                 surfaceReaction() const;
 
@@ -232,7 +238,7 @@ public:
             //- Check parcel properties
             void checkParcelProperties
             (
-                ParcelType& parcel,
+                parcelType& parcel,
                 const scalar lagrangianDt,
                 const bool fullyDescribed
             );
@@ -251,6 +257,12 @@ public:
 
             //- Print cloud information
             void info() const;
+
+
+        // I-O
+
+            //- Write the field data for the cloud
+            virtual void writeFields() const;
 };
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
index e02b49094d..00615f1924 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,39 +25,39 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class ParcelType>
-inline const Foam::ReactingMultiphaseCloud<ParcelType>&
-Foam::ReactingMultiphaseCloud<ParcelType>::cloudCopy() const
+template<class CloudType>
+inline const Foam::ReactingMultiphaseCloud<CloudType>&
+Foam::ReactingMultiphaseCloud<CloudType>::cloudCopy() const
 {
     return cloudCopyPtr_();
 }
 
 
-template<class ParcelType>
-inline const typename ParcelType::constantProperties&
-Foam::ReactingMultiphaseCloud<ParcelType>::constProps() const
+template<class CloudType>
+inline const typename CloudType::particleType::constantProperties&
+Foam::ReactingMultiphaseCloud<CloudType>::constProps() const
 {
     return constProps_;
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline const Foam::DevolatilisationModel
 <
-    Foam::ReactingMultiphaseCloud<ParcelType>
+    Foam::ReactingMultiphaseCloud<CloudType>
 >&
-Foam::ReactingMultiphaseCloud<ParcelType>::devolatilisation() const
+Foam::ReactingMultiphaseCloud<CloudType>::devolatilisation() const
 {
     return devolatilisationModel_;
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline const Foam::SurfaceReactionModel
 <
-    Foam::ReactingMultiphaseCloud<ParcelType>
+    Foam::ReactingMultiphaseCloud<CloudType>
 >&
-Foam::ReactingMultiphaseCloud<ParcelType>::surfaceReaction() const
+Foam::ReactingMultiphaseCloud<CloudType>::surfaceReaction() const
 {
     return surfaceReactionModel_;
 }
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index 1bd69843b7..d2ce89b5c4 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -30,12 +30,12 @@ License
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
 
-template<class ParcelType>
-void Foam::ThermoCloud<ParcelType>::setModels()
+template<class CloudType>
+void Foam::ThermoCloud<CloudType>::setModels()
 {
     heatTransferModel_.reset
     (
-        HeatTransferModel<ThermoCloud<ParcelType> >::New
+        HeatTransferModel<ThermoCloud<CloudType> >::New
         (
             this->subModelProperties(),
             *this
@@ -55,10 +55,10 @@ void Foam::ThermoCloud<ParcelType>::setModels()
 }
 
 
-template<class ParcelType>
-void Foam::ThermoCloud<ParcelType>::cloudReset(ThermoCloud<ParcelType>& c)
+template<class CloudType>
+void Foam::ThermoCloud<CloudType>::cloudReset(ThermoCloud<CloudType>& c)
 {
-    KinematicCloud<ParcelType>::cloudReset(c);
+    CloudType::cloudReset(c);
 
     heatTransferModel_.reset(c.heatTransferModel_.ptr());
     TIntegrator_.reset(c.TIntegrator_.ptr());
@@ -69,8 +69,8 @@ void Foam::ThermoCloud<ParcelType>::cloudReset(ThermoCloud<ParcelType>& c)
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class ParcelType>
-Foam::ThermoCloud<ParcelType>::ThermoCloud
+template<class CloudType>
+Foam::ThermoCloud<CloudType>::ThermoCloud
 (
     const word& cloudName,
     const volScalarField& rho,
@@ -80,7 +80,7 @@ Foam::ThermoCloud<ParcelType>::ThermoCloud
     bool readFields
 )
 :
-    KinematicCloud<ParcelType>
+    CloudType
     (
         cloudName,
         rho,
@@ -139,7 +139,7 @@ Foam::ThermoCloud<ParcelType>::ThermoCloud
 
     if (readFields)
     {
-        ParcelType::readFields(*this);
+        parcelType::readFields(*this);
     }
 
     if (this->solution().resetSourcesOnStartup())
@@ -149,14 +149,14 @@ Foam::ThermoCloud<ParcelType>::ThermoCloud
 }
 
 
-template<class ParcelType>
-Foam::ThermoCloud<ParcelType>::ThermoCloud
+template<class CloudType>
+Foam::ThermoCloud<CloudType>::ThermoCloud
 (
-    ThermoCloud<ParcelType>& c,
+    ThermoCloud<CloudType>& c,
     const word& name
 )
 :
-    KinematicCloud<ParcelType>(c, name),
+    CloudType(c, name),
     thermoCloud(),
     cloudCopyPtr_(NULL),
     constProps_(c.constProps_),
@@ -201,15 +201,15 @@ Foam::ThermoCloud<ParcelType>::ThermoCloud
 {}
 
 
-template<class ParcelType>
-Foam::ThermoCloud<ParcelType>::ThermoCloud
+template<class CloudType>
+Foam::ThermoCloud<CloudType>::ThermoCloud
 (
     const fvMesh& mesh,
     const word& name,
-    const ThermoCloud<ParcelType>& c
+    const ThermoCloud<CloudType>& c
 )
 :
-    KinematicCloud<ParcelType>(mesh, name, c),
+    CloudType(mesh, name, c),
     thermoCloud(),
     cloudCopyPtr_(NULL),
     constProps_(),
@@ -226,27 +226,22 @@ Foam::ThermoCloud<ParcelType>::ThermoCloud
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class ParcelType>
-Foam::ThermoCloud<ParcelType>::~ThermoCloud()
+template<class CloudType>
+Foam::ThermoCloud<CloudType>::~ThermoCloud()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class ParcelType>
-void Foam::ThermoCloud<ParcelType>::checkParcelProperties
+template<class CloudType>
+void Foam::ThermoCloud<CloudType>::checkParcelProperties
 (
-    ParcelType& parcel,
+    parcelType& parcel,
     const scalar lagrangianDt,
     const bool fullyDescribed
 )
 {
-    KinematicCloud<ParcelType>::checkParcelProperties
-    (
-        parcel,
-        lagrangianDt,
-        fullyDescribed
-    );
+    CloudType::checkParcelProperties(parcel, lagrangianDt, fullyDescribed);
 
     if (!fullyDescribed)
     {
@@ -256,12 +251,12 @@ void Foam::ThermoCloud<ParcelType>::checkParcelProperties
 }
 
 
-template<class ParcelType>
-void Foam::ThermoCloud<ParcelType>::storeState()
+template<class CloudType>
+void Foam::ThermoCloud<CloudType>::storeState()
 {
     cloudCopyPtr_.reset
     (
-        static_cast<ThermoCloud<ParcelType>*>
+        static_cast<ThermoCloud<CloudType>*>
         (
             clone(this->name() + "Copy").ptr()
         )
@@ -269,51 +264,52 @@ void Foam::ThermoCloud<ParcelType>::storeState()
 }
 
 
-template<class ParcelType>
-void Foam::ThermoCloud<ParcelType>::restoreState()
+template<class CloudType>
+void Foam::ThermoCloud<CloudType>::restoreState()
 {
     cloudReset(cloudCopyPtr_());
     cloudCopyPtr_.clear();
 }
 
 
-template<class ParcelType>
-void Foam::ThermoCloud<ParcelType>::resetSourceTerms()
+template<class CloudType>
+void Foam::ThermoCloud<CloudType>::resetSourceTerms()
 {
-    KinematicCloud<ParcelType>::resetSourceTerms();
+    CloudType::resetSourceTerms();
     hsTrans_->field() = 0.0;
     hsCoeff_->field() = 0.0;
 }
 
 
-template<class ParcelType>
-void Foam::ThermoCloud<ParcelType>::relaxSources
+template<class CloudType>
+void Foam::ThermoCloud<CloudType>::relaxSources
 (
-    const ThermoCloud<ParcelType>& cloudOldTime
+    const ThermoCloud<CloudType>& cloudOldTime
 )
 {
-    KinematicCloud<ParcelType>::relaxSources(cloudOldTime);
+    CloudType::relaxSources(cloudOldTime);
 
     this->relax(hsTrans_(), cloudOldTime.hsTrans(), "hs");
 }
 
 
-template<class ParcelType>
-void Foam::ThermoCloud<ParcelType>::evolve()
+template<class CloudType>
+void Foam::ThermoCloud<CloudType>::evolve()
 {
     if (this->solution().canEvolve())
     {
-        typename ParcelType::trackData td(*this);
+        typename parcelType::template
+            TrackingData<ThermoCloud<CloudType> > td(*this);
 
         this->solve(td);
     }
 }
 
 
-template<class ParcelType>
-void Foam::ThermoCloud<ParcelType>::info() const
+template<class CloudType>
+void Foam::ThermoCloud<CloudType>::info() const
 {
-    KinematicCloud<ParcelType>::info();
+    CloudType::info();
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index a9daf9c22d..f2ad466179 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -57,16 +57,23 @@ class HeatTransferModel;
                         Class ThermoCloud Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class ParcelType>
+template<class CloudType>
 class ThermoCloud
 :
-    public KinematicCloud<ParcelType>,
+    public CloudType,
     public thermoCloud
 {
+public:
+
+    //- Type of parcel the cloud was instantiated for
+    typedef typename CloudType::particleType parcelType;
+
+private:
+
     // Private data
 
         //- Cloud copy pointer
-        autoPtr<ThermoCloud<ParcelType> > cloudCopyPtr_;
+        autoPtr<ThermoCloud<CloudType> > cloudCopyPtr_;
 
 
     // Private member functions
@@ -83,7 +90,7 @@ protected:
     // Protected data
 
         //- Thermo parcel constant properties
-        typename ParcelType::constantProperties constProps_;
+        typename parcelType::constantProperties constProps_;
 
 
         // References to the carrier gas fields
@@ -101,7 +108,7 @@ protected:
         // References to the cloud sub-models
 
             //- Heat transfer model
-            autoPtr<HeatTransferModel<ThermoCloud<ParcelType> > >
+            autoPtr<HeatTransferModel<ThermoCloud<CloudType> > >
                 heatTransferModel_;
 
 
@@ -137,11 +144,13 @@ protected:
         // Cloud evolution functions
 
             //- Reset state of cloud
-            void cloudReset(ThermoCloud<ParcelType>& c);
+            void cloudReset(ThermoCloud<CloudType>& c);
 
 
 public:
 
+    typedef CloudType cloudType;
+
     // Constructors
 
         //- Construct given carrier gas fields
@@ -156,29 +165,29 @@ public:
         );
 
         //- Copy constructor with new name
-        ThermoCloud(ThermoCloud<ParcelType>& c, const word& name);
+        ThermoCloud(ThermoCloud<CloudType>& c, const word& name);
 
         //- Copy constructor with new name - creates bare cloud
         ThermoCloud
         (
             const fvMesh& mesh,
             const word& name,
-            const ThermoCloud<ParcelType>& c
+            const ThermoCloud<CloudType>& c
         );
 
         //- Construct and return clone based on (this) with new name
-        virtual autoPtr<Cloud<ParcelType> > clone(const word& name)
+        virtual autoPtr<Cloud<parcelType> > clone(const word& name)
         {
-            return autoPtr<Cloud<ParcelType> >
+            return autoPtr<Cloud<parcelType> >
             (
                 new ThermoCloud(*this, name)
             );
         }
 
         //- Construct and return bare clone based on (this) with new name
-        virtual autoPtr<Cloud<ParcelType> > cloneBare(const word& name) const
+        virtual autoPtr<Cloud<parcelType> > cloneBare(const word& name) const
         {
-            return autoPtr<Cloud<ParcelType> >
+            return autoPtr<Cloud<parcelType> >
             (
                 new ThermoCloud(this->mesh(), name, *this)
             );
@@ -189,10 +198,6 @@ public:
     virtual ~ThermoCloud();
 
 
-    //- Type of parcel the cloud was instantiated for
-    typedef ParcelType parcelType;
-
-
     // Member Functions
 
         // Access
@@ -201,7 +206,7 @@ public:
             inline const ThermoCloud& cloudCopy() const;
 
             //- Return the constant properties
-            inline const typename ParcelType::constantProperties&
+            inline const typename parcelType::constantProperties&
                 constProps() const;
 
             //- Return const access to thermo package
@@ -217,7 +222,7 @@ public:
             // Sub-models
 
                 //- Return reference to heat transfer model
-                inline const HeatTransferModel<ThermoCloud<ParcelType> >&
+                inline const HeatTransferModel<ThermoCloud<CloudType> >&
                     heatTransfer() const;
 
 
@@ -272,7 +277,7 @@ public:
             //- Check parcel properties
             void checkParcelProperties
             (
-                ParcelType& parcel,
+                parcelType& parcel,
                 const scalar lagrangianDt,
                 const bool fullyDescribed
             );
@@ -287,7 +292,7 @@ public:
             void resetSourceTerms();
 
             //- Apply relaxation to (steady state) cloud sources
-            void relaxSources(const ThermoCloud<ParcelType>& cloudOldTime);
+            void relaxSources(const ThermoCloud<CloudType>& cloudOldTime);
 
             //- Evolve the cloud
             void evolve();
@@ -297,7 +302,6 @@ public:
 
             //- Print cloud information
             void info() const;
-
 };
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
index f0d08a8216..c774133cb0 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
@@ -29,101 +29,101 @@ using namespace Foam::constant;
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class ParcelType>
-inline const Foam::ThermoCloud<ParcelType>&
-Foam::ThermoCloud<ParcelType>::cloudCopy() const
+template<class CloudType>
+inline const Foam::ThermoCloud<CloudType>&
+Foam::ThermoCloud<CloudType>::cloudCopy() const
 {
     return cloudCopyPtr_();
 }
 
 
-template<class ParcelType>
-inline const typename ParcelType::constantProperties&
-Foam::ThermoCloud<ParcelType>::constProps() const
+template<class CloudType>
+inline const typename CloudType::particleType::constantProperties&
+Foam::ThermoCloud<CloudType>::constProps() const
 {
     return constProps_;
 }
 
 
-template<class ParcelType>
-inline const Foam::SLGThermo& Foam::ThermoCloud<ParcelType>::thermo() const
+template<class CloudType>
+inline const Foam::SLGThermo& Foam::ThermoCloud<CloudType>::thermo() const
 {
     return thermo_;
 }
 
 
-template<class ParcelType>
-inline const Foam::volScalarField& Foam::ThermoCloud<ParcelType>::T() const
+template<class CloudType>
+inline const Foam::volScalarField& Foam::ThermoCloud<CloudType>::T() const
 {
     return T_;
 }
 
 
-template<class ParcelType>
-inline const Foam::volScalarField& Foam::ThermoCloud<ParcelType>::p() const
+template<class CloudType>
+inline const Foam::volScalarField& Foam::ThermoCloud<CloudType>::p() const
 {
     return p_;
 }
 
 
-template<class ParcelType>
-inline const Foam::HeatTransferModel<Foam::ThermoCloud<ParcelType> >&
-Foam::ThermoCloud<ParcelType>::heatTransfer() const
+template<class CloudType>
+inline const Foam::HeatTransferModel<Foam::ThermoCloud<CloudType> >&
+Foam::ThermoCloud<CloudType>::heatTransfer() const
 {
     return heatTransferModel_;
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline const Foam::scalarIntegrationScheme&
-Foam::ThermoCloud<ParcelType>::TIntegrator() const
+Foam::ThermoCloud<CloudType>::TIntegrator() const
 {
     return TIntegrator_;
 }
 
 
-template<class ParcelType>
-inline bool Foam::ThermoCloud<ParcelType>::radiation() const
+template<class CloudType>
+inline bool Foam::ThermoCloud<CloudType>::radiation() const
 {
     return radiation_;
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
-Foam::ThermoCloud<ParcelType>::hsTrans()
+Foam::ThermoCloud<CloudType>::hsTrans()
 {
     return hsTrans_();
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline const Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
-Foam::ThermoCloud<ParcelType>::hsTrans() const
+Foam::ThermoCloud<CloudType>::hsTrans() const
 {
     return hsTrans_();
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
-Foam::ThermoCloud<ParcelType>::hsCoeff()
+Foam::ThermoCloud<CloudType>::hsCoeff()
 {
     return hsCoeff_();
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline const Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
-Foam::ThermoCloud<ParcelType>::hsCoeff() const
+Foam::ThermoCloud<CloudType>::hsCoeff() const
 {
     return hsCoeff_();
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline Foam::tmp<Foam::fvScalarMatrix>
-Foam::ThermoCloud<ParcelType>::Sh(volScalarField& hs) const
+Foam::ThermoCloud<CloudType>::Sh(volScalarField& hs) const
 {
     if (debug)
     {
@@ -141,7 +141,7 @@ Foam::ThermoCloud<ParcelType>::Sh(volScalarField& hs) const
 
             return
                 hsTrans()/(this->mesh().V()*this->db().time().deltaT())
-              + fvm::SuSp(-hsCoeff()/(Cp*this->mesh().V()), hs)
+              - fvm::Sp(hsCoeff()/(Cp*this->mesh().V()), hs)
               + hsCoeff()/(Cp*this->mesh().V())*hs;
         }
         else
@@ -159,9 +159,8 @@ Foam::ThermoCloud<ParcelType>::Sh(volScalarField& hs) const
 }
 
 
-template<class ParcelType>
-inline Foam::tmp<Foam::volScalarField>
-Foam::ThermoCloud<ParcelType>::Ep() const
+template<class CloudType>
+inline Foam::tmp<Foam::volScalarField> Foam::ThermoCloud<CloudType>::Ep() const
 {
     tmp<volScalarField> tEp
     (
@@ -188,9 +187,9 @@ Foam::ThermoCloud<ParcelType>::Ep() const
         const scalarField& V = this->mesh().V();
         const scalar epsilon = constProps_.epsilon0();
 
-        forAllConstIter(typename ThermoCloud<ParcelType>, *this, iter)
+        forAllConstIter(typename ThermoCloud<CloudType>, *this, iter)
         {
-            const ParcelType& p = iter();
+            const parcelType& p = iter();
             const label cellI = p.cell();
             Ep[cellI] += p.nParticle()*p.areaP()*pow4(p.T());
         }
@@ -202,9 +201,8 @@ Foam::ThermoCloud<ParcelType>::Ep() const
 }
 
 
-template<class ParcelType>
-inline Foam::tmp<Foam::volScalarField>
-Foam::ThermoCloud<ParcelType>::ap() const
+template<class CloudType>
+inline Foam::tmp<Foam::volScalarField> Foam::ThermoCloud<CloudType>::ap() const
 {
     tmp<volScalarField> tap
     (
@@ -231,9 +229,9 @@ Foam::ThermoCloud<ParcelType>::ap() const
         const scalarField& V = this->mesh().V();
         const scalar epsilon = constProps_.epsilon0();
 
-        forAllConstIter(typename ThermoCloud<ParcelType>, *this, iter)
+        forAllConstIter(typename ThermoCloud<CloudType>, *this, iter)
         {
-            const ParcelType& p = iter();
+            const parcelType& p = iter();
             const label cellI = p.cell();
             ap[cellI] += p.nParticle()*p.areaP();
         }
@@ -245,9 +243,9 @@ Foam::ThermoCloud<ParcelType>::ap() const
 }
 
 
-template<class ParcelType>
+template<class CloudType>
 inline Foam::tmp<Foam::volScalarField>
-Foam::ThermoCloud<ParcelType>::sigmap() const
+Foam::ThermoCloud<CloudType>::sigmap() const
 {
     tmp<volScalarField> tsigmap
     (
@@ -276,9 +274,9 @@ Foam::ThermoCloud<ParcelType>::sigmap() const
         const scalar epsilon = constProps_.epsilon0();
         const scalar f = constProps_.f0();
 
-        forAllConstIter(typename ThermoCloud<ParcelType>, *this, iter)
+        forAllConstIter(typename ThermoCloud<CloudType>, *this, iter)
         {
-            const ParcelType& p = iter();
+            const parcelType& p = iter();
             const label cellI = p.cell();
             sigmap[cellI] += p.nParticle()*p.areaP();
         }
diff --git a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
index 7770dbb68d..a990a09c9f 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
@@ -27,14 +27,12 @@ Class
 Description
     Cloud class to introduce kinematic parcels
 
-SourceFiles
-    basicKinematicCloud.C
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef basicKinematicCloud_H
 #define basicKinematicCloud_H
 
+#include "Cloud.H"
 #include "KinematicCloud.H"
 #include "basicKinematicParcel.H"
 
@@ -42,7 +40,7 @@ SourceFiles
 
 namespace Foam
 {
-    typedef KinematicCloud<basicKinematicParcel> basicKinematicCloud;
+    typedef KinematicCloud<Cloud<basicKinematicParcel> > basicKinematicCloud;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelForces.C b/src/lagrangian/intermediate/clouds/derived/basicKinematicCollidingCloud/basicKinematicCollidingCloud.H
similarity index 68%
rename from src/lagrangian/coalCombustion/coalParcel/makeCoalParcelForces.C
rename to src/lagrangian/intermediate/clouds/derived/basicKinematicCollidingCloud/basicKinematicCollidingCloud.H
index 57c6806a62..a0cb27757b 100644
--- a/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelForces.C
+++ b/src/lagrangian/intermediate/clouds/derived/basicKinematicCollidingCloud/basicKinematicCollidingCloud.H
@@ -21,20 +21,40 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Class
+    Foam::basicKinematicCollidingCloud
+
+Description
+    Cloud class to introduce kinematic colliding parcels
+
 \*---------------------------------------------------------------------------*/
 
-#include "coalParcel.H"
+#ifndef basicKinematicCollidingCloud_H
+#define basicKinematicCollidingCloud_H
 
-// Using thermodynamic variant
-#include "makeThermoParcelForces.H"
+#include "Cloud.H"
+#include "KinematicCloud.H"
+#include "CollidingCloud.H"
+#include "basicKinematicCollidingParcel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    // Kinematic sub-models
-    makeThermoParcelForces(coalParcel);
-};
+    typedef CollidingCloud
+    <
+        KinematicCloud
+        <
+            Cloud
+            <
+                basicKinematicCollidingParcel
+            >
+        >
+    > basicKinematicCollidingCloud;
+}
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
 
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
index b93b0eda05..65f30549b2 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
@@ -27,14 +27,14 @@ Class
 Description
     Cloud class to introduce reacting parcels
 
-SourceFiles
-    BasicReactingCloud.C
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef basicReactingCloud_H
 #define basicReactingCloud_H
 
+#include "Cloud.H"
+#include "KinematicCloud.H"
+#include "ThermoCloud.H"
 #include "ReactingCloud.H"
 #include "basicReactingParcel.H"
 
@@ -42,7 +42,19 @@ SourceFiles
 
 namespace Foam
 {
-    typedef ReactingCloud<basicReactingParcel> basicReactingCloud;
+    typedef ReactingCloud
+    <
+        ThermoCloud
+        <
+            KinematicCloud
+            <
+                Cloud
+                <
+                    basicReactingParcel
+                >
+            >
+        >
+    > basicReactingCloud;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
index f56c60d1fa..af97c96ae3 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,6 +32,10 @@ Description
 #ifndef basicReactingMultiphaseCloud_H
 #define basicReactingMultiphaseCloud_H
 
+#include "Cloud.H"
+#include "KinematicCloud.H"
+#include "ThermoCloud.H"
+#include "ReactingCloud.H"
 #include "ReactingMultiphaseCloud.H"
 #include "basicReactingMultiphaseParcel.H"
 
@@ -40,10 +44,21 @@ Description
 namespace Foam
 {
     typedef ReactingMultiphaseCloud
+    <
+        ReactingCloud
         <
-            basicReactingMultiphaseParcel
+            ThermoCloud
+            <
+                KinematicCloud
+                <
+                    Cloud
+                    <
+                        basicReactingMultiphaseParcel
+                    >
+                >
+            >
         >
-        basicReactingMultiphaseCloud;
+    > basicReactingMultiphaseCloud;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
index df00dc82cb..92527df216 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
@@ -27,9 +27,6 @@ Class
 Description
     Cloud class to introduce thermodynamic parcels
 
-SourceFiles
-    basicThermoCloud.C
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef basicThermoCloud_H
@@ -42,7 +39,16 @@ SourceFiles
 
 namespace Foam
 {
-    typedef ThermoCloud<basicThermoParcel> basicThermoCloud;
+    typedef ThermoCloud
+    <
+        KinematicCloud
+        <
+            Cloud
+            <
+                basicThermoParcel
+            >
+        >
+    > basicThermoCloud;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.C
new file mode 100644
index 0000000000..0d10e5fb6c
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.C
@@ -0,0 +1,171 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2008-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "CollidingParcel.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class ParcelType>
+Foam::CollidingParcel<ParcelType>::CollidingParcel
+(
+    const CollidingParcel<ParcelType>& p
+)
+:
+    ParcelType(p),
+    collisionRecords_(p.collisionRecords_)
+{}
+
+
+template<class ParcelType>
+Foam::CollidingParcel<ParcelType>::CollidingParcel
+(
+    const CollidingParcel<ParcelType>& p,
+    const polyMesh& mesh
+)
+:
+    ParcelType(p, mesh),
+    collisionRecords_(p.collisionRecords_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class ParcelType>
+template<class TrackData>
+bool Foam::CollidingParcel<ParcelType>::move
+(
+    TrackData& td,
+    const scalar trackTime
+)
+{
+    typename TrackData::cloudType::parcelType& p =
+        static_cast<typename TrackData::cloudType::parcelType&>(*this);
+
+    td.switchProcessor = false;
+    td.keepParticle = true;
+
+    const polyMesh& mesh = td.cloud().pMesh();
+    const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
+    const scalarField& V = mesh.cellVolumes();
+
+    switch (td.part())
+    {
+        case TrackData::tpVelocityHalfStep:
+        {
+            // First and last leapfrog velocity adjust part, required
+            // before and after tracking and force calculation
+
+            p.U() += 0.5*trackTime*p.f()/p.mass();
+
+            p.angularMomentum() += 0.5*trackTime*p.torque();
+
+            break;
+        }
+
+        case TrackData::tpLinearTrack:
+        {
+            scalar tEnd = (1.0 - p.stepFraction())*trackTime;
+            const scalar dtMax = tEnd;
+
+            while (td.keepParticle && !td.switchProcessor && tEnd > ROOTVSMALL)
+            {
+                // Apply correction to position for reduced-D cases
+                meshTools::constrainToMeshCentre(mesh, p.position());
+
+                // Set the Lagrangian time-step
+                scalar dt = min(dtMax, tEnd);
+
+                // Remember which cell the parcel is in since this
+                // will change if a face is hit
+                const label cellI = p.cell();
+
+                const scalar magU = mag(p.U());
+                if (p.active() && magU > ROOTVSMALL)
+                {
+                    const scalar d = dt*magU;
+                    const scalar maxCo = td.cloud().solution().maxCo();
+                    const scalar dCorr = min(d, maxCo*cbrt(V[cellI]));
+                    dt *=
+                        dCorr/d
+                       *p.trackToFace(p.position() + dCorr*p.U()/magU, td);
+                }
+
+                tEnd -= dt;
+                p.stepFraction() = 1.0 - tEnd/trackTime;
+
+                // Avoid problems with extremely small timesteps
+                if (dt > ROOTVSMALL)
+                {
+                    // Update cell based properties
+                    p.setCellValues(td, dt, cellI);
+
+                    if (td.cloud().solution().cellValueSourceCorrection())
+                    {
+                        p.cellValueSourceCorrection(td, dt, cellI);
+                    }
+
+                    p.calc(td, dt, cellI);
+                }
+
+                if (p.onBoundary() && td.keepParticle)
+                {
+                    if (isA<processorPolyPatch>(pbMesh[p.patch(p.face())]))
+                    {
+                        td.switchProcessor = true;
+                    }
+                }
+
+                p.age() += dt;
+            }
+
+            break;
+        }
+
+        case TrackData::tpRotationalTrack:
+        {
+            notImplemented("TrackData::tpRotationalTrack");
+
+            break;
+        }
+
+        default:
+        {
+            FatalErrorIn
+            (
+                "CollidingParcel<ParcelType>::move(TrackData&, const scalar)"
+            )   << td.part() << " is an invalid part of the tracking method."
+                << abort(FatalError);
+        }
+    }
+
+    return td.keepParticle;
+}
+
+
+// * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
+
+#include "CollidingParcelIO.C"
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H
new file mode 100644
index 0000000000..75de5f1cde
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H
@@ -0,0 +1,234 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::CollidingParcel
+
+Description
+    Wrapper around kinematic parcel types to add collision modelling
+
+SourceFiles
+    CollidingParcelI.H
+    CollidingParcel.C
+    CollidingParcelIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef CollidingParcel_H
+#define CollidingParcel_H
+
+#include "particle.H"
+
+#include "CollisionRecordList.H"
+#include "labelFieldIOField.H"
+#include "vectorFieldIOField.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+typedef CollisionRecordList<vector, vector> collisionRecordList;
+typedef vectorFieldCompactIOField pairDataFieldCompactIOField;
+typedef vectorFieldCompactIOField wallDataFieldCompactIOField;
+
+template<class ParcelType>
+class CollidingParcel;
+
+// Forward declaration of friend functions
+
+template<class ParcelType>
+Ostream& operator<<
+(
+    Ostream&,
+    const CollidingParcel<ParcelType>&
+);
+
+/*---------------------------------------------------------------------------*\
+                         Class CollidingParcel Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class ParcelType>
+class CollidingParcel
+:
+    public ParcelType
+{
+protected:
+
+    // Protected data
+
+        //- Particle collision records
+        collisionRecordList collisionRecords_;
+
+
+public:
+
+    // Static data members
+
+        //- String representation of properties
+        static string propHeader;
+
+        //- Runtime type information
+        TypeName("CollidingParcel");
+
+
+    // Constructors
+
+        //- Construct from owner, position, and cloud owner
+        //  Other properties initialised as null
+        inline CollidingParcel
+        (
+            const polyMesh& mesh,
+            const vector& position,
+            const label cellI,
+            const label tetFaceI,
+            const label tetPtI
+        );
+
+        //- Construct from components
+        inline CollidingParcel
+        (
+            const polyMesh& mesh,
+            const vector& position,
+            const label cellI,
+            const label tetFaceI,
+            const label tetPtI,
+            const label typeId,
+            const scalar nParticle0,
+            const scalar d0,
+            const scalar dTarget0,
+            const vector& U0,
+            const vector& f0,
+            const vector& angularMomentum0,
+            const vector& torque0,
+            const typename ParcelType::constantProperties& constProps
+        );
+
+        //- Construct from Istream
+        CollidingParcel
+        (
+            const polyMesh& mesh,
+            Istream& is,
+            bool readFields = true
+        );
+
+        //- Construct as a copy
+        CollidingParcel(const CollidingParcel& p);
+
+        //- Construct as a copy
+        CollidingParcel(const CollidingParcel& p, const polyMesh& mesh);
+
+        //- Construct and return a (basic particle) clone
+        virtual autoPtr<particle> clone() const
+        {
+            return autoPtr<particle>(new CollidingParcel(*this));
+        }
+
+        //- Construct and return a (basic particle) clone
+        virtual autoPtr<particle> clone(const polyMesh& mesh) const
+        {
+            return autoPtr<particle>(new CollidingParcel(*this, mesh));
+        }
+
+        //- Factory class to read-construct particles used for
+        //  parallel transfer
+        class iNew
+        {
+            const polyMesh& mesh_;
+
+        public:
+
+            iNew(const polyMesh& mesh)
+            :
+                mesh_(mesh)
+            {}
+
+            autoPtr<CollidingParcel<ParcelType> > operator()(Istream& is) const
+            {
+                return autoPtr<CollidingParcel<ParcelType> >
+                (
+                    new CollidingParcel<ParcelType>(mesh_, is, true)
+                );
+            }
+        };
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return const access to the collision records
+            inline const collisionRecordList& collisionRecords() const;
+
+            //- Return access to collision records
+            inline collisionRecordList& collisionRecords();
+
+
+        // Tracking
+
+            //- Move the parcel
+            template<class TrackData>
+            bool move(TrackData& td, const scalar trackTime);
+
+
+       // I-O
+
+            //- Read
+            template<class CloudType>
+            static void readFields(CloudType& c);
+
+            //- Write
+            template<class CloudType>
+            static void writeFields(const CloudType& c);
+
+
+    // Ostream Operator
+
+        friend Ostream& operator<< <ParcelType>
+        (
+            Ostream&,
+            const CollidingParcel<ParcelType>&
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "CollidingParcelI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "CollidingParcel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H
similarity index 62%
rename from src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
rename to src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H
index 2c26932342..3b8a1f8fd0 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,27 +23,28 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "basicThermoParcel.H"
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::basicThermoParcel::basicThermoParcel
+template<class ParcelType>
+inline Foam::CollidingParcel<ParcelType>::CollidingParcel
 (
-    ThermoCloud<basicThermoParcel>& owner,
-    const vector position,
+    const polyMesh& owner,
+    const vector& position,
     const label cellI,
     const label tetFaceI,
     const label tetPtI
 )
 :
-    ThermoParcel<basicThermoParcel>(owner, position, cellI, tetFaceI, tetPtI)
+    ParcelType(owner, position, cellI, tetFaceI, tetPtI),
+    collisionRecords_()
 {}
 
 
-Foam::basicThermoParcel::basicThermoParcel
+template<class ParcelType>
+inline Foam::CollidingParcel<ParcelType>::CollidingParcel
 (
-    ThermoCloud<basicThermoParcel>& owner,
-    const vector position,
+    const polyMesh& owner,
+    const vector& position,
     const label cellI,
     const label tetFaceI,
     const label tetPtI,
@@ -51,14 +52,14 @@ Foam::basicThermoParcel::basicThermoParcel
     const scalar nParticle0,
     const scalar d0,
     const scalar dTarget0,
-    const vector U0,
+    const vector& U0,
     const vector& f0,
     const vector& angularMomentum0,
     const vector& torque0,
-    const constantProperties& constProps
+    const typename ParcelType::constantProperties& constProps
 )
 :
-    ThermoParcel<basicThermoParcel>
+    ParcelType
     (
         owner,
         position,
@@ -74,44 +75,28 @@ Foam::basicThermoParcel::basicThermoParcel
         angularMomentum0,
         torque0,
         constProps
-    )
+    ),
+    collisionRecords_()
 {}
 
 
-Foam::basicThermoParcel::basicThermoParcel
-(
-    const Cloud<basicThermoParcel>& cloud,
-    Istream& is,
-    bool readFields
-)
-:
-    ThermoParcel<basicThermoParcel>(cloud, is, readFields)
-{}
+// * * * * * * * CollidingParcel Member Functions  * * * * * * * //
 
 
-Foam::basicThermoParcel::basicThermoParcel
-(
-    const basicThermoParcel& p
-)
-:
-    ThermoParcel<basicThermoParcel>(p)
-{}
+template<class ParcelType>
+inline const Foam::collisionRecordList&
+Foam::CollidingParcel<ParcelType>::collisionRecords() const
+{
+    return collisionRecords_;
+}
 
 
-Foam::basicThermoParcel::basicThermoParcel
-(
-    const basicThermoParcel& p,
-    const ThermoCloud<basicThermoParcel>& c
-)
-:
-    ThermoParcel<basicThermoParcel>(p, c)
-{}
-
-
-// * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
-
-Foam::basicThermoParcel::~basicThermoParcel()
-{}
+template<class ParcelType>
+inline Foam::collisionRecordList&
+Foam::CollidingParcel<ParcelType>::collisionRecords()
+{
+    return collisionRecords_;
+}
 
 
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
new file mode 100644
index 0000000000..61f7e66e43
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
@@ -0,0 +1,261 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "CollidingParcel.H"
+#include "IOstreams.H"
+#include "IOField.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class ParcelType>
+Foam::string Foam::CollidingParcel<ParcelType>::propHeader =
+    ParcelType::propHeader
+  + " collisionRecordsPairAccessed"
+  + " collisionRecordsPairOrigProcOfOther"
+  + " collisionRecordsPairOrigIdOfOther"
+  + " (collisionRecordsPairData)"
+  + " collisionRecordsWallAccessed"
+  + " collisionRecordsWallPRel"
+  + " (collisionRecordsWallData)";
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class ParcelType>
+Foam::CollidingParcel<ParcelType>::CollidingParcel
+(
+    const polyMesh& mesh,
+    Istream& is,
+    bool readFields
+)
+:
+    ParcelType(mesh, is, readFields),
+    collisionRecords_()
+{
+    if (readFields)
+    {
+        is >> collisionRecords_;
+    }
+
+    // Check state of Istream
+    is.check
+    (
+        "CollidingParcel<ParcelType>::Collisions"
+        "(const polyMesh&, Istream&, bool)"
+    );
+}
+
+
+template<class ParcelType>
+template<class CloudType>
+void Foam::CollidingParcel<ParcelType>::readFields(CloudType& c)
+{
+    if (!c.size())
+    {
+        return;
+    }
+
+    ParcelType::readFields(c);
+
+    labelFieldCompactIOField collisionRecordsPairAccessed
+    (
+        c.fieldIOobject("collisionRecordsPairAccessed", IOobject::MUST_READ)
+    );
+    c.checkFieldFieldIOobject(c, collisionRecordsPairAccessed);
+
+    labelFieldCompactIOField collisionRecordsPairOrigProcOfOther
+    (
+        c.fieldIOobject
+        (
+            "collisionRecordsPairOrigProcOfOther",
+            IOobject::MUST_READ
+        )
+    );
+    c.checkFieldFieldIOobject(c, collisionRecordsPairOrigProcOfOther);
+
+    labelFieldCompactIOField collisionRecordsPairOrigIdOfOther
+    (
+        c.fieldIOobject
+        (
+            "collisionRecordsPairOrigIdOfOther",
+            IOobject::MUST_READ
+        )
+    );
+    c.checkFieldFieldIOobject(c, collisionRecordsPairOrigProcOfOther);
+
+    pairDataFieldCompactIOField collisionRecordsPairData
+    (
+        c.fieldIOobject("collisionRecordsPairData", IOobject::MUST_READ)
+    );
+    c.checkFieldFieldIOobject(c, collisionRecordsPairData);
+
+    labelFieldCompactIOField collisionRecordsWallAccessed
+    (
+        c.fieldIOobject("collisionRecordsWallAccessed", IOobject::MUST_READ)
+    );
+    c.checkFieldFieldIOobject(c, collisionRecordsWallAccessed);
+
+    vectorFieldCompactIOField collisionRecordsWallPRel
+    (
+        c.fieldIOobject("collisionRecordsWallPRel", IOobject::MUST_READ)
+    );
+    c.checkFieldFieldIOobject(c, collisionRecordsWallPRel);
+
+    wallDataFieldCompactIOField collisionRecordsWallData
+    (
+        c.fieldIOobject("collisionRecordsWallData", IOobject::MUST_READ)
+    );
+    c.checkFieldFieldIOobject(c, collisionRecordsWallData);
+
+    label i = 0;
+
+    forAllIter(typename CloudType, c, iter)
+    {
+        CollidingParcel<ParcelType>& p = iter();
+
+        p.collisionRecords_ = collisionRecordList
+        (
+            collisionRecordsPairAccessed[i],
+            collisionRecordsPairOrigProcOfOther[i],
+            collisionRecordsPairOrigIdOfOther[i],
+            collisionRecordsPairData[i],
+            collisionRecordsWallAccessed[i],
+            collisionRecordsWallPRel[i],
+            collisionRecordsWallData[i]
+        );
+
+        i++;
+    }
+}
+
+
+template<class ParcelType>
+template<class CloudType>
+void Foam::CollidingParcel<ParcelType>::writeFields(const CloudType& c)
+{
+    ParcelType::writeFields(c);
+
+    label np =  c.size();
+
+    labelFieldCompactIOField collisionRecordsPairAccessed
+    (
+        c.fieldIOobject("collisionRecordsPairAccessed", IOobject::NO_READ),
+        np
+    );
+    labelFieldCompactIOField collisionRecordsPairOrigProcOfOther
+    (
+        c.fieldIOobject
+        (
+            "collisionRecordsPairOrigProcOfOther",
+            IOobject::NO_READ
+        ),
+        np
+    );
+    labelFieldCompactIOField collisionRecordsPairOrigIdOfOther
+    (
+        c.fieldIOobject("collisionRecordsPairOrigIdOfOther", IOobject::NO_READ),
+        np
+    );
+    pairDataFieldCompactIOField collisionRecordsPairData
+    (
+        c.fieldIOobject("collisionRecordsPairData", IOobject::NO_READ),
+        np
+    );
+    labelFieldCompactIOField collisionRecordsWallAccessed
+    (
+        c.fieldIOobject("collisionRecordsWallAccessed", IOobject::NO_READ),
+        np
+    );
+    vectorFieldCompactIOField collisionRecordsWallPRel
+    (
+        c.fieldIOobject("collisionRecordsWallPRel", IOobject::NO_READ),
+        np
+    );
+    wallDataFieldCompactIOField collisionRecordsWallData
+    (
+        c.fieldIOobject("collisionRecordsWallData", IOobject::NO_READ),
+        np
+    );
+
+    label i = 0;
+
+    forAllConstIter(typename CloudType, c, iter)
+    {
+        const CollidingParcel<ParcelType>& p = iter();
+
+        collisionRecordsPairAccessed[i] = p.collisionRecords().pairAccessed();
+        collisionRecordsPairOrigProcOfOther[i] =
+            p.collisionRecords().pairOrigProcOfOther();
+        collisionRecordsPairOrigIdOfOther[i] =
+            p.collisionRecords().pairOrigIdOfOther();
+        collisionRecordsPairData[i] = p.collisionRecords().pairData();
+        collisionRecordsWallAccessed[i] = p.collisionRecords().wallAccessed();
+        collisionRecordsWallPRel[i] = p.collisionRecords().wallPRel();
+        collisionRecordsWallData[i] = p.collisionRecords().wallData();
+
+        i++;
+    }
+
+    collisionRecordsPairAccessed.write();
+    collisionRecordsPairOrigProcOfOther.write();
+    collisionRecordsPairOrigIdOfOther.write();
+    collisionRecordsPairData.write();
+    collisionRecordsWallAccessed.write();
+    collisionRecordsWallPRel.write();
+    collisionRecordsWallData.write();
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+template<class ParcelType>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const CollidingParcel<ParcelType>& p
+)
+{
+    if (os.format() == IOstream::ASCII)
+    {
+        os  << static_cast<const ParcelType&>(p)
+            << token::SPACE << p.collisionRecords();
+    }
+    else
+    {
+        os  << static_cast<const ParcelType&>(p)
+            << p.collisionRecords();
+    }
+
+    // Check state of Ostream
+    os.check
+    (
+        "Ostream& operator<<(Ostream&, const CollidingParcel<ParcelType>&)"
+    );
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C
similarity index 99%
rename from src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
rename to src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C
index 4e80d16d6f..ca10133408 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.H
similarity index 99%
rename from src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
rename to src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.H
index a933b35ca0..7df2d31f00 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordListI.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordListI.H
similarity index 96%
rename from src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordListI.H
rename to src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordListI.H
index 0880662a40..ba8fa7f6a7 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordListI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C
similarity index 97%
rename from src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C
rename to src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C
index e20e58c433..dd2ac1adce 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
similarity index 98%
rename from src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
rename to src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
index 5604efd549..c1ff069eb9 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordI.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordI.H
similarity index 97%
rename from src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordI.H
rename to src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordI.H
index 4c0d3abc87..7d747246bb 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordIO.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordIO.C
similarity index 97%
rename from src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordIO.C
rename to src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordIO.C
index 4c1de522f7..a8025b9e73 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
similarity index 97%
rename from src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
rename to src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
index 04125ee7b3..ad555109c5 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
similarity index 98%
rename from src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
rename to src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
index 7383ba6485..eb010f5b04 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
similarity index 98%
rename from src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
rename to src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
index 5928714412..ef5a79acad 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordIO.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordIO.C
similarity index 97%
rename from src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordIO.C
rename to src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordIO.C
index afc35b5b09..c1c51e72e9 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 1fe4aa29d0..d2aa164294 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -24,6 +24,9 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "KinematicParcel.H"
+#include "forceSuSp.H"
+#include "IntegrationScheme.H"
+#include "meshTools.H"
 
 // * * * * * * * * * * *  Protected Member Functions * * * * * * * * * * * * //
 
@@ -124,7 +127,7 @@ void Foam::KinematicParcel<ParcelType>::calc
     // ~~~~~~
 
     // Calculate new particle velocity
-    scalar Cud = 0.0;
+    scalar Spu = 0.0;
     vector U1 =
         calcVelocity
         (
@@ -139,7 +142,7 @@ void Foam::KinematicParcel<ParcelType>::calc
             mass0,
             Su,
             dUTrans,
-            Cud
+            Spu
         );
 
 
@@ -151,7 +154,7 @@ void Foam::KinematicParcel<ParcelType>::calc
         td.cloud().UTrans()[cellI] += np0*dUTrans;
 
         // Update momentum transfer coefficient
-        td.cloud().UCoeff()[cellI] += np0*mass0*Cud;
+        td.cloud().UCoeff()[cellI] += np0*Spu;
     }
 
 
@@ -176,13 +179,17 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
     const scalar mass,
     const vector& Su,
     vector& dUTrans,
-    scalar& Cud
+    scalar& Spu
 ) const
 {
-    const typename ParcelType::forceType& forces = td.cloud().forces();
+    typedef typename TrackData::cloudType cloudType;
+    typedef typename cloudType::parcelType parcelType;
+    typedef typename cloudType::forceType forceType;
+
+    const forceType& forces = td.cloud().forces();
 
     // Momentum source due to particle forces
-    const ParcelType& p = static_cast<const ParcelType&>(*this);
+    const parcelType& p = static_cast<const parcelType&>(*this);
     const forceSuSp Fcp = forces.calcCoupled(p, dt, mass, Re, mu);
     const forceSuSp Fncp = forces.calcNonCoupled(p, dt, mass, Re, mu);
     const forceSuSp Feff = Fcp + Fncp;
@@ -195,17 +202,18 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
     const vector ap = Uc_ + (Feff.Su() + Su)/(Feff.Sp() + ROOTVSMALL);
     const scalar bp = Feff.Sp()/mass;
 
-    Cud = bp;
+    Spu = Feff.Sp();
 
     IntegrationScheme<vector>::integrationResult Ures =
         td.cloud().UIntegrator().integrate(U, dt, ap, bp);
 
     vector Unew = Ures.value();
 
+    // note: Feff.Sp() and Fc.Sp() must be the same
     dUTrans += dt*(Feff.Sp()*(Ures.average() - Uc_) - Fcp.Su());
 
     // Apply correction to velocity and dUTrans for reduced-D cases
-    const polyMesh& mesh = this->cloud().pMesh();
+    const polyMesh& mesh = td.cloud().pMesh();
     meshTools::constrainDirection(mesh, mesh.solutionD(), Unew);
     meshTools::constrainDirection(mesh, mesh.solutionD(), dUTrans);
 
@@ -221,7 +229,7 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
     const KinematicParcel<ParcelType>& p
 )
 :
-    Particle<ParcelType>(p),
+    ParcelType(p),
     active_(p.active_),
     typeId_(p.typeId_),
     nParticle_(p.nParticle_),
@@ -235,7 +243,6 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
     age_(p.age_),
     tTurb_(p.tTurb_),
     UTurb_(p.UTurb_),
-    collisionRecords_(p.collisionRecords_),
     rhoc_(p.rhoc_),
     Uc_(p.Uc_),
     muc_(p.muc_)
@@ -246,10 +253,10 @@ template<class ParcelType>
 Foam::KinematicParcel<ParcelType>::KinematicParcel
 (
     const KinematicParcel<ParcelType>& p,
-    const KinematicCloud<ParcelType>& c
+    const polyMesh& mesh
 )
 :
-    Particle<ParcelType>(p, c),
+    ParcelType(p, mesh),
     active_(p.active_),
     typeId_(p.typeId_),
     nParticle_(p.nParticle_),
@@ -263,7 +270,6 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
     age_(p.age_),
     tTurb_(p.tTurb_),
     UTurb_(p.UTurb_),
-    collisionRecords_(p.collisionRecords_),
     rhoc_(p.rhoc_),
     Uc_(p.Uc_),
     muc_(p.muc_)
@@ -280,7 +286,8 @@ bool Foam::KinematicParcel<ParcelType>::move
     const scalar trackTime
 )
 {
-    ParcelType& p = static_cast<ParcelType&>(*this);
+    typename TrackData::cloudType::parcelType& p =
+        static_cast<typename TrackData::cloudType::parcelType&>(*this);
 
     td.switchProcessor = false;
     td.keepParticle = true;
@@ -289,92 +296,58 @@ bool Foam::KinematicParcel<ParcelType>::move
     const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
     const scalarField& V = mesh.cellVolumes();
 
-    switch (td.part())
+    scalar tEnd = (1.0 - p.stepFraction())*trackTime;
+    const scalar dtMax = tEnd;
+
+    while (td.keepParticle && !td.switchProcessor && tEnd > ROOTVSMALL)
     {
-        case TrackData::tpVelocityHalfStep:
+        // Apply correction to position for reduced-D cases
+        meshTools::constrainToMeshCentre(mesh, p.position());
+
+        // Set the Lagrangian time-step
+        scalar dt = min(dtMax, tEnd);
+
+        // Remember which cell the parcel is in since this will change if
+        // a face is hit
+        const label cellI = p.cell();
+
+        const scalar magU = mag(U_);
+        if (p.active() && magU > ROOTVSMALL)
         {
-            // First and last leapfrog velocity adjust part, required
-            // before and after tracking and force calculation
-
-            p.U() += 0.5*trackTime*p.f()/p.mass();
-
-            angularMomentum_ += 0.5*trackTime*torque_;
-
-            break;
+            const scalar d = dt*magU;
+            const scalar maxCo = td.cloud().solution().maxCo();
+            const scalar dCorr = min(d, maxCo*cbrt(V[cellI]));
+            dt *=
+                dCorr/d
+               *p.trackToFace(p.position() + dCorr*U_/magU, td);
         }
 
-        case TrackData::tpLinearTrack:
+        tEnd -= dt;
+        p.stepFraction() = 1.0 - tEnd/trackTime;
+
+        // Avoid problems with extremely small timesteps
+        if (dt > ROOTVSMALL)
         {
-            scalar tEnd = (1.0 - p.stepFraction())*trackTime;
-            const scalar dtMax = tEnd;
+            // Update cell based properties
+            p.setCellValues(td, dt, cellI);
 
-            while (td.keepParticle && !td.switchProcessor && tEnd > ROOTVSMALL)
+            if (td.cloud().solution().cellValueSourceCorrection())
             {
-                // Apply correction to position for reduced-D cases
-                meshTools::constrainToMeshCentre(mesh, p.position());
-
-                // Set the Lagrangian time-step
-                scalar dt = min(dtMax, tEnd);
-
-                // Remember which cell the parcel is in since this
-                // will change if a face is hit
-                const label cellI = p.cell();
-
-                const scalar magU = mag(U_);
-                if (p.active() && magU > ROOTVSMALL)
-                {
-                    const scalar d = dt*magU;
-                    const scalar maxCo = td.cloud().solution().maxCo();
-                    const scalar dCorr = min(d, maxCo*cbrt(V[cellI]));
-                    dt *=
-                        dCorr/d
-                       *p.trackToFace(p.position() + dCorr*U_/magU, td);
-                }
-
-                tEnd -= dt;
-                p.stepFraction() = 1.0 - tEnd/trackTime;
-
-                // Avoid problems with extremely small timesteps
-                if (dt > ROOTVSMALL)
-                {
-                    // Update cell based properties
-                    p.setCellValues(td, dt, cellI);
-
-                    if (td.cloud().solution().cellValueSourceCorrection())
-                    {
-                        p.cellValueSourceCorrection(td, dt, cellI);
-                    }
-
-                    p.calc(td, dt, cellI);
-                }
-
-                if (p.onBoundary() && td.keepParticle)
-                {
-                    if (isA<processorPolyPatch>(pbMesh[p.patch(p.face())]))
-                    {
-                        td.switchProcessor = true;
-                    }
-                }
-
-                p.age() += dt;
+                p.cellValueSourceCorrection(td, dt, cellI);
             }
 
-            break;
+            p.calc(td, dt, cellI);
         }
 
-        case TrackData::tpRotationalTrack:
+        if (p.onBoundary() && td.keepParticle)
         {
-            notImplemented("TrackData::tpRotationalTrack");
-
-            break;
+            if (isA<processorPolyPatch>(pbMesh[p.patch(p.face())]))
+            {
+                td.switchProcessor = true;
+            }
         }
 
-        default:
-        {
-            FatalErrorIn("KinematicParcel<ParcelType>::move(TrackData& td)")
-                << td.part() << " is an invalid part of the tracking method."
-                << abort(FatalError);
-        }
+        p.age() += dt;
     }
 
     return td.keepParticle;
@@ -385,7 +358,9 @@ template<class ParcelType>
 template<class TrackData>
 void Foam::KinematicParcel<ParcelType>::hitFace(TrackData& td)
 {
-    ParcelType& p = static_cast<ParcelType&>(*this);
+    typename TrackData::cloudType::parcelType& p =
+        static_cast<typename TrackData::cloudType::parcelType&>(*this);
+
     td.cloud().postProcessing().postFace(p);
 }
 
@@ -406,7 +381,8 @@ bool Foam::KinematicParcel<ParcelType>::hitPatch
     const tetIndices& tetIs
 )
 {
-    ParcelType& p = static_cast<ParcelType&>(*this);
+    typename TrackData::cloudType::parcelType& p =
+        static_cast<typename TrackData::cloudType::parcelType&>(*this);
 
     // Invoke post-processing model
     td.cloud().postProcessing().postPatch(p, patchI);
@@ -422,7 +398,7 @@ bool Foam::KinematicParcel<ParcelType>::hitPatch
         // Invoke patch interaction model
         return td.cloud().patchInteraction().correct
         (
-            static_cast<ParcelType&>(*this),
+            p,
             pp,
             td.keepParticle,
             trackFraction,
@@ -432,20 +408,6 @@ bool Foam::KinematicParcel<ParcelType>::hitPatch
 }
 
 
-template<class ParcelType>
-bool Foam::KinematicParcel<ParcelType>::hitPatch
-(
-    const polyPatch& pp,
-    int& td,
-    const label patchI,
-    const scalar trackFraction,
-    const tetIndices& tetIs
-)
-{
-    return false;
-}
-
-
 template<class ParcelType>
 template<class TrackData>
 void Foam::KinematicParcel<ParcelType>::hitProcessorPatch
@@ -458,15 +420,6 @@ void Foam::KinematicParcel<ParcelType>::hitProcessorPatch
 }
 
 
-template<class ParcelType>
-void Foam::KinematicParcel<ParcelType>::hitProcessorPatch
-(
-    const processorPolyPatch&,
-    int&
-)
-{}
-
-
 template<class ParcelType>
 template<class TrackData>
 void Foam::KinematicParcel<ParcelType>::hitWallPatch
@@ -480,16 +433,6 @@ void Foam::KinematicParcel<ParcelType>::hitWallPatch
 }
 
 
-template<class ParcelType>
-void Foam::KinematicParcel<ParcelType>::hitWallPatch
-(
-    const wallPolyPatch&,
-    int&,
-    const tetIndices&
-)
-{}
-
-
 template<class ParcelType>
 template<class TrackData>
 void Foam::KinematicParcel<ParcelType>::hitPatch
@@ -502,19 +445,10 @@ void Foam::KinematicParcel<ParcelType>::hitPatch
 }
 
 
-template<class ParcelType>
-void Foam::KinematicParcel<ParcelType>::hitPatch
-(
-    const polyPatch&,
-    int&
-)
-{}
-
-
 template<class ParcelType>
 void Foam::KinematicParcel<ParcelType>::transformProperties(const tensor& T)
 {
-    Particle<ParcelType>::transformProperties(T);
+    ParcelType::transformProperties(T);
 
     U_ = transform(T, U_);
 
@@ -532,7 +466,7 @@ void Foam::KinematicParcel<ParcelType>::transformProperties
     const vector& separation
 )
 {
-    Particle<ParcelType>::transformProperties(separation);
+    ParcelType::transformProperties(separation);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 838c8bf9d6..9c230a49d5 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -33,7 +33,6 @@ Description
     - drag
     - turbulent dispersion
     - wall interactions
-    - many-body collisions, including memory of data from previous collision
 
 SourceFiles
     KinematicParcelI.H
@@ -45,28 +44,18 @@ SourceFiles
 #ifndef KinematicParcel_H
 #define KinematicParcel_H
 
-#include "Particle.H"
+#include "particle.H"
 #include "IOstream.H"
 #include "autoPtr.H"
 #include "interpolation.H"
-#include "contiguous.H"
 
-#include "KinematicCloud.H"
-#include "CollisionRecordList.H"
-#include "labelFieldIOField.H"
-#include "vectorFieldIOField.H"
-
-#include "ParticleForceList.H"
+// #include "ParticleForceList.H" // TODO
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-typedef CollisionRecordList<vector, vector> collisionRecordList;
-typedef vectorFieldCompactIOField pairDataFieldCompactIOField;
-typedef vectorFieldCompactIOField wallDataFieldCompactIOField;
-
 template<class ParcelType>
 class KinematicParcel;
 
@@ -86,14 +75,10 @@ Ostream& operator<<
 template<class ParcelType>
 class KinematicParcel
 :
-    public Particle<ParcelType>
+    public ParcelType
 {
 public:
 
-    //- Type of force to be used by this parcel type
-    typedef ParticleForceList<KinematicCloud<ParcelType> > forceType;
-
-
     //- Class to hold kinematic particle constant properties
     class constantProperties
     {
@@ -165,10 +150,10 @@ public:
     };
 
 
-    //- Class used to pass kinematic tracking data to the trackToFace function
-    class trackData
+    template<class CloudType>
+    class TrackingData
     :
-        public Particle<ParcelType>::trackData
+        public ParcelType::template TrackingData<CloudType>
     {
     public:
 
@@ -184,10 +169,6 @@ public:
 
         // Private data
 
-            //- Reference to the cloud containing this particle
-            KinematicCloud<ParcelType>& cloud_;
-
-
             // Interpolators for continuous phase fields
 
                 //- Density interpolator
@@ -208,23 +189,20 @@ public:
             trackPart part_;
 
 
-   public:
+    public:
 
         // Constructors
 
             //- Construct from components
-            inline trackData
+            inline TrackingData
             (
-                KinematicCloud<ParcelType>& cloud,
+                CloudType& cloud,
                 trackPart part = tpLinearTrack
             );
 
 
         // Member functions
 
-            //- Return access to the owner cloud
-            inline KinematicCloud<ParcelType>& cloud();
-
             //- Return conat access to the interpolator for continuous
             //  phase density field
             inline const interpolation<scalar>& rhoInterp() const;
@@ -295,9 +273,6 @@ protected:
             //- Turbulent velocity fluctuation [m/s]
             vector UTurb_;
 
-            //- Particle collision records
-            collisionRecordList collisionRecords_;
-
 
         // Cell-based quantities
 
@@ -328,7 +303,7 @@ protected:
             const scalar mass,         // mass
             const vector& Su,          // explicit particle momentum source
             vector& dUTrans,           // momentum transfer to carrier
-            scalar& Cud                // linearised drag coefficient
+            scalar& Spu                // linearised drag coefficient
         ) const;
 
 
@@ -343,16 +318,13 @@ public:
         TypeName("KinematicParcel");
 
 
-    friend class Cloud<ParcelType>;
-
-
     // Constructors
 
         //- Construct from owner, position, and cloud owner
         //  Other properties initialised as null
         inline KinematicParcel
         (
-            KinematicCloud<ParcelType>& owner,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             const label tetFaceI,
@@ -362,7 +334,7 @@ public:
         //- Construct from components
         inline KinematicParcel
         (
-            KinematicCloud<ParcelType>& owner,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             const label tetFaceI,
@@ -381,7 +353,7 @@ public:
         //- Construct from Istream
         KinematicParcel
         (
-            const Cloud<ParcelType>& c,
+            const polyMesh& mesh,
             Istream& is,
             bool readFields = true
         );
@@ -390,33 +362,41 @@ public:
         KinematicParcel(const KinematicParcel& p);
 
         //- Construct as a copy
-        KinematicParcel
-        (
-            const KinematicParcel& p,
-            const KinematicCloud<ParcelType>& c
-        );
+        KinematicParcel(const KinematicParcel& p, const polyMesh& mesh);
 
         //- Construct and return a (basic particle) clone
-        virtual autoPtr<Particle<ParcelType> > clone() const
+        virtual autoPtr<particle> clone() const
         {
-            return autoPtr<Particle<ParcelType> >(new KinematicParcel(*this));
+            return autoPtr<particle>(new KinematicParcel(*this));
         }
 
         //- Construct and return a (basic particle) clone
-        virtual autoPtr<Particle<ParcelType> > clone
-        (
-            const Cloud<ParcelType>& c
-        ) const
+        virtual autoPtr<particle> clone(const polyMesh& mesh) const
         {
-            return autoPtr<Particle<ParcelType> >
-            (
-                new KinematicParcel
+            return autoPtr<particle>(new KinematicParcel(*this, mesh));
+        }
+
+        //- Factory class to read-construct particles used for
+        //  parallel transfer
+        class iNew
+        {
+            const polyMesh& mesh_;
+
+        public:
+
+            iNew(const polyMesh& mesh)
+            :
+                mesh_(mesh)
+            {}
+
+            autoPtr<KinematicParcel<ParcelType> > operator()(Istream& is) const
+            {
+                return autoPtr<KinematicParcel<ParcelType> >
                 (
-                    *this,
-                    static_cast<const KinematicCloud<ParcelType>&>(c)
-                )
-            );
-        }
+                    new KinematicParcel<ParcelType>(mesh_, is, true)
+                );
+            }
+        };
 
 
     // Member Functions
@@ -471,9 +451,6 @@ public:
             //- Return const access to carrier viscosity [Pa.s]
             inline scalar muc() const;
 
-            //- Return const access to the collision records
-            inline const collisionRecordList& collisionRecords() const;
-
 
         // Edit
 
@@ -516,9 +493,6 @@ public:
             //- Return access to turbulent velocity fluctuation
             inline vector& UTurb();
 
-            //- Return access to collision records
-            inline collisionRecordList& collisionRecords();
-
 
         // Helper functions
 
@@ -629,17 +603,6 @@ public:
                 const tetIndices& tetIs
             );
 
-            //- Overridable function to handle the particle hitting a patch
-            //  Executed before other patch-hitting functions without trackData
-            bool hitPatch
-            (
-                const polyPatch& p,
-                int& td,
-                const label patchI,
-                const scalar trackFraction,
-                const tetIndices& tetIs
-            );
-
             //- Overridable function to handle the particle hitting a
             //  processorPatch
             template<class TrackData>
@@ -649,14 +612,6 @@ public:
                 TrackData& td
             );
 
-            //- Overridable function to handle the particle hitting a
-            //  processorPatch without trackData
-            void hitProcessorPatch
-            (
-                const processorPolyPatch&,
-                int&
-            );
-
             //- Overridable function to handle the particle hitting a wallPatch
             template<class TrackData>
             void hitWallPatch
@@ -666,15 +621,6 @@ public:
                 const tetIndices&
             );
 
-            //- Overridable function to handle the particle hitting a wallPatch
-            //  without trackData
-            void hitWallPatch
-            (
-                const wallPolyPatch&,
-                int&,
-                const tetIndices&
-            );
-
             //- Overridable function to handle the particle hitting a polyPatch
             template<class TrackData>
             void hitPatch
@@ -683,14 +629,6 @@ public:
                 TrackData& td
             );
 
-            //- Overridable function to handle the particle hitting a polyPatch
-            //- without trackData
-            void hitPatch
-            (
-                const polyPatch&,
-                int&
-            );
-
             //- Transform the physical properties of the particle
             //  according to the given transformation tensor
             void transformProperties(const tensor& T);
@@ -703,10 +641,12 @@ public:
         // I-O
 
             //- Read
-            static void readFields(Cloud<ParcelType>& c);
+            template<class CloudType>
+            static void readFields(CloudType& c);
 
             //- Write
-            static void writeFields(const Cloud<ParcelType>& c);
+            template<class CloudType>
+            static void writeFields(const CloudType& c);
 
 
     // Ostream Operator
@@ -726,6 +666,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "KinematicParcelI.H"
+#include "KinematicParcelTrackingDataI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index c4cd31b5d3..74ae8492d3 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -86,57 +86,19 @@ inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
 }
 
 
-template<class ParcelType>
-inline Foam::KinematicParcel<ParcelType>::trackData::trackData
-(
-    KinematicCloud<ParcelType>& cloud,
-    trackPart part
-)
-:
-    Particle<ParcelType>::trackData(cloud),
-    cloud_(cloud),
-    rhoInterp_
-    (
-        interpolation<scalar>::New
-        (
-            cloud.solution().interpolationSchemes(),
-            cloud.rho()
-        )
-    ),
-    UInterp_
-    (
-        interpolation<vector>::New
-        (
-            cloud.solution().interpolationSchemes(),
-            cloud.U()
-        )
-    ),
-    muInterp_
-    (
-        interpolation<scalar>::New
-        (
-            cloud.solution().interpolationSchemes(),
-            cloud.mu()
-        )
-    ),
-    g_(cloud.g().value()),
-    part_(part)
-{}
-
-
 template<class ParcelType>
 inline Foam::KinematicParcel<ParcelType>::KinematicParcel
 (
-    KinematicCloud<ParcelType>& owner,
+    const polyMesh& owner,
     const vector& position,
     const label cellI,
     const label tetFaceI,
     const label tetPtI
 )
 :
-    Particle<ParcelType>(owner, position, cellI, tetFaceI, tetPtI),
+    ParcelType(owner, position, cellI, tetFaceI, tetPtI),
     active_(true),
-    typeId_(owner.constProps().parcelTypeId()),
+    typeId_(-1),
     nParticle_(0),
     d_(0.0),
     dTarget_(0.0),
@@ -148,7 +110,6 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
     age_(0.0),
     tTurb_(0.0),
     UTurb_(vector::zero),
-    collisionRecords_(),
     rhoc_(0.0),
     Uc_(vector::zero),
     muc_(0.0)
@@ -158,7 +119,7 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
 template<class ParcelType>
 inline Foam::KinematicParcel<ParcelType>::KinematicParcel
 (
-    KinematicCloud<ParcelType>& owner,
+    const polyMesh& owner,
     const vector& position,
     const label cellI,
     const label tetFaceI,
@@ -174,7 +135,7 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
     const constantProperties& constProps
 )
 :
-    Particle<ParcelType>(owner, position, cellI, tetFaceI, tetPtI),
+    ParcelType(owner, position, cellI, tetFaceI, tetPtI),
     active_(true),
     typeId_(typeId),
     nParticle_(nParticle0),
@@ -188,7 +149,6 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
     age_(0.0),
     tTurb_(0.0),
     UTurb_(vector::zero),
-    collisionRecords_(),
     rhoc_(0.0),
     Uc_(vector::zero),
     muc_(0.0)
@@ -239,8 +199,7 @@ Foam::KinematicParcel<ParcelType>::constantProperties::minParticleMass() const
 
 template<class ParcelType>
 inline Foam::scalar
-Foam::KinematicParcel<ParcelType>::
-constantProperties::youngsModulus() const
+Foam::KinematicParcel<ParcelType>::constantProperties::youngsModulus() const
 {
     return youngsModulus_;
 }
@@ -248,71 +207,12 @@ constantProperties::youngsModulus() const
 
 template<class ParcelType>
 inline Foam::scalar
-Foam::KinematicParcel<ParcelType>::
-constantProperties::poissonsRatio() const
+Foam::KinematicParcel<ParcelType>::constantProperties::poissonsRatio() const
 {
     return poissonsRatio_;
 }
 
 
-// * * * * * * * * * * * trackData Member Functions  * * * * * * * * * * * * //
-
-template<class ParcelType>
-inline Foam::KinematicCloud<ParcelType>&
-Foam::KinematicParcel<ParcelType>::trackData::cloud()
-{
-    return cloud_;
-}
-
-
-template<class ParcelType>
-inline const Foam::interpolation<Foam::scalar>&
-Foam::KinematicParcel<ParcelType>::trackData::rhoInterp() const
-{
-    return rhoInterp_();
-}
-
-
-template<class ParcelType>
-inline const Foam::interpolation<Foam::vector>&
-Foam::KinematicParcel<ParcelType>::trackData::UInterp() const
-{
-    return UInterp_();
-}
-
-
-template<class ParcelType>
-inline const Foam::interpolation<Foam::scalar>&
-Foam::KinematicParcel<ParcelType>::trackData::muInterp() const
-{
-    return muInterp_();
-}
-
-
-template<class ParcelType>
-inline const Foam::vector&
-Foam::KinematicParcel<ParcelType>::trackData::g() const
-{
-    return g_;
-}
-
-
-template<class ParcelType>
-inline typename Foam::KinematicParcel<ParcelType>::trackData::trackPart
-Foam::KinematicParcel<ParcelType>::trackData::part() const
-{
-    return part_;
-}
-
-
-template<class ParcelType>
-inline typename Foam::KinematicParcel<ParcelType>::trackData::trackPart&
-Foam::KinematicParcel<ParcelType>::trackData::part()
-{
-    return part_;
-}
-
-
 // * * * * * * * KinematicParcel Member Functions  * * * * * * * //
 
 template<class ParcelType>
@@ -437,14 +337,6 @@ inline bool& Foam::KinematicParcel<ParcelType>::active()
 }
 
 
-template<class ParcelType>
-inline const Foam::collisionRecordList&
-Foam::KinematicParcel<ParcelType>::collisionRecords() const
-{
-    return collisionRecords_;
-}
-
-
 template<class ParcelType>
 inline Foam::label& Foam::KinematicParcel<ParcelType>::typeId()
 {
@@ -529,14 +421,6 @@ inline Foam::vector& Foam::KinematicParcel<ParcelType>::UTurb()
 }
 
 
-template<class ParcelType>
-inline Foam::collisionRecordList&
-Foam::KinematicParcel<ParcelType>::collisionRecords()
-{
-    return collisionRecords_;
-}
-
-
 template<class ParcelType>
 inline Foam::scalar Foam::KinematicParcel<ParcelType>::wallImpactDistance
 (
@@ -568,7 +452,7 @@ inline Foam::scalar Foam::KinematicParcel<ParcelType>::massCell
     const label cellI
 ) const
 {
-    return rhoc_*this->cloud().pMesh().cellVolumes()[cellI];
+    return rhoc_*this->mesh().cellVolumes()[cellI];
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index b2b4dd822d..e3ca39aee1 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -32,7 +32,7 @@ License
 
 template<class ParcelType>
 Foam::string Foam::KinematicParcel<ParcelType>::propHeader =
-    Particle<ParcelType>::propHeader
+    ParcelType::propHeader
   + " active"
   + " typeId"
   + " nParticle"
@@ -45,27 +45,19 @@ Foam::string Foam::KinematicParcel<ParcelType>::propHeader =
   + " rho"
   + " age"
   + " tTurb"
-  + " (UTurbx UTurby UTurbz)"
-  + " collisionRecordsPairAccessed"
-  + " collisionRecordsPairOrigProcOfOther"
-  + " collisionRecordsPairOrigIdOfOther"
-  + " (collisionRecordsPairData)"
-  + " collisionRecordsWallAccessed"
-  + " collisionRecordsWallPRel"
-  + " (collisionRecordsWallData)";
-
+  + " (UTurbx UTurby UTurbz)";
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class ParcelType>
 Foam::KinematicParcel<ParcelType>::KinematicParcel
 (
-    const Cloud<ParcelType>& cloud,
+    const polyMesh& mesh,
     Istream& is,
     bool readFields
 )
 :
-    Particle<ParcelType>(cloud, is, readFields),
+    ParcelType(mesh, is, readFields),
     active_(false),
     typeId_(0),
     nParticle_(0.0),
@@ -79,7 +71,6 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
     age_(0.0),
     tTurb_(0.0),
     UTurb_(vector::zero),
-    collisionRecords_(),
     rhoc_(0.0),
     Uc_(vector::zero),
     muc_(0.0)
@@ -101,7 +92,6 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
             age_ = readScalar(is);
             tTurb_ = readScalar(is);
             is >> UTurb_;
-            is >> collisionRecords_;
         }
         else
         {
@@ -122,7 +112,6 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
               + sizeof(tTurb_)
               + sizeof(UTurb_)
             );
-            is  >> collisionRecords_;
         }
     }
 
@@ -130,20 +119,21 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
     is.check
     (
         "KinematicParcel<ParcelType>::KinematicParcel"
-        "(const Cloud<ParcelType>&, Istream&, bool)"
+        "(const polyMesh&, Istream&, bool)"
     );
 }
 
 
 template<class ParcelType>
-void Foam::KinematicParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
+template<class CloudType>
+void Foam::KinematicParcel<ParcelType>::readFields(CloudType& c)
 {
     if (!c.size())
     {
         return;
     }
 
-    Particle<ParcelType>::readFields(c);
+    ParcelType::readFields(c);
 
     IOField<label> active(c.fieldIOobject("active", IOobject::MUST_READ));
     c.checkFieldIOobject(c, active);
@@ -188,61 +178,11 @@ void Foam::KinematicParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
     IOField<vector> UTurb(c.fieldIOobject("UTurb", IOobject::MUST_READ));
     c.checkFieldIOobject(c, UTurb);
 
-    labelFieldCompactIOField collisionRecordsPairAccessed
-    (
-        c.fieldIOobject("collisionRecordsPairAccessed", IOobject::MUST_READ)
-    );
-    c.checkFieldFieldIOobject(c, collisionRecordsPairAccessed);
-
-    labelFieldCompactIOField collisionRecordsPairOrigProcOfOther
-    (
-        c.fieldIOobject
-        (
-            "collisionRecordsPairOrigProcOfOther",
-            IOobject::MUST_READ
-        )
-    );
-    c.checkFieldFieldIOobject(c, collisionRecordsPairOrigProcOfOther);
-
-    labelFieldCompactIOField collisionRecordsPairOrigIdOfOther
-    (
-        c.fieldIOobject
-        (
-            "collisionRecordsPairOrigIdOfOther",
-            IOobject::MUST_READ
-        )
-    );
-    c.checkFieldFieldIOobject(c, collisionRecordsPairOrigProcOfOther);
-
-    pairDataFieldCompactIOField collisionRecordsPairData
-    (
-        c.fieldIOobject("collisionRecordsPairData", IOobject::MUST_READ)
-    );
-    c.checkFieldFieldIOobject(c, collisionRecordsPairData);
-
-    labelFieldCompactIOField collisionRecordsWallAccessed
-    (
-        c.fieldIOobject("collisionRecordsWallAccessed", IOobject::MUST_READ)
-    );
-    c.checkFieldFieldIOobject(c, collisionRecordsWallAccessed);
-
-    vectorFieldCompactIOField collisionRecordsWallPRel
-    (
-        c.fieldIOobject("collisionRecordsWallPRel", IOobject::MUST_READ)
-    );
-    c.checkFieldFieldIOobject(c, collisionRecordsWallPRel);
-
-    wallDataFieldCompactIOField collisionRecordsWallData
-    (
-        c.fieldIOobject("collisionRecordsWallData", IOobject::MUST_READ)
-    );
-    c.checkFieldFieldIOobject(c, collisionRecordsWallData);
-
     label i = 0;
 
-    forAllIter(typename Cloud<ParcelType>, c, iter)
+    forAllIter(typename CloudType, c, iter)
     {
-        ParcelType& p = iter();
+        KinematicParcel<ParcelType>& p = iter();
 
         p.active_ = active[i];
         p.typeId_ = typeId[i];
@@ -256,16 +196,6 @@ void Foam::KinematicParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
         p.age_ = age[i];
         p.tTurb_ = tTurb[i];
         p.UTurb_ = UTurb[i];
-        p.collisionRecords_ = collisionRecordList
-        (
-            collisionRecordsPairAccessed[i],
-            collisionRecordsPairOrigProcOfOther[i],
-            collisionRecordsPairOrigIdOfOther[i],
-            collisionRecordsPairData[i],
-            collisionRecordsWallAccessed[i],
-            collisionRecordsWallPRel[i],
-            collisionRecordsWallData[i]
-        );
 
         i++;
     }
@@ -273,9 +203,10 @@ void Foam::KinematicParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
 
 
 template<class ParcelType>
-void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
+template<class CloudType>
+void Foam::KinematicParcel<ParcelType>::writeFields(const CloudType& c)
 {
-    Particle<ParcelType>::writeFields(c);
+    ParcelType::writeFields(c);
 
     label np =  c.size();
 
@@ -301,49 +232,9 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
     IOField<scalar> tTurb(c.fieldIOobject("tTurb", IOobject::NO_READ), np);
     IOField<vector> UTurb(c.fieldIOobject("UTurb", IOobject::NO_READ), np);
 
-    labelFieldCompactIOField collisionRecordsPairAccessed
-    (
-        c.fieldIOobject("collisionRecordsPairAccessed", IOobject::NO_READ),
-        np
-    );
-    labelFieldCompactIOField collisionRecordsPairOrigProcOfOther
-    (
-        c.fieldIOobject
-        (
-            "collisionRecordsPairOrigProcOfOther",
-            IOobject::NO_READ
-        ),
-        np
-    );
-    labelFieldCompactIOField collisionRecordsPairOrigIdOfOther
-    (
-        c.fieldIOobject("collisionRecordsPairOrigIdOfOther", IOobject::NO_READ),
-        np
-    );
-    pairDataFieldCompactIOField collisionRecordsPairData
-    (
-        c.fieldIOobject("collisionRecordsPairData", IOobject::NO_READ),
-        np
-    );
-    labelFieldCompactIOField collisionRecordsWallAccessed
-    (
-        c.fieldIOobject("collisionRecordsWallAccessed", IOobject::NO_READ),
-        np
-    );
-    vectorFieldCompactIOField collisionRecordsWallPRel
-    (
-        c.fieldIOobject("collisionRecordsWallPRel", IOobject::NO_READ),
-        np
-    );
-    wallDataFieldCompactIOField collisionRecordsWallData
-    (
-        c.fieldIOobject("collisionRecordsWallData", IOobject::NO_READ),
-        np
-    );
-
     label i = 0;
 
-    forAllConstIter(typename Cloud<ParcelType>, c, iter)
+    forAllConstIter(typename CloudType, c, iter)
     {
         const KinematicParcel<ParcelType>& p = iter();
 
@@ -360,15 +251,6 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
         age[i] = p.age();
         tTurb[i] = p.tTurb();
         UTurb[i] = p.UTurb();
-        collisionRecordsPairAccessed[i] = p.collisionRecords().pairAccessed();
-        collisionRecordsPairOrigProcOfOther[i] =
-            p.collisionRecords().pairOrigProcOfOther();
-        collisionRecordsPairOrigIdOfOther[i] =
-            p.collisionRecords().pairOrigIdOfOther();
-        collisionRecordsPairData[i] = p.collisionRecords().pairData();
-        collisionRecordsWallAccessed[i] = p.collisionRecords().wallAccessed();
-        collisionRecordsWallPRel[i] = p.collisionRecords().wallPRel();
-        collisionRecordsWallData[i] = p.collisionRecords().wallData();
 
         i++;
     }
@@ -386,13 +268,6 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
     age.write();
     tTurb.write();
     UTurb.write();
-    collisionRecordsPairAccessed.write();
-    collisionRecordsPairOrigProcOfOther.write();
-    collisionRecordsPairOrigIdOfOther.write();
-    collisionRecordsPairData.write();
-    collisionRecordsWallAccessed.write();
-    collisionRecordsWallPRel.write();
-    collisionRecordsWallData.write();
 }
 
 
@@ -407,7 +282,7 @@ Foam::Ostream& Foam::operator<<
 {
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const Particle<ParcelType>&>(p)
+        os  << static_cast<const ParcelType&>(p)
             << token::SPACE << p.active()
             << token::SPACE << p.typeId()
             << token::SPACE << p.nParticle()
@@ -420,12 +295,11 @@ Foam::Ostream& Foam::operator<<
             << token::SPACE << p.rho()
             << token::SPACE << p.age()
             << token::SPACE << p.tTurb()
-            << token::SPACE << p.UTurb()
-            << token::SPACE << p.collisionRecords();
+            << token::SPACE << p.UTurb();
     }
     else
     {
-        os  << static_cast<const Particle<ParcelType>&>(p);
+        os  << static_cast<const ParcelType&>(p);
         os.write
         (
             reinterpret_cast<const char*>(&p.active_),
@@ -443,7 +317,6 @@ Foam::Ostream& Foam::operator<<
           + sizeof(p.tTurb())
           + sizeof(p.UTurb())
         );
-        os  << p.collisionRecords();
     }
 
     // Check state of Ostream
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelTrackingDataI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelTrackingDataI.H
new file mode 100644
index 0000000000..bb61fc2b99
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelTrackingDataI.H
@@ -0,0 +1,120 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+template<class ParcelType>
+template<class CloudType>
+inline Foam::KinematicParcel<ParcelType>::TrackingData<CloudType>::TrackingData
+(
+    CloudType& cloud,
+    trackPart part
+)
+:
+    ParcelType::template TrackingData<CloudType>(cloud),
+    rhoInterp_
+    (
+        interpolation<scalar>::New
+        (
+            cloud.solution().interpolationSchemes(),
+            cloud.rho()
+        )
+    ),
+    UInterp_
+    (
+        interpolation<vector>::New
+        (
+            cloud.solution().interpolationSchemes(),
+            cloud.U()
+        )
+    ),
+    muInterp_
+    (
+        interpolation<scalar>::New
+        (
+            cloud.solution().interpolationSchemes(),
+            cloud.mu()
+        )
+    ),
+    g_(cloud.g().value()),
+    part_(part)
+{}
+
+
+template<class ParcelType>
+template<class CloudType>
+inline const Foam::interpolation<Foam::scalar>&
+Foam::KinematicParcel<ParcelType>::TrackingData<CloudType>::rhoInterp() const
+{
+    return rhoInterp_();
+}
+
+
+template<class ParcelType>
+template<class CloudType>
+inline const Foam::interpolation<Foam::vector>&
+Foam::KinematicParcel<ParcelType>::TrackingData<CloudType>::UInterp() const
+{
+    return UInterp_();
+}
+
+
+template<class ParcelType>
+template<class CloudType>
+inline const Foam::interpolation<Foam::scalar>&
+Foam::KinematicParcel<ParcelType>::TrackingData<CloudType>::muInterp() const
+{
+    return muInterp_();
+}
+
+
+template<class ParcelType>
+template<class CloudType>
+inline const Foam::vector&
+Foam::KinematicParcel<ParcelType>::TrackingData<CloudType>::g() const
+{
+    return g_;
+}
+
+
+template<class ParcelType>
+template<class CloudType>
+inline typename Foam::KinematicParcel<ParcelType>::template
+TrackingData<CloudType>::trackPart
+Foam::KinematicParcel<ParcelType>::TrackingData<CloudType>::part() const
+{
+    return part_;
+}
+
+
+template<class ParcelType>
+template<class CloudType>
+inline typename Foam::KinematicParcel<ParcelType>::template
+TrackingData<CloudType>::trackPart&
+Foam::KinematicParcel<ParcelType>::TrackingData<CloudType>::part()
+{
+    return part_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index e610f956b6..fafaeb3ae8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -138,7 +138,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::setCellValues
     const label cellI
 )
 {
-    ReactingParcel<ParcelType>::setCellValues(td, dt, cellI);
+    ParcelType::setCellValues(td, dt, cellI);
 }
 
 
@@ -152,7 +152,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::cellValueSourceCorrection
 )
 {
     // Re-use correction from reacting parcel
-    ReactingParcel<ParcelType>::cellValueSourceCorrection(td, dt, cellI);
+    ParcelType::cellValueSourceCorrection(td, dt, cellI);
 }
 
 
@@ -165,9 +165,6 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     const label cellI
 )
 {
-    typedef typename ReactingParcel<ParcelType>::trackData::cloudType cloudType;
-    const CompositionModel<cloudType>& composition = td.cloud().composition();
-
     // Define local properties at beginning of timestep
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     const scalar np0 = this->nParticle_;
@@ -181,16 +178,15 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     const scalar pc = this->pc_;
 
     const scalarField& YMix = this->Y_;
-    const label idG = composition.idGas();
-    const label idL = composition.idLiquid();
-    const label idS = composition.idSolid();
+    const label idG = td.cloud().composition().idGas();
+    const label idL = td.cloud().composition().idLiquid();
+    const label idS = td.cloud().composition().idSolid();
 
 
     // Calc surface values
     // ~~~~~~~~~~~~~~~~~~~
     scalar Ts, rhos, mus, Prs, kappas;
-    ThermoParcel<ParcelType>::
-        calcSurfaceValues(td, cellI, T0, Ts, rhos, mus, Prs, kappas);
+    this->calcSurfaceValues(td, cellI, T0, Ts, rhos, mus, Prs, kappas);
 
     // Reynolds number
     scalar Res = this->Re(U0, d0, rhos, mus);
@@ -225,7 +221,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     scalar NCpW = 0.0;
 
     // Surface concentrations of emitted species
-    scalarField Cs(composition.carrier().species().size(), 0.0);
+    scalarField Cs(td.cloud().composition().carrier().species().size(), 0.0);
 
     // Calc mass and enthalpy transfer due to phase change
     this->calcPhaseChange
@@ -287,7 +283,11 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     scalarField dMassSRGas(YGas_.size(), 0.0);
     scalarField dMassSRLiquid(YLiquid_.size(), 0.0);
     scalarField dMassSRSolid(YSolid_.size(), 0.0);
-    scalarField dMassSRCarrier(composition.carrier().species().size(), 0.0);
+    scalarField dMassSRCarrier
+    (
+        td.cloud().composition().carrier().species().size(),
+        0.0
+    );
 
     // Clac mass and enthalpy transfer due to surface reactions
     calcSurfaceReactions
@@ -353,7 +353,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     // ~~~~~~
 
     // Calculate new particle velocity
-    scalar Cud = 0;
+    scalar Spu = 0;
     vector U1 =
         this->calcVelocity
         (
@@ -368,11 +368,9 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             mass0,
             Su,
             dUTrans,
-            Cud
+            Spu
         );
 
-    dUTrans += 0.5*(mass0 - mass1)*(U0 + U1);
-
 
     // Accumulate carrier phase source terms
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -382,40 +380,43 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
         // Transfer mass lost from particle to carrier mass source
         forAll(YGas_, i)
         {
-            label gid = composition.localToGlobalCarrierId(GAS, i);
+            label gid = td.cloud().composition().localToGlobalCarrierId(GAS, i);
             td.cloud().rhoTrans(gid)[cellI] += np0*dMassGas[i];
             td.cloud().hsTrans()[cellI] +=
-                np0*dMassGas[i]*composition.carrier().Hs(gid, T0);
+                np0*dMassGas[i]*td.cloud().composition().carrier().Hs(gid, T0);
         }
         forAll(YLiquid_, i)
         {
-            label gid = composition.localToGlobalCarrierId(LIQ, i);
+            label gid = td.cloud().composition().localToGlobalCarrierId(LIQ, i);
             td.cloud().rhoTrans(gid)[cellI] += np0*dMassLiquid[i];
             td.cloud().hsTrans()[cellI] +=
-                np0*dMassLiquid[i]*composition.carrier().Hs(gid, T0);
+                np0*dMassLiquid[i]
+               *td.cloud().composition().carrier().Hs(gid, T0);
         }
 /*
         // No mapping between solid components and carrier phase
         forAll(YSolid_, i)
         {
-            label gid = composition.localToGlobalCarrierId(SLD, i);
+            label gid = td.cloud().composition().localToGlobalCarrierId(SLD, i);
             td.cloud().rhoTrans(gid)[cellI] += np0*dMassSolid[i];
             td.cloud().hsTrans()[cellI] +=
-                np0*dMassSolid[i]*composition.carrier().Hs(gid, T0);
+                np0*dMassSolid[i]
+               *td.cloud().composition().carrier().Hs(gid, T0);
         }
 */
         forAll(dMassSRCarrier, i)
         {
             td.cloud().rhoTrans(i)[cellI] += np0*dMassSRCarrier[i];
             td.cloud().hsTrans()[cellI] +=
-                np0*dMassSRCarrier[i]*composition.carrier().Hs(i, T0);
+                np0*dMassSRCarrier[i]
+               *td.cloud().composition().carrier().Hs(i, T0);
         }
 
         // Update momentum transfer
         td.cloud().UTrans()[cellI] += np0*dUTrans;
 
         // Update momentum transfer coefficient
-        td.cloud().UCoeff()[cellI] += np0*0.5*(mass0 + mass1)*Cud;
+        td.cloud().UCoeff()[cellI] += np0*Spu;
 
         // Update sensible enthalpy transfer
         td.cloud().hsTrans()[cellI] += np0*dhsTrans;
@@ -437,12 +438,14 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             // Absorb parcel into carrier phase
             forAll(YGas_, i)
             {
-                label gid = composition.localToGlobalCarrierId(GAS, i);
+                label gid =
+                    td.cloud().composition().localToGlobalCarrierId(GAS, i);
                 td.cloud().rhoTrans(gid)[cellI] += np0*mass1*YMix[GAS]*YGas_[i];
             }
             forAll(YLiquid_, i)
             {
-                label gid = composition.localToGlobalCarrierId(LIQ, i);
+                label gid =
+                    td.cloud().composition().localToGlobalCarrierId(LIQ, i);
                 td.cloud().rhoTrans(gid)[cellI] +=
                     np0*mass1*YMix[LIQ]*YLiquid_[i];
             }
@@ -450,7 +453,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             // No mapping between solid components and carrier phase
             forAll(YSolid_, i)
             {
-                label gid = composition.localToGlobalCarrierId(SLD, i);
+                label gid =
+                    td.cloud().composition().localToGlobalCarrierId(SLD, i);
                 td.cloud().rhoTrans(gid)[cellI] +=
                     np0*mass1*YMix[SLD]*YSolid_[i];
             }
@@ -515,9 +519,6 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
         return;
     }
 
-    typedef typename ReactingParcel<ParcelType>::trackData::cloudType cloudType;
-    const CompositionModel<cloudType>& composition = td.cloud().composition();
-
     // Total mass of volatiles evolved
     td.cloud().devolatilisation().calculate
     (
@@ -545,9 +546,10 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
         // Note: hardcoded gaseous diffusivities for now
         // TODO: add to carrier thermo
         const scalar beta = sqr(cbrt(15.0) + cbrt(15.0));
-        const label id = composition.localToGlobalCarrierId(GAS, i);
-        const scalar Cp = composition.carrier().Cp(id, Ts);
-        const scalar W = composition.carrier().W(id);
+        const label id =
+            td.cloud().composition().localToGlobalCarrierId(GAS, i);
+        const scalar Cp = td.cloud().composition().carrier().Cp(id, Ts);
+        const scalar W = td.cloud().composition().carrier().W(id);
         const scalar Ni = dMassDV[i]/(this->areaS(d)*dt*W);
 
         // Dab calc'd using API vapour mass diffusivity function
@@ -637,7 +639,7 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
     const ReactingMultiphaseParcel<ParcelType>& p
 )
 :
-    ReactingParcel<ParcelType>(p),
+    ParcelType(p),
     YGas_(p.YGas_),
     YLiquid_(p.YLiquid_),
     YSolid_(p.YSolid_)
@@ -648,10 +650,10 @@ template<class ParcelType>
 Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
 (
     const ReactingMultiphaseParcel<ParcelType>& p,
-    const ReactingMultiphaseCloud<ParcelType>& c
+    const polyMesh& mesh
 )
 :
-    ReactingParcel<ParcelType>(p, c),
+    ParcelType(p, mesh),
     YGas_(p.YGas_),
     YLiquid_(p.YLiquid_),
     YSolid_(p.YSolid_)
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index 04b6525f66..cbb6bb8ead 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -63,7 +63,7 @@ Ostream& operator<<
 template<class ParcelType>
 class ReactingMultiphaseParcel
 :
-    public ReactingParcel<ParcelType>
+    public ParcelType
 {
 public:
 
@@ -77,7 +77,7 @@ public:
     //- Class to hold reacting multiphase particle constant properties
     class constantProperties
     :
-        public ReactingParcel<ParcelType>::constantProperties
+        public ParcelType::constantProperties
     {
         // Private data
 
@@ -118,37 +118,6 @@ public:
     };
 
 
-    //- Class used to pass reacting tracking data to the trackToFace function
-    class trackData
-    :
-        public ReactingParcel<ParcelType>::trackData
-    {
-        // Private data
-
-            //- Reference to the cloud containing this particle
-            ReactingMultiphaseCloud<ParcelType>& cloud_;
-
-
-    public:
-
-        // Constructors
-
-            //- Construct from components
-            inline trackData
-            (
-                ReactingMultiphaseCloud<ParcelType>& cloud,
-                typename ReactingParcel<ParcelType>::trackData::trackPart
-                    part = ReactingParcel<ParcelType>::trackData::tpLinearTrack
-             );
-
-
-        // Member functions
-
-            //- Return access to the owner cloud
-            inline ReactingMultiphaseCloud<ParcelType>& cloud();
-    };
-
-
 private:
 
     // Private Member Functions
@@ -277,16 +246,13 @@ public:
         TypeName("ReactingMultiphaseParcel");
 
 
-    friend class Cloud<ParcelType>;
-
-
     // Constructors
 
         //- Construct from owner, position, and cloud owner
         //  Other properties initialised as null
         inline ReactingMultiphaseParcel
         (
-            ReactingMultiphaseCloud<ParcelType>& owner,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             const label tetFaceI,
@@ -297,7 +263,7 @@ public:
         //- Construct from components
         inline ReactingMultiphaseParcel
         (
-            ReactingMultiphaseCloud<ParcelType>& owner,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             const label tetFaceI,
@@ -320,7 +286,7 @@ public:
         //- Construct from Istream
         ReactingMultiphaseParcel
         (
-            const Cloud<ParcelType>& c,
+            const polyMesh& mesh,
             Istream& is,
             bool readFields = true
         );
@@ -332,34 +298,46 @@ public:
         ReactingMultiphaseParcel
         (
             const ReactingMultiphaseParcel& p,
-            const ReactingMultiphaseCloud<ParcelType>& c
+            const polyMesh& mesh
         );
 
         //- Construct and return a (basic particle) clone
-        virtual autoPtr<Particle<ParcelType> > clone() const
+        virtual autoPtr<particle> clone() const
         {
-            return autoPtr<Particle<ParcelType> >
-            (
-                new ReactingMultiphaseParcel(*this)
-            );
+            return autoPtr<particle>(new ReactingMultiphaseParcel(*this));
         }
 
         //- Construct and return a (basic particle) clone
-        virtual autoPtr<Particle<ParcelType> > clone
-        (
-            const Cloud<ParcelType>& c
-        ) const
+        virtual autoPtr<particle> clone(const polyMesh& mesh) const
         {
-            return autoPtr<Particle<ParcelType> >
-            (
-                new ReactingMultiphaseParcel
-                (
-                    *this,
-                    static_cast<const ReactingMultiphaseCloud<ParcelType>&>(c)
-                )
-            );
+            return autoPtr<particle>(new ReactingMultiphaseParcel(*this, mesh));
         }
 
+        //- Factory class to read-construct particles used for
+        //  parallel transfer
+        class iNew
+        {
+            const polyMesh& mesh_;
+
+        public:
+
+            iNew(const polyMesh& mesh)
+            :
+                mesh_(mesh)
+            {}
+
+            autoPtr<ReactingMultiphaseParcel<ParcelType> > operator()
+            (
+                Istream& is
+            ) const
+            {
+                return autoPtr<ReactingMultiphaseParcel<ParcelType> >
+                (
+                    new ReactingMultiphaseParcel<ParcelType>(mesh_, is, true)
+                );
+            }
+        };
+
 
     // Member Functions
 
@@ -426,10 +404,28 @@ public:
         // I-O
 
             //- Read
-            static void readFields(Cloud<ParcelType>& c);
+            template<class CloudType, class CompositionType>
+            static void readFields
+            (
+                CloudType& c,
+                const CompositionType& compModel
+            );
+
+            //- Read - no composition
+            template<class CloudType>
+            static void readFields(CloudType& c);
 
             //- Write
-            static void writeFields(const Cloud<ParcelType>& c);
+            template<class CloudType, class CompositionType>
+            static void writeFields
+            (
+                const CloudType& c,
+                const CompositionType& compModel
+            );
+
+            //- Read - composition supplied
+            template<class CloudType>
+            static void writeFields(const CloudType& c);
 
 
     // Ostream Operator
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
index cc574ef5a3..48ef87864e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -30,7 +30,7 @@ inline
 Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
 constantProperties()
 :
-    ReactingParcel<ParcelType>::constantProperties(),
+    ParcelType::constantProperties(),
     LDevol_(0.0),
     hRetentionCoeff_(0.0)
 {}
@@ -44,7 +44,7 @@ constantProperties
     const constantProperties& cp
 )
 :
-    ReactingParcel<ParcelType>::constantProperties(cp),
+    ParcelType::constantProperties(cp),
     LDevol_(cp.LDevol_),
     hRetentionCoeff_(cp.hRetentionCoeff_)
 {}
@@ -58,7 +58,7 @@ constantProperties
     const bool readFields
 )
 :
-    ReactingParcel<ParcelType>::constantProperties(parentDict, readFields),
+    ParcelType::constantProperties(parentDict, readFields),
     LDevol_(0.0),
     hRetentionCoeff_(0.0)
 {
@@ -82,29 +82,17 @@ constantProperties
 }
 
 
-template<class ParcelType>
-inline Foam::ReactingMultiphaseParcel<ParcelType>::trackData::trackData
-(
-    ReactingMultiphaseCloud<ParcelType>& cloud,
-    typename ReactingParcel<ParcelType>::trackData::trackPart part
-)
-:
-    ReactingParcel<ParcelType>::trackData(cloud, part),
-    cloud_(cloud)
-{}
-
-
 template<class ParcelType>
 inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
 (
-    ReactingMultiphaseCloud<ParcelType>& owner,
+    const polyMesh& mesh,
     const vector& position,
     const label cellI,
     const label tetFaceI,
     const label tetPtI
 )
 :
-    ReactingParcel<ParcelType>(owner, position, cellI, tetFaceI, tetPtI),
+    ParcelType(mesh, position, cellI, tetFaceI, tetPtI),
     YGas_(0),
     YLiquid_(0),
     YSolid_(0),
@@ -115,7 +103,7 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
 template<class ParcelType>
 inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
 (
-    ReactingMultiphaseCloud<ParcelType>& owner,
+    const polyMesh& mesh,
     const vector& position,
     const label cellI,
     const label tetFaceI,
@@ -135,9 +123,9 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
     const constantProperties& constProps
 )
 :
-    ReactingParcel<ParcelType>
+    ParcelType
     (
-        owner,
+        mesh,
         position,
         cellI,
         tetFaceI,
@@ -179,16 +167,6 @@ hRetentionCoeff() const
 }
 
 
-// * * * * * * * * * * * trackData Member Functions  * * * * * * * * * * * * //
-
-template<class ParcelType>
-inline Foam::ReactingMultiphaseCloud<ParcelType>&
-Foam::ReactingMultiphaseParcel<ParcelType>::trackData::cloud()
-{
-    return cloud_;
-}
-
-
 // * * * * * * * * * * ThermoParcel Member Functions * * * * * * * * * * * * //
 
 template<class ParcelType>
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index d0e8e130d4..7f5eb1cd3b 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 
 template<class ParcelType>
 Foam::string Foam::ReactingMultiphaseParcel<ParcelType>::propHeader =
-    ReactingParcel<ParcelType>::propHeader
+    ParcelType::propHeader
   + " nGas(Y1..YN)"
   + " nLiquid(Y1..YN)"
   + " nSolid(Y1..YN)";
@@ -41,12 +41,12 @@ Foam::string Foam::ReactingMultiphaseParcel<ParcelType>::propHeader =
 template<class ParcelType>
 Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
 (
-    const Cloud<ParcelType>& cloud,
+    const polyMesh& mesh,
     Istream& is,
     bool readFields
 )
 :
-    ReactingParcel<ParcelType>(cloud, is, readFields),
+    ParcelType(mesh, is, readFields),
     YGas_(0),
     YLiquid_(0),
     YSolid_(0),
@@ -54,21 +54,15 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
 {
     if (readFields)
     {
-        const ReactingMultiphaseCloud<ParcelType>& cR =
-            dynamic_cast<const ReactingMultiphaseCloud<ParcelType>&>(cloud);
+        DynamicList<scalar> Yg;
+        DynamicList<scalar> Yl;
+        DynamicList<scalar> Ys;
 
-        const label idGas = cR.composition().idGas();
-        const label nGas = cR.composition().componentNames(idGas).size();
-        const label idLiquid = cR.composition().idLiquid();
-        const label nLiquid = cR.composition().componentNames(idLiquid).size();
-        const label idSolid = cR.composition().idGas();
-        const label nSolid = cR.composition().componentNames(idSolid).size();
+        is >> Yg >> Yl >> Ys;
 
-        YGas_.setSize(nGas);
-        YLiquid_.setSize(nLiquid);
-        YSolid_.setSize(nSolid);
-
-        is >> YGas_ >> YLiquid_ >> YSolid_;
+        YGas_.transfer(Yg);
+        YLiquid_.transfer(Yl);
+        YSolid_.transfer(Ys);
 
         // scale the mass fractions
         const scalarField& YMix = this->Y_;
@@ -82,7 +76,7 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
     (
         "ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel"
         "("
-            "const Cloud<ParcelType>&, "
+            "const polyMesh&, "
             "Istream&, "
             "bool"
         ")"
@@ -91,32 +85,44 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
 
 
 template<class ParcelType>
-void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
-(
-    Cloud<ParcelType>& cIn
-)
+template<class CloudType>
+void Foam::ReactingMultiphaseParcel<ParcelType>::readFields(CloudType& c)
 {
-    if (!cIn.size())
+    if (!c.size())
     {
         return;
     }
 
-    ReactingMultiphaseCloud<ParcelType>& c =
-        dynamic_cast<ReactingMultiphaseCloud<ParcelType>&>(cIn);
+    ParcelType::readFields(c);
+}
 
-    ReactingParcel<ParcelType>::readFields(c);
+
+template<class ParcelType>
+template<class CloudType, class CompositionType>
+void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
+(
+    CloudType& c,
+    const CompositionType& compModel
+)
+{
+    if (!c.size())
+    {
+        return;
+    }
+
+    ParcelType::readFields(c, compModel);
 
     // Get names and sizes for each Y...
-    const label idGas = c.composition().idGas();
-    const wordList& gasNames = c.composition().componentNames(idGas);
-    const label idLiquid = c.composition().idLiquid();
-    const wordList& liquidNames = c.composition().componentNames(idLiquid);
-    const label idSolid = c.composition().idSolid();
-    const wordList& solidNames = c.composition().componentNames(idSolid);
-    const wordList& stateLabels = c.composition().stateLabels();
+    const label idGas = compModel.idGas();
+    const wordList& gasNames = compModel.componentNames(idGas);
+    const label idLiquid = compModel.idLiquid();
+    const wordList& liquidNames = compModel.componentNames(idLiquid);
+    const label idSolid = compModel.idSolid();
+    const wordList& solidNames = compModel.componentNames(idSolid);
+    const wordList& stateLabels = compModel.stateLabels();
 
     // Set storage for each Y... for each parcel
-    forAllIter(typename Cloud<ParcelType>, c, iter)
+    forAllIter(typename Cloud<ReactingMultiphaseParcel<ParcelType> >, c, iter)
     {
         ReactingMultiphaseParcel<ParcelType>& p = iter();
         p.YGas_.setSize(gasNames.size(), 0.0);
@@ -137,7 +143,12 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
         );
 
         label i = 0;
-        forAllIter(typename Cloud<ParcelType>, c, iter)
+        forAllIter
+        (
+            typename Cloud<ReactingMultiphaseParcel<ParcelType> >,
+            c,
+            iter
+        )
         {
             ReactingMultiphaseParcel<ParcelType>& p = iter();
             p.YGas_[j] = YGas[i++]/(p.Y()[GAS] + ROOTVSMALL);
@@ -156,7 +167,12 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
         );
 
         label i = 0;
-        forAllIter(typename Cloud<ParcelType>, c, iter)
+        forAllIter
+        (
+            typename Cloud<ReactingMultiphaseParcel<ParcelType> >,
+            c,
+            iter
+        )
         {
             ReactingMultiphaseParcel<ParcelType>& p = iter();
             p.YLiquid_[j] = YLiquid[i++]/(p.Y()[LIQ] + ROOTVSMALL);
@@ -175,7 +191,12 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
         );
 
         label i = 0;
-        forAllIter(typename Cloud<ParcelType>, c, iter)
+        forAllIter
+        (
+            typename Cloud<ReactingMultiphaseParcel<ParcelType> >,
+            c,
+            iter
+        )
         {
             ReactingMultiphaseParcel<ParcelType>& p = iter();
             p.YSolid_[j] = YSolid[i++]/(p.Y()[SLD] + ROOTVSMALL);
@@ -185,25 +206,32 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
 
 
 template<class ParcelType>
+template<class CloudType>
+void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields(const CloudType& c)
+{
+    ParcelType::writeFields(c);
+}
+
+
+template<class ParcelType>
+template<class CloudType, class CompositionType>
 void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
 (
-    const Cloud<ParcelType>& cIn
+    const CloudType& c,
+    const CompositionType& compModel
 )
 {
-    const ReactingMultiphaseCloud<ParcelType>& c =
-        dynamic_cast<const ReactingMultiphaseCloud<ParcelType>&>(cIn);
+    ParcelType::writeFields(c, compModel);
 
-    ReactingParcel<ParcelType>::writeFields(c);
-
-    label np =  c.size();
+    label np = c.size();
 
     // Write the composition fractions
     if (np > 0)
     {
-        const wordList& stateLabels = c.composition().stateLabels();
+        const wordList& stateLabels = compModel.stateLabels();
 
-        const label idGas = c.composition().idGas();
-        const wordList& gasNames = c.composition().componentNames(idGas);
+        const label idGas = compModel.idGas();
+        const wordList& gasNames = compModel.componentNames(idGas);
         forAll(gasNames, j)
         {
             IOField<scalar> YGas
@@ -217,7 +245,12 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
             );
 
             label i = 0;
-            forAllConstIter(typename Cloud<ParcelType>, c, iter)
+            forAllConstIter
+            (
+                typename Cloud<ReactingMultiphaseParcel<ParcelType> >,
+                c,
+                iter
+            )
             {
                 const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
                 YGas[i++] = p0.YGas()[j]*p0.Y()[GAS];
@@ -226,8 +259,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
             YGas.write();
         }
 
-        const label idLiquid = c.composition().idLiquid();
-        const wordList& liquidNames = c.composition().componentNames(idLiquid);
+        const label idLiquid = compModel.idLiquid();
+        const wordList& liquidNames = compModel.componentNames(idLiquid);
         forAll(liquidNames, j)
         {
             IOField<scalar> YLiquid
@@ -241,7 +274,12 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
             );
 
             label i = 0;
-            forAllConstIter(typename Cloud<ParcelType>, c, iter)
+            forAllConstIter
+            (
+                typename Cloud<ReactingMultiphaseParcel<ParcelType> >,
+                c,
+                iter
+            )
             {
                 const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
                 YLiquid[i++] = p0.YLiquid()[j]*p0.Y()[LIQ];
@@ -250,8 +288,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
             YLiquid.write();
         }
 
-        const label idSolid = c.composition().idSolid();
-        const wordList& solidNames = c.composition().componentNames(idSolid);
+        const label idSolid = compModel.idSolid();
+        const wordList& solidNames = compModel.componentNames(idSolid);
         forAll(solidNames, j)
         {
             IOField<scalar> YSolid
@@ -265,7 +303,12 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
             );
 
             label i = 0;
-            forAllConstIter(typename Cloud<ParcelType>, c, iter)
+            forAllConstIter
+            (
+                typename Cloud<ReactingMultiphaseParcel<ParcelType> >,
+                c,
+                iter
+            )
             {
                 const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
                 YSolid[i++] = p0.YSolid()[j]*p0.Y()[SLD];
@@ -291,14 +334,14 @@ Foam::Ostream& Foam::operator<<
     scalarField YSolidLoc(p.YSolid()*p.Y()[2]);
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const ReactingParcel<ParcelType>&>(p)
+        os  << static_cast<const ParcelType&>(p)
             << token::SPACE << YGasLoc
             << token::SPACE << YLiquidLoc
             << token::SPACE << YSolidLoc;
     }
     else
     {
-        os  << static_cast<const ReactingParcel<ParcelType>&>(p);
+        os  << static_cast<const ParcelType&>(p);
         os  << YGasLoc << YLiquidLoc << YSolidLoc;
     }
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index c8e625b919..2e893319ad 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -40,7 +40,7 @@ void Foam::ReactingParcel<ParcelType>::setCellValues
     const label cellI
 )
 {
-    ThermoParcel<ParcelType>::setCellValues(td, dt, cellI);
+    ParcelType::setCellValues(td, dt, cellI);
 
     pc_ = td.pInterp().interpolate
     (
@@ -252,9 +252,6 @@ void Foam::ReactingParcel<ParcelType>::calc
     const label cellI
 )
 {
-    typedef typename ReactingParcel<ParcelType>::trackData::cloudType cloudType;
-    const CompositionModel<cloudType>& composition = td.cloud().composition();
-
     // Define local properties at beginning of time step
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     const scalar np0 = this->nParticle_;
@@ -304,7 +301,7 @@ void Foam::ReactingParcel<ParcelType>::calc
     scalar NCpW = 0.0;
 
     // Surface concentrations of emitted species
-    scalarField Cs(composition.carrier().species().size(), 0.0);
+    scalarField Cs(td.cloud().composition().carrier().species().size(), 0.0);
 
     // Calc mass and enthalpy transfer due to phase change
     calcPhaseChange
@@ -365,7 +362,7 @@ void Foam::ReactingParcel<ParcelType>::calc
     // ~~~~~~
 
     // Calculate new particle velocity
-    scalar Cud = 0.0;
+    scalar Spu = 0.0;
     vector U1 =
         this->calcVelocity
         (
@@ -380,7 +377,7 @@ void Foam::ReactingParcel<ParcelType>::calc
             mass0,
             Su,
             dUTrans,
-            Cud
+            Spu
         );
 
     dUTrans += 0.5*(mass0 - mass1)*(U0 + U1);
@@ -392,17 +389,17 @@ void Foam::ReactingParcel<ParcelType>::calc
         // Transfer mass lost from particle to carrier mass source
         forAll(dMassPC, i)
         {
-            label gid = composition.localToGlobalCarrierId(0, i);
+            label gid = td.cloud().composition().localToGlobalCarrierId(0, i);
             td.cloud().rhoTrans(gid)[cellI] += np0*dMassPC[i];
             td.cloud().hsTrans()[cellI] +=
-                np0*dMassPC[i]*composition.carrier().Hs(gid, T0);
+                np0*dMassPC[i]*td.cloud().composition().carrier().Hs(gid, T0);
         }
 
         // Update momentum transfer
         td.cloud().UTrans()[cellI] += np0*dUTrans;
 
         // Update momentum transfer coefficient
-        td.cloud().UCoeff()[cellI] += np0*0.5*(mass0 + mass1)*Cud;
+        td.cloud().UCoeff()[cellI] += np0*Spu;
 
         // Update sensible enthalpy transfer
         td.cloud().hsTrans()[cellI] += np0*dhsTrans;
@@ -423,12 +420,13 @@ void Foam::ReactingParcel<ParcelType>::calc
             // Absorb parcel into carrier phase
             forAll(Y_, i)
             {
-                label gid = composition.localToGlobalCarrierId(0, i);
+                label gid =
+                    td.cloud().composition().localToGlobalCarrierId(0, i);
                 td.cloud().rhoTrans(gid)[cellI] += np0*mass1*Y_[i];
             }
             td.cloud().UTrans()[cellI] += np0*mass1*U1;
             td.cloud().hsTrans()[cellI] +=
-                np0*mass1*composition.H(0, Y_, pc_, T1);
+                np0*mass1*td.cloud().composition().H(0, Y_, pc_, T1);
         }
     }
 
@@ -438,7 +436,7 @@ void Foam::ReactingParcel<ParcelType>::calc
 
     else
     {
-        this->Cp_ = composition.Cp(0, Y_, pc_, T1);
+        this->Cp_ = td.cloud().composition().Cp(0, Y_, pc_, T1);
         this->T_ = T1;
         this->U_ = U1;
 
@@ -478,11 +476,6 @@ void Foam::ReactingParcel<ParcelType>::calcPhaseChange
     scalarField& Cs
 )
 {
-    typedef typename ReactingParcel<ParcelType>::trackData::cloudType cloudType;
-    typedef PhaseChangeModel<cloudType> phaseChangeModelType;
-    const CompositionModel<cloudType>& composition = td.cloud().composition();
-
-
     if
     (
         !td.cloud().phaseChange().active()
@@ -520,35 +513,19 @@ void Foam::ReactingParcel<ParcelType>::calcPhaseChange
 
     forAll(YComponents, i)
     {
-        const label idc = composition.localToGlobalCarrierId(idPhase, i);
-        const label idl = composition.globalIds(idPhase)[i];
+        const label idc =
+            td.cloud().composition().localToGlobalCarrierId(idPhase, i);
+        const label idl = td.cloud().composition().globalIds(idPhase)[i];
 
-        // Calculate enthalpy transfer
-        if
-        (
-            td.cloud().phaseChange().enthalpyTransfer()
-         == phaseChangeModelType::etLatentHeat
-        )
-        {
-            scalar hlp = composition.liquids().properties()[idl].hl(pc_, T);
-
-            Sh -= dMassPC[i]*hlp/dt;
-        }
-        else
-        {
-            // Note: enthalpies of both phases must use the same reference
-            scalar hc = composition.carrier().H(idc, T);
-            scalar hp = composition.liquids().properties()[idl].h(pc_, T);
-
-            Sh -= dMassPC[i]*(hc - hp)/dt;
-        }
+        const scalar dh = td.cloud().phaseChange().dh(idc, idl, pc_, T);
+        Sh -= dMassPC[i]*dh/dt;
 
         // Update particle surface thermo properties
         const scalar Dab =
-            composition.liquids().properties()[idl].D(pc_, Ts, Wc);
+            td.cloud().composition().liquids().properties()[idl].D(pc_, Ts, Wc);
 
-        const scalar Cp = composition.carrier().Cp(idc, Ts);
-        const scalar W = composition.carrier().W(idc);
+        const scalar Cp = td.cloud().composition().carrier().Cp(idc, Ts);
+        const scalar W = td.cloud().composition().carrier().W(idc);
         const scalar Ni = dMassPC[i]/(this->areaS(d)*dt*W);
 
         // Molar flux of species coming from the particle (kmol/m^2/s)
@@ -571,7 +548,7 @@ Foam::ReactingParcel<ParcelType>::ReactingParcel
     const ReactingParcel<ParcelType>& p
 )
 :
-    ThermoParcel<ParcelType>(p),
+    ParcelType(p),
     mass0_(p.mass0_),
     Y_(p.Y_),
     pc_(p.pc_)
@@ -582,10 +559,10 @@ template<class ParcelType>
 Foam::ReactingParcel<ParcelType>::ReactingParcel
 (
     const ReactingParcel<ParcelType>& p,
-    const ReactingCloud<ParcelType>& c
+    const polyMesh& mesh
 )
 :
-    ThermoParcel<ParcelType>(p, c),
+    ParcelType(p, mesh),
     mass0_(p.mass0_),
     Y_(p.Y_),
     pc_(p.pc_)
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index c6caeaa2bd..dc0a9faa9f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -40,7 +40,6 @@ SourceFiles
 
 #include "ThermoParcel.H"
 #include "ReactingCloud.H"
-#include "reactingParcel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -64,15 +63,14 @@ Ostream& operator<<
 template<class ParcelType>
 class ReactingParcel
 :
-    public reactingParcel,
-    public ThermoParcel<ParcelType>
+    public ParcelType
 {
 public:
 
     //- Class to hold reacting particle constant properties
     class constantProperties
     :
-        public ThermoParcel<ParcelType>::constantProperties
+        public ParcelType::constantProperties
     {
         // Private data
 
@@ -120,47 +118,45 @@ public:
 
             //- Return const access to the boiling point
             inline scalar Tbp() const;
-   };
+    };
 
 
-    //- Class used to pass reacting tracking data to the trackToFace function
-    class trackData
+    template<class CloudType>
+    class TrackingData
     :
-        public ThermoParcel<ParcelType>::trackData
+        public ParcelType::template TrackingData<CloudType>
     {
+    private:
 
         // Private data
 
-            //- Reference to the cloud containing this particle
-            ReactingCloud<ParcelType>& cloud_;
+            // Interpolators for continuous phase fields
+
+                //- Interpolator for continuous phase pressure field
+                autoPtr<interpolation<scalar> > pInterp_;
 
-            //- Interpolator for continuous phase pressure field
-            autoPtr<interpolation<scalar> > pInterp_;
 
 
     public:
 
-        typedef ReactingCloud<ParcelType> cloudType;
-
+        typedef typename ParcelType::template TrackingData<CloudType>::trackPart
+            trackPart;
 
         // Constructors
 
             //- Construct from components
-            inline trackData
+            inline TrackingData
             (
-                ReactingCloud<ParcelType>& cloud,
-                typename ThermoParcel<ParcelType>::trackData::trackPart
-                    part = ThermoParcel<ParcelType>::trackData::tpLinearTrack
+                CloudType& cloud,
+                trackPart part = ParcelType::template
+                    TrackingData<CloudType>::tpLinearTrack
             );
 
 
         // Member functions
 
-            //- Return access to the owner cloud
-            inline ReactingCloud<ParcelType>& cloud();
-
-            //- Return const access to the interpolator for continuous
-            //  phase pressure field
+            //- Return const access to the interpolator for continuous phase
+            //  pressure field
             inline const interpolation<scalar>& pInterp() const;
     };
 
@@ -229,16 +225,13 @@ public:
         TypeName("ReactingParcel");
 
 
-    friend class Cloud<ParcelType>;
-
-
     // Constructors
 
         //- Construct from owner, position, and cloud owner
         //  Other properties initialised as null
         inline ReactingParcel
         (
-            ReactingCloud<ParcelType>& owner,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             const label tetFaceI,
@@ -248,7 +241,7 @@ public:
         //- Construct from components
         inline ReactingParcel
         (
-            ReactingCloud<ParcelType>& owner,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             const label tetFaceI,
@@ -268,7 +261,7 @@ public:
         //- Construct from Istream
         ReactingParcel
         (
-            const Cloud<ParcelType>& c,
+            const polyMesh& mesh,
             Istream& is,
             bool readFields = true
         );
@@ -277,37 +270,49 @@ public:
         ReactingParcel
         (
             const ReactingParcel& p,
-            const ReactingCloud<ParcelType>& c
+            const polyMesh& mesh
         );
 
         //- Construct as a copy
         ReactingParcel(const ReactingParcel& p);
 
         //- Construct and return a (basic particle) clone
-        virtual autoPtr<Particle<ParcelType> > clone() const
+        virtual autoPtr<particle> clone() const
         {
-            return autoPtr<Particle<ParcelType> >
-            (
-                new ReactingParcel<ParcelType>(*this)
-            );
+            return autoPtr<particle>(new ReactingParcel<ParcelType>(*this));
         }
 
         //- Construct and return a (basic particle) clone
-        virtual autoPtr<Particle<ParcelType> > clone
-        (
-            const Cloud<ParcelType>& c
-        ) const
+        virtual autoPtr<particle> clone(const polyMesh& mesh) const
         {
-            return autoPtr<Particle<ParcelType> >
+            return autoPtr<particle>
             (
-                new ReactingParcel<ParcelType>
-                (
-                    *this,
-                    static_cast<const ReactingCloud<ParcelType>&>(c)
-                )
+                new ReactingParcel<ParcelType>(*this, mesh)
             );
         }
 
+        //- Factory class to read-construct particles used for
+        //  parallel transfer
+        class iNew
+        {
+            const polyMesh& mesh_;
+
+        public:
+
+            iNew(const polyMesh& mesh)
+            :
+                mesh_(mesh)
+            {}
+
+            autoPtr<ReactingParcel<ParcelType> > operator()(Istream& is) const
+            {
+                return autoPtr<ReactingParcel<ParcelType> >
+                (
+                    new ReactingParcel<ParcelType>(mesh_, is, true)
+                );
+            }
+        };
+
 
     // Member Functions
 
@@ -379,10 +384,28 @@ public:
         // I-O
 
             //- Read
-            static void readFields(Cloud<ParcelType>& c);
+            template<class CloudType, class CompositionType>
+            static void readFields
+            (
+                CloudType& c,
+                const CompositionType& compModel
+            );
+
+            //- Read - no composition
+            template<class CloudType>
+            static void readFields(CloudType& c);
 
             //- Write
-            static void writeFields(const Cloud<ParcelType>& c);
+            template<class CloudType, class CompositionType>
+            static void writeFields
+            (
+                const CloudType& c,
+                const CompositionType& compModel
+            );
+
+            //- Read - composition supplied
+            template<class CloudType>
+            static void writeFields(const CloudType& c);
 
 
     // Ostream Operator
@@ -402,6 +425,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "ReactingParcelI.H"
+#include "ReactingParcelTrackingDataI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index beee351820..a476985107 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -29,7 +29,7 @@ template<class ParcelType>
 inline
 Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties()
 :
-    ThermoParcel<ParcelType>::constantProperties(),
+    ParcelType::constantProperties(),
     pMin_(0.0),
     constantVolume_(false),
     Tvap_(0.0),
@@ -43,7 +43,7 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
     const constantProperties& cp
 )
 :
-    ThermoParcel<ParcelType>::constantProperties(cp),
+    ParcelType::constantProperties(cp),
     pMin_(cp.pMin_),
     constantVolume_(cp.constantVolume_),
     Tvap_(cp.Tvap_),
@@ -58,7 +58,7 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
     const bool readFields
 )
 :
-    ThermoParcel<ParcelType>::constantProperties(parentDict, readFields),
+    ParcelType::constantProperties(parentDict, readFields),
     pMin_(0.0),
     constantVolume_(false),
     Tvap_(0.0),
@@ -74,37 +74,17 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
 }
 
 
-template<class ParcelType>
-inline Foam::ReactingParcel<ParcelType>::trackData::trackData
-(
-    ReactingCloud<ParcelType>& cloud,
-    typename ThermoParcel<ParcelType>::trackData::trackPart part
-)
-:
-    ThermoParcel<ParcelType>::trackData(cloud, part),
-    cloud_(cloud),
-    pInterp_
-    (
-        interpolation<scalar>::New
-        (
-            cloud.solution().interpolationSchemes(),
-            cloud.p()
-        )
-    )
-{}
-
-
 template<class ParcelType>
 inline Foam::ReactingParcel<ParcelType>::ReactingParcel
 (
-    ReactingCloud<ParcelType>& owner,
+    const polyMesh& mesh,
     const vector& position,
     const label cellI,
     const label tetFaceI,
     const label tetPtI
 )
 :
-    ThermoParcel<ParcelType>(owner, position, cellI, tetFaceI, tetPtI),
+    ParcelType(mesh, position, cellI, tetFaceI, tetPtI),
     mass0_(0.0),
     Y_(0),
     pc_(0.0)
@@ -114,7 +94,7 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
 template<class ParcelType>
 inline Foam::ReactingParcel<ParcelType>::ReactingParcel
 (
-    ReactingCloud<ParcelType>& owner,
+    const polyMesh& mesh,
     const vector& position,
     const label cellI,
     const label tetFaceI,
@@ -131,9 +111,9 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
     const constantProperties& constProps
 )
 :
-    ThermoParcel<ParcelType>
+    ParcelType
     (
-        owner,
+        mesh,
         position,
         cellI,
         tetFaceI,
@@ -191,24 +171,6 @@ Foam::ReactingParcel<ParcelType>::constantProperties::Tbp() const
 }
 
 
-// * * * * * * * * * * * trackData Member Functions  * * * * * * * * * * * * //
-
-template<class ParcelType>
-inline Foam::ReactingCloud<ParcelType>&
-Foam::ReactingParcel<ParcelType>::trackData::cloud()
-{
-    return cloud_;
-}
-
-
-template<class ParcelType>
-inline const Foam::interpolation<Foam::scalar>&
-Foam::ReactingParcel<ParcelType>::trackData::pInterp() const
-{
-    return pInterp_();
-}
-
-
 // * * * * * * * * * * ThermoParcel Member Functions * * * * * * * * * * * * //
 
 template<class ParcelType>
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
index cea9098238..b0366c5d78 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
@@ -40,27 +40,23 @@ Foam::string Foam::ReactingParcel<ParcelType>::propHeader =
 template<class ParcelType>
 Foam::ReactingParcel<ParcelType>::ReactingParcel
 (
-    const Cloud<ParcelType>& cloud,
+    const polyMesh& mesh,
     Istream& is,
     bool readFields
 )
 :
-    ThermoParcel<ParcelType>(cloud, is, readFields),
+    ParcelType(mesh, is, readFields),
     mass0_(0.0),
     Y_(0),
     pc_(0.0)
 {
     if (readFields)
     {
-        const ReactingCloud<ParcelType>& cR =
-            dynamic_cast<const ReactingCloud<ParcelType>&>(cloud);
-
-        const label nMixture = cR.composition().phaseTypes().size();
-        Y_.setSize(nMixture);
+        DynamicList<scalar> Ymix;
 
         if (is.format() == IOstream::ASCII)
         {
-            is >> mass0_ >> Y_;
+            is >> mass0_ >> Ymix;
         }
         else
         {
@@ -69,8 +65,10 @@ Foam::ReactingParcel<ParcelType>::ReactingParcel
                 reinterpret_cast<char*>(&mass0_),
               + sizeof(mass0_)
             );
-            is >> Y_;
+            is >> Ymix;
         }
+
+        Y_.transfer(Ymix);
     }
 
     // Check state of Istream
@@ -78,7 +76,7 @@ Foam::ReactingParcel<ParcelType>::ReactingParcel
     (
         "ReactingParcel<ParcelType>::ReactingParcel"
         "("
-            "const Cloud<ParcelType>&, "
+            "const polyMesh&, "
             "Istream&, "
             "bool"
         ")"
@@ -87,40 +85,55 @@ Foam::ReactingParcel<ParcelType>::ReactingParcel
 
 
 template<class ParcelType>
-void Foam::ReactingParcel<ParcelType>::readFields(Cloud<ParcelType>& cIn)
+template<class CloudType>
+void Foam::ReactingParcel<ParcelType>::readFields(CloudType& c)
 {
-    if (!cIn.size())
+    if (!c.size())
     {
         return;
     }
 
-    ReactingCloud<ParcelType>& c =
-        dynamic_cast<ReactingCloud<ParcelType>&>(cIn);
+    ParcelType::readFields(c);
+}
 
-    ThermoParcel<ParcelType>::readFields(c);
+
+template<class ParcelType>
+template<class CloudType, class CompositionType>
+void Foam::ReactingParcel<ParcelType>::readFields
+(
+    CloudType& c,
+    const CompositionType& compModel
+)
+{
+    if (!c.size())
+    {
+        return;
+    }
+
+    ParcelType::readFields(c);
 
     IOField<scalar> mass0(c.fieldIOobject("mass0", IOobject::MUST_READ));
     c.checkFieldIOobject(c, mass0);
 
     label i = 0;
-    forAllIter(typename Cloud<ParcelType>, c, iter)
+    forAllIter(typename Cloud<ReactingParcel<ParcelType> >, c, iter)
     {
         ReactingParcel<ParcelType>& p = iter();
         p.mass0_ = mass0[i++];
     }
 
     // Get names and sizes for each Y...
-    const wordList& phaseTypes = c.composition().phaseTypes();
+    const wordList& phaseTypes = compModel.phaseTypes();
     const label nPhases = phaseTypes.size();
     wordList stateLabels(nPhases, "");
-    if (c.composition().nPhase() == 1)
+    if (compModel.nPhase() == 1)
     {
-        stateLabels = c.composition().stateLabels();
+        stateLabels = compModel.stateLabels();
     }
 
 
     // Set storage for each Y... for each parcel
-    forAllIter(typename Cloud<ParcelType>, c, iter)
+    forAllIter(typename Cloud<ReactingParcel<ParcelType> >, c, iter)
     {
         ReactingParcel<ParcelType>& p = iter();
         p.Y_.setSize(nPhases, 0.0);
@@ -139,7 +152,7 @@ void Foam::ReactingParcel<ParcelType>::readFields(Cloud<ParcelType>& cIn)
         );
 
         label i = 0;
-        forAllIter(typename Cloud<ParcelType>, c, iter)
+        forAllIter(typename Cloud<ReactingParcel<ParcelType> >, c, iter)
         {
             ReactingParcel<ParcelType>& p = iter();
             p.Y_[j] = Y[i++];
@@ -149,15 +162,22 @@ void Foam::ReactingParcel<ParcelType>::readFields(Cloud<ParcelType>& cIn)
 
 
 template<class ParcelType>
+template<class CloudType>
+void Foam::ReactingParcel<ParcelType>::writeFields(const CloudType& c)
+{
+    ParcelType::writeFields(c);
+}
+
+
+template<class ParcelType>
+template<class CloudType, class CompositionType>
 void Foam::ReactingParcel<ParcelType>::writeFields
 (
-    const Cloud<ParcelType>& cIn
+    const CloudType& c,
+    const CompositionType& compModel
 )
 {
-    const ReactingCloud<ParcelType>& c =
-        dynamic_cast<const ReactingCloud<ParcelType>&>(cIn);
-
-    ThermoParcel<ParcelType>::writeFields(c);
+    ParcelType::writeFields(c);
 
     const label np = c.size();
 
@@ -166,7 +186,7 @@ void Foam::ReactingParcel<ParcelType>::writeFields
         IOField<scalar> mass0(c.fieldIOobject("mass0", IOobject::NO_READ), np);
 
         label i = 0;
-        forAllConstIter(typename Cloud<ParcelType>, c, iter)
+        forAllConstIter(typename Cloud<ReactingParcel<ParcelType> >, c, iter)
         {
             const ReactingParcel<ParcelType>& p = iter();
             mass0[i++] = p.mass0_;
@@ -174,11 +194,11 @@ void Foam::ReactingParcel<ParcelType>::writeFields
         mass0.write();
 
         // Write the composition fractions
-        const wordList& phaseTypes = c.composition().phaseTypes();
+        const wordList& phaseTypes = compModel.phaseTypes();
         wordList stateLabels(phaseTypes.size(), "");
-        if (c.composition().nPhase() == 1)
+        if (compModel.nPhase() == 1)
         {
-            stateLabels = c.composition().stateLabels();
+            stateLabels = compModel.stateLabels();
         }
 
         forAll(phaseTypes, j)
@@ -192,12 +212,16 @@ void Foam::ReactingParcel<ParcelType>::writeFields
                 ),
                 np
             );
-
             label i = 0;
-            forAllConstIter(typename Cloud<ParcelType>, c, iter)
+            forAllConstIter
+            (
+                typename Cloud<ReactingParcel<ParcelType> >,
+                c,
+                iter
+            )
             {
-                const ReactingParcel<ParcelType>& p0 = iter();
-                Y[i++] = p0.Y()[j];
+                const ReactingParcel<ParcelType>& p = iter();
+                Y[i++] = p.Y()[j];
             }
 
             Y.write();
@@ -217,13 +241,13 @@ Foam::Ostream& Foam::operator<<
 {
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const ThermoParcel<ParcelType>&>(p)
+        os  << static_cast<const ParcelType&>(p)
             << token::SPACE << p.mass0()
             << token::SPACE << p.Y();
     }
     else
     {
-        os  << static_cast<const ThermoParcel<ParcelType>&>(p);
+        os  << static_cast<const ParcelType&>(p);
         os.write
         (
             reinterpret_cast<const char*>(&p.mass0_),
diff --git a/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelTrackingDataI.H
similarity index 64%
rename from src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.C
rename to src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelTrackingDataI.H
index 9adeb20838..dd49f0284a 100644
--- a/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelTrackingDataI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,26 +23,33 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "reactingParcel.H"
+template<class ParcelType>
+template<class CloudType>
+inline Foam::ReactingParcel<ParcelType>::TrackingData<CloudType>::TrackingData
+(
+    CloudType& cloud,
+    trackPart part
+)
+:
+    ParcelType::template TrackingData<CloudType>(cloud, part),
+    pInterp_
+    (
+        interpolation<scalar>::New
+        (
+            cloud.solution().interpolationSchemes(),
+            cloud.p()
+        )
+    )
+{}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+template<class ParcelType>
+template<class CloudType>
+inline const Foam::interpolation<Foam::scalar>&
+Foam::ReactingParcel<ParcelType>::TrackingData<CloudType>::pInterp() const
 {
-    defineTypeNameAndDebug(reactingParcel, 0);
+    return pInterp_();
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::reactingParcel::reactingParcel()
-{}
-
-
-// * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
-
-Foam::reactingParcel::~reactingParcel()
-{}
-
-
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index 06b6f45cd4..622ef85fcf 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -39,7 +39,7 @@ void Foam::ThermoParcel<ParcelType>::setCellValues
     const label cellI
 )
 {
-    KinematicParcel<ParcelType>::setCellValues(td, dt, cellI);
+    ParcelType::setCellValues(td, dt, cellI);
 
     tetIndices tetIs = this->currentTetIndices();
 
@@ -234,7 +234,7 @@ void Foam::ThermoParcel<ParcelType>::calc
     // ~~~~~~
 
     // Calculate new particle velocity
-    scalar Cud = 0.0;
+    scalar Spu = 0.0;
     vector U1 =
         this->calcVelocity
         (
@@ -249,7 +249,7 @@ void Foam::ThermoParcel<ParcelType>::calc
             mass0,
             Su,
             dUTrans,
-            Cud
+            Spu
         );
 
 
@@ -261,7 +261,7 @@ void Foam::ThermoParcel<ParcelType>::calc
         td.cloud().UTrans()[cellI] += np0*dUTrans;
 
         // Update momentum transfer coefficient
-        td.cloud().UCoeff()[cellI] += np0*mass0*Cud;
+        td.cloud().UCoeff()[cellI] += np0*Spu;
 
         // Update sensible enthalpy transfer
         td.cloud().hsTrans()[cellI] += np0*dhsTrans;
@@ -353,7 +353,7 @@ Foam::ThermoParcel<ParcelType>::ThermoParcel
     const ThermoParcel<ParcelType>& p
 )
 :
-    KinematicParcel<ParcelType>(p),
+    ParcelType(p),
     T_(p.T_),
     Cp_(p.Cp_),
     Tc_(p.Tc_),
@@ -365,10 +365,10 @@ template<class ParcelType>
 Foam::ThermoParcel<ParcelType>::ThermoParcel
 (
     const ThermoParcel<ParcelType>& p,
-    const ThermoCloud<ParcelType>& c
+    const polyMesh& mesh
 )
 :
-    KinematicParcel<ParcelType>(p, c),
+    ParcelType(p, mesh),
     T_(p.T_),
     Cp_(p.Cp_),
     Tc_(p.Tc_),
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index ff74006c10..e47e1da48a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -64,14 +64,14 @@ Ostream& operator<<
 template<class ParcelType>
 class ThermoParcel
 :
-    public KinematicParcel<ParcelType>
+    public ParcelType
 {
 public:
 
     //- Class to hold thermo particle constant properties
     class constantProperties
     :
-        public KinematicParcel<ParcelType>::constantProperties
+        public ParcelType::constantProperties
     {
 
         // Private data
@@ -140,17 +140,15 @@ public:
     };
 
 
-    //- Class used to pass thermo tracking data to the trackToFace function
-    class trackData
+    template<class CloudType>
+    class TrackingData
     :
-        public KinematicParcel<ParcelType>::trackData
+        public ParcelType::template TrackingData<CloudType>
     {
+    private:
 
         // Private data
 
-            //- Reference to the cloud containing this particle
-            ThermoCloud<ParcelType>& cloud_;
-
             //- Local copy of carrier specific heat field
             //  Cp not stored on acrrier thermo, but returned as tmp<...>
             const volScalarField Cp_;
@@ -168,24 +166,25 @@ public:
                 autoPtr<interpolation<scalar> > GInterp_;
 
 
+
     public:
 
+        typedef typename ParcelType::template TrackingData<CloudType>::trackPart
+            trackPart;
+
         // Constructors
 
             //- Construct from components
-            inline trackData
+            inline TrackingData
             (
-                ThermoCloud<ParcelType>& cloud,
-                typename KinematicParcel<ParcelType>::trackData::trackPart
-                    part = KinematicParcel<ParcelType>::trackData::tpLinearTrack
+                CloudType& cloud,
+                trackPart part = ParcelType::template
+                    TrackingData<CloudType>::tpLinearTrack
             );
 
 
         // Member functions
 
-            //- Return access to the owner cloud
-            inline ThermoCloud<ParcelType>& cloud();
-
             //- Return access to the locally stored carrier Cp field
             inline const volScalarField& Cp() const;
 
@@ -259,16 +258,13 @@ public:
         TypeName("ThermoParcel");
 
 
-    friend class Cloud<ParcelType>;
-
-
     // Constructors
 
         //- Construct from owner, position, and cloud owner
         //  Other properties initialised as null
         inline ThermoParcel
         (
-            ThermoCloud<ParcelType>& owner,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             const label tetFaceI,
@@ -278,7 +274,7 @@ public:
         //- Construct from components
         inline ThermoParcel
         (
-            ThermoCloud<ParcelType>& owner,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             const label tetFaceI,
@@ -297,7 +293,7 @@ public:
         //- Construct from Istream
         ThermoParcel
         (
-            const Cloud<ParcelType>& c,
+            const polyMesh& mesh,
             Istream& is,
             bool readFields = true
         );
@@ -306,29 +302,41 @@ public:
         ThermoParcel(const ThermoParcel& p);
 
         //- Construct as a copy
-        ThermoParcel(const ThermoParcel& p, const ThermoCloud<ParcelType>& c);
+        ThermoParcel(const ThermoParcel& p, const polyMesh& mesh);
 
         //- Construct and return a (basic particle) clone
-        virtual autoPtr<Particle<ParcelType> > clone() const
+        virtual autoPtr<particle> clone() const
         {
-            return autoPtr<Particle<ParcelType> >(new ThermoParcel(*this));
+            return autoPtr<particle>(new ThermoParcel(*this));
         }
 
         //- Construct and return a (basic particle) clone
-        virtual autoPtr<Particle<ParcelType> > clone
-        (
-            const Cloud<ParcelType>& c
-        ) const
+        virtual autoPtr<particle> clone(const polyMesh& mesh) const
         {
-            return autoPtr<Particle<ParcelType> >
-            (
-                new ThermoParcel
+            return autoPtr<particle>(new ThermoParcel(*this, mesh));
+        }
+
+        //- Factory class to read-construct particles used for
+        //  parallel transfer
+        class iNew
+        {
+            const polyMesh& mesh_;
+
+        public:
+
+            iNew(const polyMesh& mesh)
+            :
+                mesh_(mesh)
+            {}
+
+            autoPtr<ThermoParcel<ParcelType> > operator()(Istream& is) const
+            {
+                return autoPtr<ThermoParcel<ParcelType> >
                 (
-                    *this,
-                    static_cast<const ThermoCloud<ParcelType>&>(c)
-                )
-            );
-        }
+                    new ThermoParcel<ParcelType>(mesh_, is, true)
+                );
+            }
+        };
 
 
     // Member Functions
@@ -407,10 +415,12 @@ public:
         // I-O
 
             //- Read
-            static void readFields(Cloud<ParcelType>& c);
+            template<class CloudType>
+            static void readFields(CloudType& c);
 
             //- Write
-            static void writeFields(const Cloud<ParcelType>& c);
+            template<class CloudType>
+            static void writeFields(const CloudType& c);
 
 
     // Ostream Operator
@@ -430,6 +440,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "ThermoParcelI.H"
+#include "ThermoParcelTrackingDataI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
index 8a7d37d9ca..d350390a9e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
@@ -28,7 +28,7 @@ License
 template<class ParcelType>
 inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties()
 :
-    KinematicParcel<ParcelType>::constantProperties(),
+    ParcelType::constantProperties(),
     T0_(0.0),
     TMin_(0.0),
     Cp0_(0.0),
@@ -44,7 +44,7 @@ inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties
     const constantProperties& cp
 )
 :
-    KinematicParcel<ParcelType>::constantProperties(cp),
+    ParcelType::constantProperties(cp),
     T0_(cp.T0_),
     TMin_(cp.TMin_),
     Cp0_(cp.Cp0_),
@@ -61,7 +61,7 @@ inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties
     const bool readFields
 )
 :
-    KinematicParcel<ParcelType>::constantProperties(parentDict, readFields),
+    ParcelType::constantProperties(parentDict, readFields),
     T0_(0.0),
     TMin_(0.0),
     Cp0_(0.0),
@@ -81,71 +81,17 @@ inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties
 }
 
 
-template<class ParcelType>
-inline Foam::ThermoParcel<ParcelType>::trackData::trackData
-(
-    ThermoCloud<ParcelType>& cloud,
-    typename KinematicParcel<ParcelType>::trackData::trackPart part
-)
-:
-    KinematicParcel<ParcelType>::trackData(cloud, part),
-    cloud_(cloud),
-    Cp_
-    (
-        IOobject
-        (
-            "Cp",
-            cloud.db().time().timeName(),
-            cloud.db(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        cloud.thermo().thermo().Cp()
-    ),
-    TInterp_
-    (
-        interpolation<scalar>::New
-        (
-            cloud.solution().interpolationSchemes(),
-            cloud.T()
-        )
-    ),
-    CpInterp_
-    (
-        interpolation<scalar>::New
-        (
-            cloud.solution().interpolationSchemes(),
-            Cp_
-        )
-    ),
-    GInterp_(NULL)
-{
-    if (cloud.radiation())
-    {
-        GInterp_.reset
-        (
-            interpolation<scalar>::New
-            (
-                cloud.solution().interpolationSchemes(),
-                cloud.mesh().objectRegistry::template
-                    lookupObject<volScalarField>("G")
-            ).ptr()
-        );
-    }
-}
-
-
 template<class ParcelType>
 inline Foam::ThermoParcel<ParcelType>::ThermoParcel
 (
-    ThermoCloud<ParcelType>& owner,
+    const polyMesh& mesh,
     const vector& position,
     const label cellI,
     const label tetFaceI,
     const label tetPtI
 )
 :
-    KinematicParcel<ParcelType>(owner, position, cellI, tetFaceI, tetPtI),
+    ParcelType(mesh, position, cellI, tetFaceI, tetPtI),
     T_(0.0),
     Cp_(0.0),
     Tc_(0.0),
@@ -156,7 +102,7 @@ inline Foam::ThermoParcel<ParcelType>::ThermoParcel
 template<class ParcelType>
 inline Foam::ThermoParcel<ParcelType>::ThermoParcel
 (
-    ThermoCloud<ParcelType>& owner,
+    const polyMesh& mesh,
     const vector& position,
     const label cellI,
     const label tetFaceI,
@@ -172,9 +118,9 @@ inline Foam::ThermoParcel<ParcelType>::ThermoParcel
     const constantProperties& constProps
 )
 :
-    KinematicParcel<ParcelType>
+    ParcelType
     (
-        owner,
+        mesh,
         position,
         cellI,
         tetFaceI,
@@ -246,58 +192,6 @@ Foam::ThermoParcel<ParcelType>::constantProperties::Pr() const
 }
 
 
-// * * * * * * * * * * * trackData Member Functions  * * * * * * * * * * * * //
-
-template<class ParcelType>
-inline Foam::ThermoCloud<ParcelType>&
-Foam::ThermoParcel<ParcelType>::trackData::cloud()
-{
-    return cloud_;
-}
-
-
-template<class ParcelType>
-inline const Foam::volScalarField&
-Foam::ThermoParcel<ParcelType>::trackData::Cp() const
-{
-    return Cp_;
-}
-
-
-template<class ParcelType>
-inline const Foam::interpolation<Foam::scalar>&
-Foam::ThermoParcel<ParcelType>::trackData::TInterp() const
-{
-    return TInterp_();
-}
-
-
-template<class ParcelType>
-inline const Foam::interpolation<Foam::scalar>&
-Foam::ThermoParcel<ParcelType>::trackData::CpInterp() const
-{
-    return CpInterp_();
-}
-
-
-template<class ParcelType>
-inline const Foam::interpolation<Foam::scalar>&
-Foam::ThermoParcel<ParcelType>::trackData::GInterp() const
-{
-    if (!GInterp_.valid())
-    {
-        FatalErrorIn
-        (
-            "inline const Foam::interpolation<Foam::scalar>&"
-            "Foam::ThermoParcel<ParcelType>::trackData::GInterp() const"
-        )   << "Radiation G interpolation object not set"
-            << abort(FatalError);
-    }
-
-    return GInterp_();
-}
-
-
 // * * * * * * * * * * ThermoParcel Member Functions * * * * * * * * * * * * //
 
 template<class ParcelType>
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
index d052abebae..583d3d0c8c 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
@@ -30,7 +30,7 @@ License
 
 template<class ParcelType>
 Foam::string Foam::ThermoParcel<ParcelType>::propHeader =
-    KinematicParcel<ParcelType>::propHeader
+    ParcelType::propHeader
   + " T"
   + " Cp";
 
@@ -40,12 +40,12 @@ Foam::string Foam::ThermoParcel<ParcelType>::propHeader =
 template<class ParcelType>
 Foam::ThermoParcel<ParcelType>::ThermoParcel
 (
-    const Cloud<ParcelType>& cloud,
+    const polyMesh& mesh,
     Istream& is,
     bool readFields
 )
 :
-    KinematicParcel<ParcelType>(cloud, is, readFields),
+    ParcelType(mesh, is, readFields),
     T_(0.0),
     Cp_(0.0),
     Tc_(0.0),
@@ -72,20 +72,21 @@ Foam::ThermoParcel<ParcelType>::ThermoParcel
     // Check state of Istream
     is.check
     (
-        "ThermoParcel::ThermoParcel(const Cloud<ParcelType>&, Istream&, bool)"
+        "ThermoParcel::ThermoParcel(const polyMesh&, Istream&, bool)"
     );
 }
 
 
 template<class ParcelType>
-void Foam::ThermoParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
+template<class CloudType>
+void Foam::ThermoParcel<ParcelType>::readFields(CloudType& c)
 {
     if (!c.size())
     {
         return;
     }
 
-    KinematicParcel<ParcelType>::readFields(c);
+    ParcelType::readFields(c);
 
     IOField<scalar> T(c.fieldIOobject("T", IOobject::MUST_READ));
     c.checkFieldIOobject(c, T);
@@ -95,7 +96,7 @@ void Foam::ThermoParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
 
 
     label i = 0;
-    forAllIter(typename Cloud<ParcelType>, c, iter)
+    forAllIter(typename Cloud<ThermoParcel<ParcelType> >, c, iter)
     {
         ThermoParcel<ParcelType>& p = iter();
 
@@ -107,9 +108,10 @@ void Foam::ThermoParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
 
 
 template<class ParcelType>
-void Foam::ThermoParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
+template<class CloudType>
+void Foam::ThermoParcel<ParcelType>::writeFields(const CloudType& c)
 {
-    KinematicParcel<ParcelType>::writeFields(c);
+    ParcelType::writeFields(c);
 
     label np =  c.size();
 
@@ -117,7 +119,7 @@ void Foam::ThermoParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
     IOField<scalar> Cp(c.fieldIOobject("Cp", IOobject::NO_READ), np);
 
     label i = 0;
-    forAllConstIter(typename Cloud<ParcelType>, c, iter)
+    forAllConstIter(typename Cloud<ThermoParcel<ParcelType> >, c, iter)
     {
         const ThermoParcel<ParcelType>& p = iter();
 
@@ -142,13 +144,13 @@ Foam::Ostream& Foam::operator<<
 {
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const KinematicParcel<ParcelType>&>(p)
+        os  << static_cast<const ParcelType&>(p)
             << token::SPACE << p.T()
             << token::SPACE << p.Cp();
     }
     else
     {
-        os  << static_cast<const KinematicParcel<ParcelType>&>(p);
+        os  << static_cast<const ParcelType&>(p);
         os.write
         (
             reinterpret_cast<const char*>(&p.T_),
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H
new file mode 100644
index 0000000000..d7e2e9a052
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H
@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+template<class ParcelType>
+template<class CloudType>
+inline Foam::ThermoParcel<ParcelType>::TrackingData<CloudType>::TrackingData
+(
+    CloudType& cloud,
+    trackPart part
+)
+:
+    ParcelType::template TrackingData<CloudType>(cloud, part),
+    Cp_
+    (
+        IOobject
+        (
+            "Cp",
+            cloud.db().time().timeName(),
+            cloud.db(),
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        cloud.thermo().thermo().Cp()
+    ),
+    TInterp_
+    (
+        interpolation<scalar>::New
+        (
+            cloud.solution().interpolationSchemes(),
+            cloud.T()
+        )
+    ),
+    CpInterp_
+    (
+        interpolation<scalar>::New
+        (
+            cloud.solution().interpolationSchemes(),
+            Cp_
+        )
+    ),
+    GInterp_(NULL)
+{
+    if (cloud.radiation())
+    {
+        GInterp_.reset
+        (
+            interpolation<scalar>::New
+            (
+                cloud.solution().interpolationSchemes(),
+                cloud.mesh().objectRegistry::template
+                    lookupObject<volScalarField>("G")
+            ).ptr()
+        );
+    }
+}
+
+
+template<class ParcelType>
+template<class CloudType>
+inline const Foam::volScalarField&
+Foam::ThermoParcel<ParcelType>::TrackingData<CloudType>::Cp() const
+{
+    return Cp_;
+}
+
+
+template<class ParcelType>
+template<class CloudType>
+inline const Foam::interpolation<Foam::scalar>&
+Foam::ThermoParcel<ParcelType>::TrackingData<CloudType>::TInterp() const
+{
+    return TInterp_();
+}
+
+
+template<class ParcelType>
+template<class CloudType>
+inline const Foam::interpolation<Foam::scalar>&
+Foam::ThermoParcel<ParcelType>::TrackingData<CloudType>::CpInterp() const
+{
+    return CpInterp_();
+}
+
+
+template<class ParcelType>
+template<class CloudType>
+inline const Foam::interpolation<Foam::scalar>&
+Foam::ThermoParcel<ParcelType>::TrackingData<CloudType>::GInterp() const
+{
+    if (!GInterp_.valid())
+    {
+        FatalErrorIn
+        (
+            "inline const Foam::interpolation<Foam::scalar>&"
+            "Foam::ThermoParcel<ParcelType>::TrackingData<CloudType>::"
+            "GInterp() const"
+        )   << "Radiation G interpolation object not set"
+            << abort(FatalError);
+    }
+
+    return GInterp_();
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.H b/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.H
deleted file mode 100644
index 8cd6865a7c..0000000000
--- a/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.H
+++ /dev/null
@@ -1,80 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::basicReactingParcel
-
-Description
-    Base class for reacting parcel - simply used to set the contiguous flag
-
-SourceFiles
-    reactingParcel.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef reactingParcel_H
-#define reactingParcel_H
-
-#include "typeInfo.H"
-#include "contiguous.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                       Class reactingParcel Declaration
-\*---------------------------------------------------------------------------*/
-
-class reactingParcel
-{
-public:
-
-    //- Run-time type information
-    TypeName("reactingParcel");
-
-    //- Construct null
-    reactingParcel();
-
-    //- Destructor
-    virtual ~reactingParcel();
-};
-
-
-template<>
-inline bool contiguous<reactingParcel>()
-{
-    return false; // Derived classes include scalar lists/fields
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/createThermoParcelTypes.H b/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/basicKinematicCollidingParcel.H
similarity index 63%
rename from src/lagrangian/intermediate/parcels/include/createThermoParcelTypes.H
rename to src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/basicKinematicCollidingParcel.H
index 1cbab2a4bb..989e1da010 100644
--- a/src/lagrangian/intermediate/parcels/include/createThermoParcelTypes.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/basicKinematicCollidingParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,31 +21,41 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Class
+    Foam::basicKinematicCollidingParcel
+
+Description
+    Definition of basic kinematic colliding parcel
+
+SourceFiles
+    basicKinematicParcel.H
+
 \*---------------------------------------------------------------------------*/
 
-#ifndef createThermoParcelTypes_H
-#define createThermoParcelTypes_H
+#ifndef basicKinematicCollidingParcel_H
+#define basicKinematicCollidingParcel_H
 
-#include "ThermoParcel.H"
-#include "ThermoCloud.H"
-
-#include "createKinematicParcelTypes.H"
+#include "contiguous.H"
+#include "particle.H"
+#include "KinematicParcel.H"
+#include "CollidingParcel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define createThermoParcelTypes(ParcelType)                                   \
-                                                                              \
-    createKinematicParcelTypes(ParcelType);                                   \
-                                                                              \
-    defineParcelTypeNameAndDebug(ThermoParcel<ParcelType>, 0);                \
-    defineTemplateTypeNameAndDebug(ThermoParcel<ParcelType>, 0);              \
-    defineParcelTypeNameAndDebug(ThermoCloud<ParcelType>, 0);
+namespace Foam
+{
+    typedef CollidingParcel<KinematicParcel<particle> >
+        basicKinematicCollidingParcel;
 
+    template<>
+    inline bool contiguous<basicKinematicCollidingParcel>()
+    {
+        return true;
+    }
+}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
 
 // ************************************************************************* //
-
-
diff --git a/src/lagrangian/coalCombustion/coalParcel/defineCoalParcel.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/defineBasicKinematicCollidingParcel.C
similarity index 82%
rename from src/lagrangian/coalCombustion/coalParcel/defineCoalParcel.C
rename to src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/defineBasicKinematicCollidingParcel.C
index 331ac17327..4dad7f8de3 100644
--- a/src/lagrangian/coalCombustion/coalParcel/defineCoalParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/defineBasicKinematicCollidingParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,14 +23,15 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "createReactingMultiphaseParcelTypes.H"
-#include "coalParcel.H"
+#include "basicKinematicCollidingParcel.H"
+#include "Cloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    createReactingMultiphaseParcelTypes(coalParcel);
+    defineTemplateTypeNameAndDebug(basicKinematicCollidingParcel, 0);
+    defineTemplateTypeNameAndDebug(Cloud<basicKinematicCollidingParcel>, 0);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/createReactingMultiphaseParcelTypes.H b/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C
similarity index 56%
rename from src/lagrangian/intermediate/parcels/include/createReactingMultiphaseParcelTypes.H
rename to src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C
index 50a31657bb..3c61ef6425 100644
--- a/src/lagrangian/intermediate/parcels/include/createReactingMultiphaseParcelTypes.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,26 +23,33 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef createReactingMultiphaseParcelTypes_H
-#define createReactingMultiphaseParcelTypes_H
+#include "basicKinematicCollidingCloud.H"
 
-#include "ReactingMultiphaseParcel.H"
-#include "ReactingMultiphaseCloud.H"
-
-#include "createReactingParcelTypes.H"
+// Kinematic
+#include "makeParcelForces.H"
+#include "makeParcelDispersionModels.H"
+#include "makeParcelInjectionModels.H"
+#include "makeParcelCollisionModels.H"
+#include "makeParcelPatchInteractionModels.H"
+#include "makeParcelPostProcessingModels.H"
+#include "makeParcelSurfaceFilmModels.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define createReactingMultiphaseParcelTypes(ParcelType)                       \
-                                                                              \
-    createReactingParcelTypes(ParcelType);                                    \
-                                                                              \
-    defineParcelTypeNameAndDebug(ReactingMultiphaseParcel<ParcelType>, 0);    \
-    defineTemplateTypeNameAndDebug(ReactingMultiphaseParcel<ParcelType>, 0);  \
-    defineParcelTypeNameAndDebug(ReactingMultiphaseCloud<ParcelType>, 0);
+namespace Foam
+{
+    // Kinematic sub-models
+    typedef basicKinematicCollidingCloud::cloudType
+        basicKinematicCollidingCloud_K;
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+    makeParcelForces(basicKinematicCollidingCloud_K);
+    makeParcelDispersionModels(basicKinematicCollidingCloud_K);
+    makeParcelInjectionModels(basicKinematicCollidingCloud_K);
+    makeParcelCollisionModels(basicKinematicCollidingCloud);
+    makeParcelPatchInteractionModels(basicKinematicCollidingCloud_K);
+    makeParcelPostProcessingModels(basicKinematicCollidingCloud_K);
+    makeParcelSurfaceFilmModels(basicKinematicCollidingCloud_K);
+}
 
-#endif
 
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
deleted file mode 100644
index b24d5b8cf3..0000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
+++ /dev/null
@@ -1,124 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2011 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 3 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicKinematicParcel.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::basicKinematicParcel::basicKinematicParcel
-(
-    KinematicCloud<basicKinematicParcel>& owner,
-    const vector& position,
-    const label cellI,
-    const label tetFaceI,
-    const label tetPtI
-)
-:
-    KinematicParcel<basicKinematicParcel>
-    (
-        owner,
-        position,
-        cellI,
-        tetFaceI,
-        tetPtI
-    )
-{}
-
-
-Foam::basicKinematicParcel::basicKinematicParcel
-(
-    KinematicCloud<basicKinematicParcel>& owner,
-    const vector& position,
-    const label cellI,
-    const label tetFaceI,
-    const label tetPtI,
-    const label typeId,
-    const scalar nParticle0,
-    const scalar d0,
-    const scalar dTarget0,
-    const vector& U0,
-    const vector& f0,
-    const vector& angularMomentum0,
-    const vector& torque0,
-    const constantProperties& constProps
-)
-:
-    KinematicParcel<basicKinematicParcel>
-    (
-        owner,
-        position,
-        cellI,
-        tetFaceI,
-        tetPtI,
-        typeId,
-        nParticle0,
-        d0,
-        dTarget0,
-        U0,
-        f0,
-        angularMomentum0,
-        torque0,
-        constProps
-    )
-{}
-
-
-Foam::basicKinematicParcel::basicKinematicParcel
-(
-    const Cloud<basicKinematicParcel>& cloud,
-    Istream& is,
-    bool readFields
-)
-:
-    KinematicParcel<basicKinematicParcel>(cloud, is, readFields)
-{}
-
-
-Foam::basicKinematicParcel::basicKinematicParcel
-(
-    const basicKinematicParcel& p
-)
-:
-    KinematicParcel<basicKinematicParcel>(p)
-{}
-
-
-Foam::basicKinematicParcel::basicKinematicParcel
-(
-    const basicKinematicParcel& p,
-    const KinematicCloud<basicKinematicParcel>& c
-)
-:
-    KinematicParcel<basicKinematicParcel>(p, c)
-{}
-
-
-// * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
-
-Foam::basicKinematicParcel::~basicKinematicParcel()
-{}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
index 38c1a2fbf7..b4c3923ace 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
@@ -25,130 +25,33 @@ Class
     Foam::basicKinematicParcel
 
 Description
-
+    Definition of basic kinematic parcel
 
 SourceFiles
-    basicKinematicParcel.C
+    basicKinematicParcel.H
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef basicKinematicParcel_H
 #define basicKinematicParcel_H
 
+#include "contiguous.H"
+#include "particle.H"
 #include "KinematicParcel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    typedef KinematicParcel<particle> basicKinematicParcel;
 
-/*---------------------------------------------------------------------------*\
-                   Class basicKinematicParcel Declaration
-\*---------------------------------------------------------------------------*/
-
-class basicKinematicParcel
-:
-    public KinematicParcel<basicKinematicParcel>
-{
-
-public:
-
-    //- Run-time type information
-    TypeName("basicKinematicParcel");
-
-
-    // Constructors
-
-        //- Construct from owner, position, and cloud owner
-        //  Other properties initialised as null
-        basicKinematicParcel
-        (
-            KinematicCloud<basicKinematicParcel>& owner,
-            const vector& position,
-            const label cellI,
-            const label tetFaceI,
-            const label tetPtI
-        );
-
-        //- Construct from components
-        basicKinematicParcel
-        (
-            KinematicCloud<basicKinematicParcel>& owner,
-            const vector& position,
-            const label cellI,
-            const label tetFaceI,
-            const label tetPtI,
-            const label typeId,
-            const scalar nParticle0,
-            const scalar d0,
-            const scalar dTarget0,
-            const vector& U0,
-            const vector& f0,
-            const vector& angularMomentum0,
-            const vector& torque0,
-            const constantProperties& constProps
-        );
-
-        //- Construct from Istream
-        basicKinematicParcel
-        (
-            const Cloud<basicKinematicParcel>& c,
-            Istream& is,
-            bool readFields = true
-        );
-
-        //- Construct as a copy
-        basicKinematicParcel(const basicKinematicParcel& p);
-
-        //- Construct as a copy
-        basicKinematicParcel
-        (
-            const basicKinematicParcel& p,
-            const KinematicCloud<basicKinematicParcel>& c
-        );
-
-        //- Construct and return a clone
-        virtual autoPtr<Particle<basicKinematicParcel> > clone() const
-        {
-            return autoPtr<Particle<basicKinematicParcel> >
-            (
-                new basicKinematicParcel(*this)
-            );
-        }
-
-        //- Construct and return a clone
-        virtual autoPtr<Particle<basicKinematicParcel> > clone
-        (
-            const Cloud<basicKinematicParcel>& c
-        ) const
-        {
-            return autoPtr<Particle<basicKinematicParcel> >
-            (
-                new basicKinematicParcel
-                (
-                    *this,
-                    static_cast<const KinematicCloud<basicKinematicParcel>&>(c)
-                )
-            );
-        }
-
-
-    //- Destructor
-    virtual ~basicKinematicParcel();
-};
-
-
-template<>
-inline bool contiguous<basicKinematicParcel>()
-{
-    return true;
+    template<>
+    inline bool contiguous<basicKinematicParcel>()
+    {
+        return true;
+    }
 }
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
index 6fbffda440..826cbc3172 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
@@ -24,13 +24,14 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "basicKinematicParcel.H"
-#include "createKinematicParcelTypes.H"
+#include "Cloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    createKinematicParcelTypes(basicKinematicParcel);
+    defineTemplateTypeNameAndDebug(basicKinematicParcel, 0);
+    defineTemplateTypeNameAndDebug(Cloud<basicKinematicParcel>, 0);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
index c869ceeac0..04081254bb 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
@@ -23,13 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "basicKinematicParcel.H"
+#include "basicKinematicCloud.H"
 
 // Kinematic
 #include "makeParcelForces.H"
 #include "makeParcelDispersionModels.H"
 #include "makeParcelInjectionModels.H"
-#include "makeParcelCollisionModels.H"
 #include "makeParcelPatchInteractionModels.H"
 #include "makeParcelPostProcessingModels.H"
 #include "makeParcelSurfaceFilmModels.H"
@@ -39,13 +38,12 @@ License
 namespace Foam
 {
     // Kinematic sub-models
-    makeParcelForces(basicKinematicParcel);
-    makeParcelDispersionModels(basicKinematicParcel);
-    makeParcelInjectionModels(basicKinematicParcel);
-    makeParcelCollisionModels(basicKinematicParcel);
-    makeParcelPatchInteractionModels(basicKinematicParcel);
-    makeParcelPostProcessingModels(basicKinematicParcel);
-    makeParcelSurfaceFilmModels(basicKinematicParcel);
+    makeParcelForces(basicKinematicCloud);
+    makeParcelDispersionModels(basicKinematicCloud);
+    makeParcelInjectionModels(basicKinematicCloud);
+    makeParcelPatchInteractionModels(basicKinematicCloud);
+    makeParcelPostProcessingModels(basicKinematicCloud);
+    makeParcelSurfaceFilmModels(basicKinematicCloud);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
deleted file mode 100644
index 9d37e13219..0000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
+++ /dev/null
@@ -1,138 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicReactingMultiphaseParcel.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
-(
-    ReactingMultiphaseCloud<basicReactingMultiphaseParcel>& owner,
-    const vector& position,
-    const label cellI,
-    const label tetFaceI,
-    const label tetPtI
-)
-:
-    ReactingMultiphaseParcel<basicReactingMultiphaseParcel>
-    (
-        owner,
-        position,
-        cellI,
-        tetFaceI,
-        tetPtI
-    )
-{}
-
-
-Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
-(
-    ReactingMultiphaseCloud<basicReactingMultiphaseParcel>& owner,
-    const vector& position,
-    const label cellI,
-    const label tetFaceI,
-    const label tetPtI,
-    const label typeId,
-    const scalar nParticle0,
-    const scalar d0,
-    const scalar dTarget0,
-    const vector& U0,
-    const vector& f0,
-    const vector& angularMomentum0,
-    const vector& torque0,
-    const scalarField& YGas0,
-    const scalarField& YLiquid0,
-    const scalarField& YSolid0,
-    const scalarField& Y0,
-    const ReactingMultiphaseParcel<basicReactingMultiphaseParcel>::
-        constantProperties& constProps
-)
-:
-    ReactingMultiphaseParcel<basicReactingMultiphaseParcel>
-    (
-        owner,
-        position,
-        cellI,
-        tetFaceI,
-        tetPtI,
-        typeId,
-        nParticle0,
-        d0,
-        dTarget0,
-        U0,
-        f0,
-        angularMomentum0,
-        torque0,
-        YGas0,
-        YLiquid0,
-        YSolid0,
-        Y0,
-        constProps
-    )
-{}
-
-
-Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
-(
-    const Cloud<basicReactingMultiphaseParcel>& cloud,
-    Istream& is,
-    bool readFields
-)
-:
-    ReactingMultiphaseParcel<basicReactingMultiphaseParcel>
-    (
-        cloud,
-        is,
-        readFields
-    )
-{}
-
-
-Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
-(
-    const basicReactingMultiphaseParcel& p
-)
-:
-    ReactingMultiphaseParcel<basicReactingMultiphaseParcel>(p)
-{}
-
-
-Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
-(
-    const basicReactingMultiphaseParcel& p,
-    const ReactingMultiphaseCloud<basicReactingMultiphaseParcel>& c
-)
-:
-    ReactingMultiphaseParcel<basicReactingMultiphaseParcel>(p, c)
-{}
-
-
-// * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
-
-Foam::basicReactingMultiphaseParcel::~basicReactingMultiphaseParcel()
-{}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
index 54ed924392..0289d1ca0f 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ Class
     Foam::BasicReactingMultiphaseParcel
 
 Description
-
+    Definition of basic reacting parcel
 
 SourceFiles
     basicReactingMultiphaseParcel.C
@@ -36,123 +36,38 @@ SourceFiles
 #ifndef basicReactingMultiphaseParcel_H
 #define basicReactingMultiphaseParcel_H
 
+#include "contiguous.H"
+#include "particle.H"
+#include "KinematicParcel.H"
+#include "ThermoParcel.H"
+#include "ReactingParcel.H"
 #include "ReactingMultiphaseParcel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 namespace Foam
 {
+    typedef ReactingMultiphaseParcel
+    <
+        ReactingParcel
+        <
+            ThermoParcel
+            <
+                KinematicParcel
+                <
+                    particle
+                >
+            >
+        >
+    > basicReactingMultiphaseParcel;
 
-/*---------------------------------------------------------------------------*\
-               Class basicReactingMultiphaseParcel Declaration
-\*---------------------------------------------------------------------------*/
+    template<>
+    inline bool contiguous<basicReactingMultiphaseParcel>()
+    {
+        return false;
+    }
+}
 
-class basicReactingMultiphaseParcel
-:
-    public ReactingMultiphaseParcel<basicReactingMultiphaseParcel>
-{
-
-public:
-
-    //- Run-time type information
-    TypeName("basicReactingMultiphaseParcel");
-
-    // Constructors
-
-        //- Construct from owner, position, and cloud owner
-        //  Other properties initialised as null
-        basicReactingMultiphaseParcel
-        (
-             ReactingMultiphaseCloud<basicReactingMultiphaseParcel>& owner,
-             const vector& position,
-             const label cellI,
-             const label tetFaceI,
-             const label tetPtI
-        );
-
-        //- Construct from components
-        basicReactingMultiphaseParcel
-        (
-             ReactingMultiphaseCloud<basicReactingMultiphaseParcel>& owner,
-             const vector& position,
-             const label cellI,
-             const label tetFaceI,
-             const label tetPtI,
-             const label typeId,
-             const scalar nParticle0,
-             const scalar d0,
-             const scalar dTarget0,
-             const vector& U0,
-             const vector& f0,
-             const vector& angularMomentum0,
-             const vector& torque0,
-             const scalarField& YGas0,
-             const scalarField& YLiquid0,
-             const scalarField& YSolid0,
-             const scalarField& Y0,
-             const ReactingMultiphaseParcel<basicReactingMultiphaseParcel>::
-                constantProperties& constProps
-        );
-
-        //- Construct from Istream
-        basicReactingMultiphaseParcel
-        (
-            const Cloud<basicReactingMultiphaseParcel>& c,
-            Istream& is,
-            bool readFields = true
-        );
-
-        //- Construct as a copy
-        basicReactingMultiphaseParcel(const basicReactingMultiphaseParcel& p);
-
-        //- Construct as a copy
-        basicReactingMultiphaseParcel
-        (
-            const basicReactingMultiphaseParcel& p,
-            const ReactingMultiphaseCloud<basicReactingMultiphaseParcel>& c
-        );
-
-        //- Construct and return a clone
-        virtual autoPtr<Particle<basicReactingMultiphaseParcel> > clone() const
-        {
-            return autoPtr<Particle<basicReactingMultiphaseParcel> >
-            (
-                new basicReactingMultiphaseParcel(*this)
-            );
-        }
-
-        //- Construct and return a clone
-        virtual autoPtr<Particle<basicReactingMultiphaseParcel> > clone
-        (
-            const Cloud<basicReactingMultiphaseParcel>& c
-        ) const
-        {
-            return autoPtr<Particle<basicReactingMultiphaseParcel> >
-            (
-                new basicReactingMultiphaseParcel
-                (
-                    *this,
-                    static_cast
-                    <
-                        const ReactingMultiphaseCloud
-                        <
-                            basicReactingMultiphaseParcel
-                        >&
-                    >(c)
-                )
-            );
-        }
-
-
-    //- Destructor
-    virtual ~basicReactingMultiphaseParcel();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
index 78de4affcc..ccd0a9c8e6 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,14 +23,15 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "createReactingMultiphaseParcelTypes.H"
 #include "basicReactingMultiphaseParcel.H"
+#include "Cloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    createReactingMultiphaseParcelTypes(basicReactingMultiphaseParcel);
+    defineTemplateTypeNameAndDebug(basicReactingMultiphaseParcel, 0);
+    defineTemplateTypeNameAndDebug(Cloud<basicReactingMultiphaseParcel>, 0);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
index d7c2c70054..53e1374424 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
@@ -23,13 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "basicReactingMultiphaseParcel.H"
+#include "basicReactingMultiphaseCloud.H"
 
 // Kinematic
 #include "makeThermoParcelForces.H" // thermo variant
 #include "makeParcelDispersionModels.H"
 #include "makeReactingMultiphaseParcelInjectionModels.H" // MP variant
-#include "makeParcelCollisionModels.H"
 #include "makeParcelPatchInteractionModels.H"
 #include "makeParcelPostProcessingModels.H"
 
@@ -49,36 +48,42 @@ License
 
 namespace Foam
 {
+    typedef basicReactingMultiphaseCloud::cloudType
+        basicReactingMultiphaseCloud_R;
+    typedef basicReactingMultiphaseCloud_R::cloudType
+        basicReactingMultiphaseCloud_T;
+    typedef basicReactingMultiphaseCloud_T::cloudType
+        basicReactingMultiphaseCloud_K;
+
     // Kinematic sub-models
-    makeThermoParcelForces(basicReactingMultiphaseParcel);
-    makeParcelDispersionModels(basicReactingMultiphaseParcel);
-    makeReactingMultiphaseParcelInjectionModels(basicReactingMultiphaseParcel);
-    makeParcelCollisionModels(basicReactingMultiphaseParcel);
-    makeParcelPatchInteractionModels(basicReactingMultiphaseParcel);
-    makeParcelPostProcessingModels(basicReactingMultiphaseParcel);
+    makeThermoParcelForces(basicReactingMultiphaseCloud_K);
+    makeParcelDispersionModels(basicReactingMultiphaseCloud_K);
+    makeReactingMultiphaseParcelInjectionModels(basicReactingMultiphaseCloud_K);
+    makeParcelPatchInteractionModels(basicReactingMultiphaseCloud_K);
+    makeParcelPostProcessingModels(basicReactingMultiphaseCloud_K);
 
     // Thermo sub-models
-    makeParcelHeatTransferModels(basicReactingMultiphaseParcel);
+    makeParcelHeatTransferModels(basicReactingMultiphaseCloud_T);
 
     // Reacting sub-models
     makeReactingMultiphaseParcelCompositionModels
     (
-        basicReactingMultiphaseParcel
+        basicReactingMultiphaseCloud_R
     );
-    makeReactingParcelPhaseChangeModels(basicReactingMultiphaseParcel);
+    makeReactingParcelPhaseChangeModels(basicReactingMultiphaseCloud_R);
 
     // Reacting multiphase sub-models
     makeReactingMultiphaseParcelDevolatilisationModels
     (
-        basicReactingMultiphaseParcel
+        basicReactingMultiphaseCloud
     );
     makeReactingParcelSurfaceFilmModels
     (
-        basicReactingMultiphaseParcel
+        basicReactingMultiphaseCloud_K
     );
     makeReactingMultiphaseParcelSurfaceReactionModels
     (
-        basicReactingMultiphaseParcel
+        basicReactingMultiphaseCloud
     );
 }
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
deleted file mode 100644
index d5b6285842..0000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
+++ /dev/null
@@ -1,126 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2011 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 3 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicReactingParcel.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::basicReactingParcel::basicReactingParcel
-(
-    ReactingCloud<basicReactingParcel>& owner,
-    const vector& position,
-    const label cellI,
-    const label tetFaceI,
-    const label tetPtI
-)
-:
-    ReactingParcel<basicReactingParcel>
-    (
-        owner,
-        position,
-        cellI,
-        tetFaceI,
-        tetPtI
-    )
-{}
-
-
-Foam::basicReactingParcel::basicReactingParcel
-(
-    ReactingCloud<basicReactingParcel>& owner,
-    const vector& position,
-    const label cellI,
-    const label tetFaceI,
-    const label tetPtI,
-    const label typeId,
-    const scalar nParticle0,
-    const scalar d0,
-    const scalar dTarget0,
-    const vector& U0,
-    const vector& f0,
-    const vector& angularMomentum0,
-    const vector& torque0,
-    const scalarField& Y0,
-    const ReactingParcel<basicReactingParcel>::constantProperties& constProps
-)
-:
-    ReactingParcel<basicReactingParcel>
-    (
-        owner,
-        position,
-        cellI,
-        tetFaceI,
-        tetPtI,
-        typeId,
-        nParticle0,
-        d0,
-        dTarget0,
-        U0,
-        f0,
-        angularMomentum0,
-        torque0,
-        Y0,
-        constProps
-    )
-{}
-
-
-Foam::basicReactingParcel::basicReactingParcel
-(
-    const Cloud<basicReactingParcel>& cloud,
-    Istream& is,
-    bool readFields
-)
-:
-    ReactingParcel<basicReactingParcel>(cloud, is, readFields)
-{}
-
-
-Foam::basicReactingParcel::basicReactingParcel
-(
-    const basicReactingParcel& p
-)
-:
-    ReactingParcel<basicReactingParcel>(p)
-{}
-
-
-Foam::basicReactingParcel::basicReactingParcel
-(
-    const basicReactingParcel& p,
-    const ReactingCloud<basicReactingParcel>& c
-)
-:
-    ReactingParcel<basicReactingParcel>(p, c)
-{}
-
-
-// * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
-
-Foam::basicReactingParcel::~basicReactingParcel()
-{}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
index 3302aa5150..a9645f85bf 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
@@ -25,7 +25,7 @@ Class
     Foam::basicReactingParcel
 
 Description
-
+    Definition of basic reacting parcel
 
 SourceFiles
     basicReactingParcel.C
@@ -35,121 +35,26 @@ SourceFiles
 #ifndef basicReactingParcel_H
 #define basicReactingParcel_H
 
+#include "contiguous.H"
+#include "particle.H"
+#include "KinematicParcel.H"
+#include "ThermoParcel.H"
 #include "ReactingParcel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    typedef ReactingParcel<ThermoParcel<KinematicParcel<particle> > >
+        basicReactingParcel;
 
-/*---------------------------------------------------------------------------*\
-                    Class basicReactingParcel Declaration
-\*---------------------------------------------------------------------------*/
-
-class basicReactingParcel
-:
-    public ReactingParcel<basicReactingParcel>
-{
-
-public:
-
-    //- Run-time type information
-    TypeName("basicReactingParcel");
-
-    // Constructors
-
-        //- Construct from owner, position, and cloud owner
-        //  Other properties initialised as null
-        basicReactingParcel
-        (
-            ReactingCloud<basicReactingParcel>& owner,
-            const vector& position,
-            const label cellI,
-            const label tetFaceI,
-            const label tetPtI
-        );
-
-        //- Construct from components
-        basicReactingParcel
-        (
-            ReactingCloud<basicReactingParcel>& owner,
-            const vector& position,
-            const label cellI,
-            const label tetFaceI,
-            const label tetPtI,
-            const label typeId,
-            const scalar nParticle0,
-            const scalar d0,
-            const scalar dTarget0,
-            const vector& U0,
-            const vector& f0,
-            const vector& angularMomentum0,
-            const vector& torque0,
-            const scalarField& Y0,
-            const ReactingParcel<basicReactingParcel>::constantProperties&
-                constProps
-        );
-
-        //- Construct from Istream
-        basicReactingParcel
-        (
-            const Cloud<basicReactingParcel>& c,
-            Istream& is,
-            bool readFields = true
-        );
-
-        //- Construct as a copy
-        basicReactingParcel(const basicReactingParcel& p);
-
-        //- Construct as a copy
-        basicReactingParcel
-        (
-            const basicReactingParcel& p,
-            const ReactingCloud<basicReactingParcel>& c
-        );
-
-        //- Construct and return a clone
-        virtual autoPtr<Particle<basicReactingParcel> > clone() const
-        {
-            return autoPtr<Particle<basicReactingParcel> >
-            (
-                new basicReactingParcel(*this)
-            );
-        }
-
-        //- Construct and return a clone
-        virtual autoPtr<Particle<basicReactingParcel> > clone
-        (
-            const Cloud<basicReactingParcel>& c
-        ) const
-        {
-            return autoPtr<Particle<basicReactingParcel> >
-            (
-                new basicReactingParcel
-                (
-                    *this,
-                    static_cast<const ReactingCloud<basicReactingParcel>&>(c)
-                )
-            );
-        }
-
-
-    //- Destructor
-    virtual ~basicReactingParcel();
-};
-
-
-template<>
-inline bool contiguous<basicReactingParcel>()
-{
-    return false;
+    template<>
+    inline bool contiguous<basicReactingParcel>()
+    {
+        return false;
+    }
 }
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/defineBasicReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/defineBasicReactingParcel.C
index 98bab313c4..9bebda1c26 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/defineBasicReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/defineBasicReactingParcel.C
@@ -24,13 +24,14 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "basicReactingParcel.H"
-#include "createReactingParcelTypes.H"
+#include "Cloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    createReactingParcelTypes(basicReactingParcel);
+    defineTemplateTypeNameAndDebug(basicReactingParcel, 0);
+    defineTemplateTypeNameAndDebug(Cloud<basicReactingParcel>, 0);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C
index cad82ff4c4..4e96d83838 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C
@@ -23,13 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "basicReactingParcel.H"
+#include "basicReactingCloud.H"
 
 // Kinematic
 #include "makeThermoParcelForces.H" // thermo variant
 #include "makeParcelDispersionModels.H"
 #include "makeReactingParcelInjectionModels.H" // Reacting variant
-#include "makeParcelCollisionModels.H"
 #include "makeParcelPatchInteractionModels.H"
 #include "makeParcelPostProcessingModels.H"
 
@@ -45,21 +44,23 @@ License
 
 namespace Foam
 {
+    typedef basicReactingCloud::cloudType basicReactingCloud_T;
+    typedef basicReactingCloud_T::cloudType basicReactingCloud_K;
+
     // Kinematic sub-models
-    makeThermoParcelForces(basicReactingParcel);
-    makeParcelDispersionModels(basicReactingParcel);
-    makeReactingParcelInjectionModels(basicReactingParcel);
-    makeParcelCollisionModels(basicReactingParcel);
-    makeParcelPatchInteractionModels(basicReactingParcel);
-    makeParcelPostProcessingModels(basicReactingParcel);
+    makeThermoParcelForces(basicReactingCloud_K);
+    makeParcelDispersionModels(basicReactingCloud_K);
+    makeReactingParcelInjectionModels(basicReactingCloud_K);
+    makeParcelPatchInteractionModels(basicReactingCloud_K);
+    makeParcelPostProcessingModels(basicReactingCloud_K);
 
     // Thermo sub-models
-    makeParcelHeatTransferModels(basicReactingParcel);
+    makeParcelHeatTransferModels(basicReactingCloud_T);
 
     // Reacting sub-models
-    makeReactingParcelCompositionModels(basicReactingParcel);
-    makeReactingParcelPhaseChangeModels(basicReactingParcel);
-    makeReactingParcelSurfaceFilmModels(basicReactingParcel);
+    makeReactingParcelCompositionModels(basicReactingCloud);
+    makeReactingParcelPhaseChangeModels(basicReactingCloud);
+    makeReactingParcelSurfaceFilmModels(basicReactingCloud_K);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
index f48a1b3256..67bb66956d 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
@@ -25,7 +25,7 @@ Class
     Foam::basicThermoParcel
 
 Description
-
+    Definition of basic thermo parcel
 
 SourceFiles
     basicThermoParcel.C
@@ -35,119 +35,24 @@ SourceFiles
 #ifndef basicThermoParcel_H
 #define basicThermoParcel_H
 
+#include "contiguous.H"
+#include "particle.H"
+#include "KinematicParcel.H"
 #include "ThermoParcel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    typedef ThermoParcel<KinematicParcel<particle> > basicThermoParcel;
 
-/*---------------------------------------------------------------------------*\
-                      Class basicThermoParcel Declaration
-\*---------------------------------------------------------------------------*/
-
-class basicThermoParcel
-:
-    public ThermoParcel<basicThermoParcel>
-{
-
-public:
-
-    //- Runtime type information
-    TypeName("basicThermoParcel");
-
-    // Constructors
-
-       //- Construct from owner, position, and cloud owner
-       //  Other properties initialised as null
-       basicThermoParcel
-       (
-            ThermoCloud<basicThermoParcel>& owner,
-            const vector position,
-            const label cellI,
-            const label tetFaceI,
-            const label tetPtI
-       );
-
-       //- Construct from components
-       basicThermoParcel
-       (
-            ThermoCloud<basicThermoParcel>& owner,
-            const vector position,
-            const label cellI,
-            const label tetFaceI,
-            const label tetPtI,
-            const label typeId,
-            const scalar nParticle0,
-            const scalar d0,
-            const scalar dTarget0,
-            const vector U0,
-            const vector& f0,
-            const vector& angularMomentum0,
-            const vector& torque0,
-            const constantProperties& constProps
-        );
-
-        //- Construct from Istream
-        basicThermoParcel
-        (
-            const Cloud<basicThermoParcel>& c,
-            Istream& is,
-            bool readFields = true
-        );
-
-        //- Construct as a copy
-        basicThermoParcel(const basicThermoParcel& p);
-
-        //- Construct as a copy
-        basicThermoParcel
-        (
-            const basicThermoParcel& p,
-            const ThermoCloud<basicThermoParcel>& c
-        );
-
-        //- Construct and return a clone
-        virtual autoPtr<Particle<basicThermoParcel> > clone() const
-        {
-            return autoPtr<Particle<basicThermoParcel> >
-            (
-                new basicThermoParcel(*this)
-            );
-        }
-
-        //- Construct and return a clone
-        virtual autoPtr<Particle<basicThermoParcel> > clone
-        (
-            const Cloud<basicThermoParcel>& c
-        ) const
-        {
-            return autoPtr<Particle<basicThermoParcel> >
-            (
-                new basicThermoParcel
-                (
-                    *this,
-                    static_cast<const ThermoCloud<basicThermoParcel>&>(c)
-                )
-            );
-        }
-
-
-    //- Destructor
-    virtual ~basicThermoParcel();
-};
-
-
-template<>
-inline bool contiguous<basicThermoParcel>()
-{
-    return true;
+    template<>
+    inline bool contiguous<basicThermoParcel>()
+    {
+        return true;
+    }
 }
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C
index 660081b993..5578d45e23 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,14 +24,14 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "basicThermoParcel.H"
-#include "createThermoParcelTypes.H"
+#include "Cloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    createThermoParcelTypes(basicThermoParcel);
+    defineTemplateTypeNameAndDebug(basicThermoParcel, 0);
+    defineTemplateTypeNameAndDebug(Cloud<basicThermoParcel>, 0);
 }
 
-
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
index 91a2c975d4..a7069c7229 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
@@ -23,13 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "basicThermoParcel.H"
+#include "basicThermoCloud.H"
 
 // Kinematic
 #include "makeThermoParcelForces.H" // thermo variant
 #include "makeParcelDispersionModels.H"
 #include "makeParcelInjectionModels.H"
-#include "makeParcelCollisionModels.H"
 #include "makeParcelPatchInteractionModels.H"
 #include "makeParcelPostProcessingModels.H"
 
@@ -42,16 +41,18 @@ License
 namespace Foam
 {
     // Kinematic sub-models
-    makeThermoParcelForces(basicThermoParcel);
-    makeParcelDispersionModels(basicThermoParcel);
-    makeParcelInjectionModels(basicThermoParcel);
-    makeParcelCollisionModels(basicThermoParcel);
-    makeParcelPatchInteractionModels(basicThermoParcel);
-    makeParcelPostProcessingModels(basicThermoParcel);
+    typedef basicThermoCloud::cloudType basicThermoCloud_K;
+
+    // Kinematic sub-models
+    makeThermoParcelForces(basicThermoCloud_K);
+    makeParcelDispersionModels(basicThermoCloud_K);
+    makeParcelInjectionModels(basicThermoCloud_K);
+    makeParcelPatchInteractionModels(basicThermoCloud_K);
+    makeParcelPostProcessingModels(basicThermoCloud_K);
 
     // Thermo sub-models
-    makeParcelHeatTransferModels(basicThermoParcel);
-    makeParcelSurfaceFilmModels(basicThermoParcel);
+    makeParcelHeatTransferModels(basicThermoCloud);
+    makeParcelSurfaceFilmModels(basicThermoCloud_K);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/createKinematicParcelTypes.H b/src/lagrangian/intermediate/parcels/include/createKinematicParcelTypes.H
deleted file mode 100644
index d48969ca74..0000000000
--- a/src/lagrangian/intermediate/parcels/include/createKinematicParcelTypes.H
+++ /dev/null
@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef createKinematicParcelTypes_H
-#define createKinematicParcelTypes_H
-
-#include "KinematicParcel.H"
-#include "KinematicCloud.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#define createKinematicParcelTypes(ParcelType)                                \
-                                                                              \
-    defineTypeNameAndDebug(ParcelType, 0);                                    \
-    defineTemplateTypeNameAndDebug(Particle<ParcelType>, 0);                  \
-    defineTemplateTypeNameAndDebug(Cloud<ParcelType>, 0);                     \
-                                                                              \
-    defineParcelTypeNameAndDebug(KinematicParcel<ParcelType>, 0);             \
-    defineTemplateTypeNameAndDebug(KinematicParcel<ParcelType>, 0);           \
-    defineParcelTypeNameAndDebug(KinematicCloud<ParcelType>, 0);
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/parcels/include/createReactingParcelTypes.H b/src/lagrangian/intermediate/parcels/include/createReactingParcelTypes.H
deleted file mode 100644
index fb06844c9b..0000000000
--- a/src/lagrangian/intermediate/parcels/include/createReactingParcelTypes.H
+++ /dev/null
@@ -1,49 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef createReactingParcelTypes_H
-#define createReactingParcelTypes_H
-
-#include "ReactingParcel.H"
-#include "ReactingCloud.H"
-
-#include "createThermoParcelTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#define createReactingParcelTypes(ParcelType)                                 \
-                                                                              \
-    createThermoParcelTypes(ParcelType);                                      \
-                                                                              \
-    defineParcelTypeNameAndDebug(ReactingParcel<ParcelType>, 0);              \
-    defineTemplateTypeNameAndDebug(ReactingParcel<ParcelType>, 0);            \
-    defineParcelTypeNameAndDebug(ReactingCloud<ParcelType>, 0);
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
index 0c84d934bd..2be052a5c9 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "KinematicCloud.H"
-
 #include "NoCollision.H"
 #include "PairCollision.H"
 
@@ -40,48 +38,18 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelCollisionModels(ParcelType)                                 \
+#define makeParcelCollisionModels(CloudType)                                  \
                                                                               \
-    makeCollisionModel(KinematicCloud<ParcelType>);                           \
+    makeCollisionModel(CloudType);                                            \
+    makeCollisionModelType(NoCollision, CloudType);                           \
+    makeCollisionModelType(PairCollision, CloudType);                         \
                                                                               \
-    makeCollisionModelType                                                    \
-    (                                                                         \
-        NoCollision,                                                          \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
+    makePairModel(CloudType);                                                 \
+    makePairModelType(PairSpringSliderDashpot, CloudType);                    \
                                                                               \
-    makeCollisionModelType                                                    \
-    (                                                                         \
-        PairCollision,                                                        \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-                                                                              \
-    makePairModel(KinematicCloud<ParcelType>);                                \
-                                                                              \
-    makePairModelType                                                         \
-    (                                                                         \
-        PairSpringSliderDashpot,                                              \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-                                                                              \
-    makeWallModel(KinematicCloud<ParcelType>);                                \
-                                                                              \
-    makeWallModelType                                                         \
-    (                                                                         \
-        WallSpringSliderDashpot,                                              \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-                                                                              \
-    makeWallModelType                                                         \
-    (                                                                         \
-        WallLocalSpringSliderDashpot,                                         \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );
+    makeWallModel(CloudType);                                                 \
+    makeWallModelType(WallSpringSliderDashpot, CloudType);                    \
+    makeWallModelType(WallLocalSpringSliderDashpot, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
index 20ed09c36b..61fc12f8ea 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,42 +28,21 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "KinematicCloud.H"
-
 #include "NoDispersion.H"
 #include "GradientDispersionRAS.H"
 #include "StochasticDispersionRAS.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelDispersionModels(ParcelType)                                \
+#define makeParcelDispersionModels(CloudType)                                 \
                                                                               \
-    makeDispersionModel(KinematicCloud<ParcelType>);                          \
+    makeDispersionModel(CloudType);                                           \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug                                       \
-    (                                                                         \
-        DispersionRASModel<KinematicCloud<ParcelType> >,                      \
-        0                                                                     \
-    );                                                                        \
+    defineNamedTemplateTypeNameAndDebug(DispersionRASModel<CloudType>, 0);    \
                                                                               \
-    makeDispersionModelType                                                   \
-    (                                                                         \
-        NoDispersion,                                                         \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeDispersionModelType                                                   \
-    (                                                                         \
-        GradientDispersionRAS,                                                \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeDispersionModelType                                                   \
-    (                                                                         \
-        StochasticDispersionRAS,                                              \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );
+    makeDispersionModelType(NoDispersion, CloudType);                         \
+    makeDispersionModelType(GradientDispersionRAS, CloudType);                \
+    makeDispersionModelType(StochasticDispersionRAS, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelForces.H b/src/lagrangian/intermediate/parcels/include/makeParcelForces.H
index bc04078abd..9ae02038aa 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelForces.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelForces.H
@@ -28,8 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "KinematicCloud.H"
-
 #include "SphereDragForce.H"
 #include "NonSphereDragForce.H"
 
@@ -40,46 +38,15 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelForces(ParcelType)                                          \
+#define makeParcelForces(CloudType)                                           \
                                                                               \
-    makeParticleForceModel(KinematicCloud<ParcelType>);                       \
-                                                                              \
-    makeParticleForceModelType                                                \
-    (                                                                         \
-        SphereDragForce,                                                      \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeParticleForceModelType                                                \
-    (                                                                         \
-        NonSphereDragForce,                                                   \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeParticleForceModelType                                                \
-    (                                                                         \
-        GravityForce,                                                         \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeParticleForceModelType                                                \
-    (                                                                         \
-        ParamagneticForce,                                                    \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeParticleForceModelType                                                \
-    (                                                                         \
-        PressureGradientForce,                                                \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeParticleForceModelType                                                \
-    (                                                                         \
-        SRFForce,                                                             \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );
+    makeParticleForceModel(CloudType);                                        \
+    makeParticleForceModelType(SphereDragForce, CloudType);                   \
+    makeParticleForceModelType(NonSphereDragForce, CloudType);                \
+    makeParticleForceModelType(GravityForce, CloudType);                      \
+    makeParticleForceModelType(ParamagneticForce, CloudType);                 \
+    makeParticleForceModelType(PressureGradientForce, CloudType);             \
+    makeParticleForceModelType(SRFForce, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
index 8218b00a15..41c3c6f8a3 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,29 +28,17 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "ThermoCloud.H"
-
 #include "NoHeatTransfer.H"
 #include "RanzMarshall.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelHeatTransferModels(ParcelType)                              \
+#define makeParcelHeatTransferModels(CloudType)                               \
                                                                               \
-    makeHeatTransferModel(ThermoCloud<ParcelType>);                           \
+    makeHeatTransferModel(CloudType);                                         \
                                                                               \
-    makeHeatTransferModelType                                                 \
-    (                                                                         \
-        NoHeatTransfer,                                                       \
-        ThermoCloud,                                                          \
-        ParcelType                                                            \
-    );                                                                        \
-    makeHeatTransferModelType                                                 \
-    (                                                                         \
-        RanzMarshall,                                                         \
-        ThermoCloud,                                                          \
-        ParcelType                                                            \
-    );
+    makeHeatTransferModelType(NoHeatTransfer, CloudType);                     \
+    makeHeatTransferModelType(RanzMarshall, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
index e235a96aaa..948dd463a6 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
@@ -28,8 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "KinematicCloud.H"
-
 #include "ConeInjection.H"
 #include "FieldActivatedInjection.H"
 #include "InflationInjection.H"
@@ -41,52 +39,17 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelInjectionModels(ParcelType)                                 \
+#define makeParcelInjectionModels(CloudType)                                  \
                                                                               \
-    makeInjectionModel(KinematicCloud<ParcelType>);                           \
+    makeInjectionModel(CloudType);                                            \
                                                                               \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        ConeInjection,                                                        \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        FieldActivatedInjection,                                              \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        InflationInjection,                                                   \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        KinematicLookupTableInjection,                                        \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        ManualInjection,                                                      \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        NoInjection,                                                          \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        PatchInjection,                                                       \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );
+    makeInjectionModelType(ConeInjection, CloudType);                         \
+    makeInjectionModelType(FieldActivatedInjection, CloudType);               \
+    makeInjectionModelType(InflationInjection, CloudType);                    \
+    makeInjectionModelType(KinematicLookupTableInjection, CloudType);         \
+    makeInjectionModelType(ManualInjection, CloudType);                       \
+    makeInjectionModelType(NoInjection, CloudType);                           \
+    makeInjectionModelType(PatchInjection, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
index a7bc0c2617..13697f2092 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "KinematicCloud.H"
-
 #include "LocalInteraction.H"
 #include "NoInteraction.H"
 #include "Rebound.H"
@@ -37,34 +35,14 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelPatchInteractionModels(ParcelType)                          \
+#define makeParcelPatchInteractionModels(CloudType)                           \
                                                                               \
-    makePatchInteractionModel(KinematicCloud<ParcelType>);                    \
+    makePatchInteractionModel(CloudType);                                     \
                                                                               \
-    makePatchInteractionModelType                                             \
-    (                                                                         \
-        LocalInteraction,                                                     \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makePatchInteractionModelType                                             \
-    (                                                                         \
-        NoInteraction,                                                        \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makePatchInteractionModelType                                             \
-    (                                                                         \
-        Rebound,                                                              \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makePatchInteractionModelType                                             \
-    (                                                                         \
-        StandardWallInteraction,                                              \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );
+    makePatchInteractionModelType(LocalInteraction, CloudType);               \
+    makePatchInteractionModelType(NoInteraction, CloudType);                  \
+    makePatchInteractionModelType(Rebound, CloudType);                        \
+    makePatchInteractionModelType(StandardWallInteraction, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H
index 76b81aea20..c366916c53 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,36 +28,19 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "KinematicCloud.H"
-
 #include "NoPostProcessing.H"
 #include "ParticleTracks.H"
 #include "PatchPostProcessing.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelPostProcessingModels(ParcelType)                            \
+#define makeParcelPostProcessingModels(CloudType)                             \
                                                                               \
-    makePostProcessingModel(KinematicCloud<ParcelType>);                      \
+    makePostProcessingModel(CloudType);                                       \
                                                                               \
-    makePostProcessingModelType                                               \
-    (                                                                         \
-        NoPostProcessing,                                                     \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makePostProcessingModelType                                               \
-    (                                                                         \
-        ParticleTracks,                                                       \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makePostProcessingModelType                                               \
-    (                                                                         \
-        PatchPostProcessing,                                                  \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );
+    makePostProcessingModelType(NoPostProcessing, CloudType);                 \
+    makePostProcessingModelType(ParticleTracks, CloudType);                   \
+    makePostProcessingModelType(PatchPostProcessing, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelSurfaceFilmModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelSurfaceFilmModels.H
index 045d26612e..fc53796c39 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelSurfaceFilmModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelSurfaceFilmModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,22 +28,14 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "KinematicCloud.H"
-
 #include "NoSurfaceFilm.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelSurfaceFilmModels(ParcelType)                               \
+#define makeParcelSurfaceFilmModels(CloudType)                                \
                                                                               \
-    makeSurfaceFilmModel(KinematicCloud<ParcelType>);                         \
-                                                                              \
-    makeSurfaceFilmModelType                                                  \
-    (                                                                         \
-        NoSurfaceFilm,                                                        \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );
+    makeSurfaceFilmModel(CloudType);                                          \
+    makeSurfaceFilmModelType(NoSurfaceFilm, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
index 5a49778313..c737cd9cf5 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,29 +28,16 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "ReactingMultiphaseCloud.H"
 #include "NoComposition.H"
 #include "SingleMixtureFraction.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReactingMultiphaseParcelCompositionModels(ParcelType)             \
+#define makeReactingMultiphaseParcelCompositionModels(CloudType)              \
                                                                               \
-    makeCompositionModel(ReactingCloud<ParcelType>);                          \
-                                                                              \
-    makeCompositionModelType                                                  \
-    (                                                                         \
-        NoComposition,                                                        \
-        ReactingCloud,                                                        \
-        ParcelType                                                            \
-    );                                                                        \
-                                                                              \
-    makeCompositionModelType                                                  \
-    (                                                                         \
-        SingleMixtureFraction,                                                \
-        ReactingCloud,                                                        \
-        ParcelType                                                            \
-    );
+    makeCompositionModel(CloudType);                                          \
+    makeCompositionModelType(NoComposition, CloudType);                       \
+    makeCompositionModelType(SingleMixtureFraction, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
index f44f9228a2..e5c91c3c38 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,35 +28,21 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "ReactingMultiphaseCloud.H"
-
 #include "ConstantRateDevolatilisation.H"
 #include "NoDevolatilisation.H"
 #include "SingleKineticRateDevolatilisation.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReactingMultiphaseParcelDevolatilisationModels(ParcelType)        \
+#define makeReactingMultiphaseParcelDevolatilisationModels(CloudType)         \
                                                                               \
-    makeDevolatilisationModel(ReactingMultiphaseCloud<ParcelType>);           \
-                                                                              \
-    makeDevolatilisationModelType                                             \
-    (                                                                         \
-        ConstantRateDevolatilisation,                                         \
-        ReactingMultiphaseCloud,                                              \
-        ParcelType                                                            \
-    );                                                                        \
-    makeDevolatilisationModelType                                             \
-    (                                                                         \
-        NoDevolatilisation,                                                   \
-        ReactingMultiphaseCloud,                                              \
-        ParcelType                                                            \
-    );                                                                        \
+    makeDevolatilisationModel(CloudType);                                     \
+    makeDevolatilisationModelType(ConstantRateDevolatilisation, CloudType);   \
+    makeDevolatilisationModelType(NoDevolatilisation, CloudType);             \
     makeDevolatilisationModelType                                             \
     (                                                                         \
         SingleKineticRateDevolatilisation,                                    \
-        ReactingMultiphaseCloud,                                              \
-        ParcelType                                                            \
+        CloudType                                                             \
     );
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
index b0042f5e44..fc6543fb87 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
@@ -28,9 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "thermoPhysicsTypes.H"
-#include "KinematicCloud.H"
-
 #include "ConeInjection.H"
 #include "FieldActivatedInjection.H"
 #include "ManualInjection.H"
@@ -40,46 +37,15 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReactingMultiphaseParcelInjectionModels(ParcelType)               \
+#define makeReactingMultiphaseParcelInjectionModels(CloudType)                \
                                                                               \
-    makeInjectionModel(KinematicCloud<ParcelType>);                           \
-                                                                              \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        ConeInjection,                                                        \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        FieldActivatedInjection,                                              \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        ManualInjection,                                                      \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        NoInjection,                                                          \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        PatchInjection,                                                       \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        ReactingMultiphaseLookupTableInjection,                               \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );
+    makeInjectionModel(CloudType);                                            \
+    makeInjectionModelType(ConeInjection, CloudType);                         \
+    makeInjectionModelType(FieldActivatedInjection, CloudType);               \
+    makeInjectionModelType(ManualInjection, CloudType);                       \
+    makeInjectionModelType(NoInjection, CloudType);                           \
+    makeInjectionModelType(PatchInjection, CloudType);                        \
+    makeInjectionModelType(ReactingMultiphaseLookupTableInjection, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H
index b548fd2308..eef0df5c90 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,21 +28,14 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "ReactingMultiphaseCloud.H"
 #include "NoSurfaceReaction.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReactingMultiphaseParcelSurfaceReactionModels(ParcelType)         \
+#define makeReactingMultiphaseParcelSurfaceReactionModels(CloudType)          \
                                                                               \
-    makeSurfaceReactionModel(ReactingMultiphaseCloud<ParcelType>);            \
-                                                                              \
-    makeSurfaceReactionModelType                                              \
-    (                                                                         \
-        NoSurfaceReaction,                                                    \
-        ReactingMultiphaseCloud,                                              \
-        ParcelType                                                            \
-    );
+    makeSurfaceReactionModel(CloudType);                                      \
+    makeSurfaceReactionModelType(NoSurfaceReaction, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H
index c68d74ff7f..e1303a3269 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,29 +28,16 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "ReactingCloud.H"
 #include "NoComposition.H"
 #include "SinglePhaseMixture.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReactingParcelCompositionModels(ParcelType)                       \
+#define makeReactingParcelCompositionModels(CloudType)                        \
                                                                               \
-    makeCompositionModel(ReactingCloud<ParcelType>);                          \
-                                                                              \
-    makeCompositionModelType                                                  \
-    (                                                                         \
-        NoComposition,                                                        \
-        ReactingCloud,                                                        \
-        ParcelType                                                            \
-    );                                                                        \
-                                                                              \
-    makeCompositionModelType                                                  \
-    (                                                                         \
-        SinglePhaseMixture,                                                   \
-        ReactingCloud,                                                        \
-        ParcelType                                                            \
-    );
+    makeCompositionModel(CloudType);                                          \
+    makeCompositionModelType(NoComposition, CloudType);                       \
+    makeCompositionModelType(SinglePhaseMixture, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
index 88ff47a40c..2185ebe8a9 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
@@ -28,8 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "KinematicCloud.H"
-
 #include "ConeInjection.H"
 #include "FieldActivatedInjection.H"
 #include "ManualInjection.H"
@@ -39,46 +37,15 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReactingParcelInjectionModels(ParcelType)                         \
+#define makeReactingParcelInjectionModels(CloudType)                          \
                                                                               \
-    makeInjectionModel(KinematicCloud<ParcelType>);                           \
-                                                                              \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        ConeInjection,                                                        \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        FieldActivatedInjection,                                              \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        ManualInjection,                                                      \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        NoInjection,                                                          \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        PatchInjection,                                                       \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeInjectionModelType                                                    \
-    (                                                                         \
-        ReactingLookupTableInjection,                                         \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );
+    makeInjectionModel(CloudType);                                            \
+    makeInjectionModelType(ConeInjection, CloudType);                         \
+    makeInjectionModelType(FieldActivatedInjection, CloudType);               \
+    makeInjectionModelType(ManualInjection, CloudType);                       \
+    makeInjectionModelType(NoInjection, CloudType);                           \
+    makeInjectionModelType(PatchInjection, CloudType);                        \
+    makeInjectionModelType(ReactingLookupTableInjection, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H
index e08e703fdb..16adf2fa07 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,29 +28,16 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "ReactingCloud.H"
-
 #include "NoPhaseChange.H"
 #include "LiquidEvaporation.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReactingParcelPhaseChangeModels(ParcelType)                       \
+#define makeReactingParcelPhaseChangeModels(CloudType)                        \
                                                                               \
-    makePhaseChangeModel(ReactingCloud<ParcelType>);                          \
-                                                                              \
-    makePhaseChangeModelType                                                  \
-    (                                                                         \
-        NoPhaseChange,                                                        \
-        ReactingCloud,                                                        \
-        ParcelType                                                            \
-    );                                                                        \
-    makePhaseChangeModelType                                                  \
-    (                                                                         \
-        LiquidEvaporation,                                                    \
-        ReactingCloud,                                                        \
-        ParcelType                                                            \
-    );
+    makePhaseChangeModel(CloudType);                                          \
+    makePhaseChangeModelType(NoPhaseChange, CloudType);                       \
+    makePhaseChangeModelType(LiquidEvaporation, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelSurfaceFilmModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelSurfaceFilmModels.H
index a7ae4e064e..427e67de9e 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelSurfaceFilmModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelSurfaceFilmModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,29 +28,16 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "KinematicCloud.H"
-
 #include "NoSurfaceFilm.H"
 #include "ThermoSurfaceFilm.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReactingParcelSurfaceFilmModels(ParcelType)                       \
+#define makeReactingParcelSurfaceFilmModels(CloudType)                        \
                                                                               \
-    makeSurfaceFilmModel(KinematicCloud<ParcelType>);                         \
-                                                                              \
-    makeSurfaceFilmModelType                                                  \
-    (                                                                         \
-        NoSurfaceFilm,                                                        \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeSurfaceFilmModelType                                                  \
-    (                                                                         \
-        ThermoSurfaceFilm,                                                    \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );
+    makeSurfaceFilmModel(CloudType);                                          \
+    makeSurfaceFilmModelType(NoSurfaceFilm, CloudType);                       \
+    makeSurfaceFilmModelType(ThermoSurfaceFilm, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H b/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H
index a39f748559..45b4a86215 100644
--- a/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H
+++ b/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H
@@ -28,8 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "KinematicCloud.H"
-
 #include "SphereDragForce.H"
 #include "NonSphereDragForce.H"
 
@@ -41,52 +39,16 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeThermoParcelForces(ParcelType)                                        \
+#define makeThermoParcelForces(CloudType)                                     \
                                                                               \
-    makeParticleForceModel(KinematicCloud<ParcelType>);                       \
-                                                                              \
-    makeParticleForceModelType                                                \
-    (                                                                         \
-        SphereDragForce,                                                      \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeParticleForceModelType                                                \
-    (                                                                         \
-        NonSphereDragForce,                                                   \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeParticleForceModelType                                                \
-    (                                                                         \
-        BrownianMotionForce,                                                  \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeParticleForceModelType                                                \
-    (                                                                         \
-        GravityForce,                                                         \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeParticleForceModelType                                                \
-    (                                                                         \
-        ParamagneticForce,                                                    \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeParticleForceModelType                                                \
-    (                                                                         \
-        PressureGradientForce,                                                \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-    makeParticleForceModelType                                                \
-    (                                                                         \
-        SRFForce,                                                             \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );
+    makeParticleForceModel(CloudType);                                        \
+    makeParticleForceModelType(SphereDragForce, CloudType);                   \
+    makeParticleForceModelType(NonSphereDragForce, CloudType);                \
+    makeParticleForceModelType(BrownianMotionForce, CloudType);               \
+    makeParticleForceModelType(GravityForce, CloudType);                      \
+    makeParticleForceModelType(ParamagneticForce, CloudType);                 \
+    makeParticleForceModelType(PressureGradientForce, CloudType);             \
+    makeParticleForceModelType(SRFForce, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeThermoParcelSurfaceFilmModels.H b/src/lagrangian/intermediate/parcels/include/makeThermoParcelSurfaceFilmModels.H
index bf1ff47a20..05fcdffbef 100644
--- a/src/lagrangian/intermediate/parcels/include/makeThermoParcelSurfaceFilmModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeThermoParcelSurfaceFilmModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,29 +28,17 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "KinematicCloud.H"
 #include "NoSurfaceFilm.H"
 #include "ThermoSurfaceFilm.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelSurfaceFilmModels(ParcelType)                               \
+#define makeParcelSurfaceFilmModels(CloudType)                                \
                                                                               \
-    makeSurfaceFilmModel(KinematicCloud<ParcelType>);                         \
+    makeSurfaceFilmModel(CloudType);                                          \
                                                                               \
-    makeSurfaceFilmModelType                                                  \
-    (                                                                         \
-        NoSurfaceFilm,                                                        \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );                                                                        \
-                                                                              \
-    makeSurfaceFilmModelType                                                  \
-    (                                                                         \
-        ThermoSurfaceFilm,                                                    \
-        KinematicCloud,                                                       \
-        ParcelType                                                            \
-    );
+    makeSurfaceFilmModelType(NoSurfaceFilm, CloudType);                       \
+    makeSurfaceFilmModelType(ThermoSurfaceFilm, CloudType);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
index e51e14afcf..1d8ef2e667 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ class CollisionModel
 public:
 
     //- Runtime type information
-    TypeName("CollisionModel");
+    TypeName("collisionModel");
 
     //- Declare runtime constructor selection table
     declareRunTimeSelectionTable
@@ -146,13 +146,13 @@ public:
     defineTemplateRunTimeSelectionTable(CollisionModel<CloudType>, dictionary);
 
 
-#define makeCollisionModelType(SS, CloudType, ParcelType)                     \
+#define makeCollisionModelType(SS, CloudType)                                 \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
-    CollisionModel<CloudType<ParcelType> >::                                  \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    CollisionModel<CloudType>::                                               \
+        adddictionaryConstructorToTable<SS<CloudType> >                       \
+            add##SS##CloudType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C
index 78f07c0108..6f986e20ed 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,9 +35,9 @@ Foam::CollisionModel<CloudType>::New
     CloudType& owner
 )
 {
-    word modelType(dict.lookup("CollisionModel"));
+    word modelType(dict.lookup("collisionModel"));
 
-    Info<< "Selecting CollisionModel " << modelType << endl;
+    Info<< "Selecting collision model " << modelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(modelType);
@@ -51,9 +51,9 @@ Foam::CollisionModel<CloudType>::New
                 "const dictionary&, "
                 "CloudType&"
             ")"
-        )   << "Unknown CollisionModelType type " << modelType
+        )   << "Unknown collision model type " << modelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid CollisionModel types are:" << nl
+            << "    Valid collision model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
index 4c1e660c77..d21a34463a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -142,7 +142,7 @@ class PairCollision
 public:
 
     //- Runtime type information
-    TypeName("PairCollision");
+    TypeName("pairCollision");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
index bbfb8f4aec..fd809cb6f5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ class PairModel
 public:
 
     //- Runtime type information
-    TypeName("PairModel");
+    TypeName("pairModel");
 
     //- Declare runtime constructor selection table
     declareRunTimeSelectionTable
@@ -155,27 +155,12 @@ public:
     );
 
 
-#define makePairModelType(SS, CloudType, ParcelType)                          \
+#define makePairModelType(SS, CloudType)                                      \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
-    PairModel<CloudType<ParcelType> >::                                       \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
-
-
-#define makePairModelThermoType(SS, CloudType, ParcelType, ThermoType)        \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug                                       \
-    (                                                                         \
-        SS<CloudType<ParcelType<ThermoType> > >,                              \
-        0                                                                     \
-    );                                                                        \
-                                                                              \
-    PairModel<CloudType<ParcelType<ThermoType> > >::                          \
-        adddictionaryConstructorToTable                                       \
-            <SS<CloudType<ParcelType<ThermoType> > > >                        \
-            add##SS##CloudType##ParcelType##ThermoType##ConstructorToTable_;
+    PairModel<CloudType>::adddictionaryConstructorToTable<SS<CloudType> >     \
+        add##SS##CloudType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C
index 2cee6e8981..d0a08c7848 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,10 +35,9 @@ Foam::PairModel<CloudType>::New
     CloudType& owner
 )
 {
-    word PairModelType(dict.lookup("PairModel"));
+    word PairModelType(dict.lookup("pairModel"));
 
-    Info<< "Selecting PairModel " << PairModelType
-        << endl;
+    Info<< "Selecting pair model " << PairModelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(PairModelType);
@@ -52,10 +51,10 @@ Foam::PairModel<CloudType>::New
                 "const dictionary&, "
                 "CloudType&"
             ")"
-        )   << "Unknown PairModelType type "
+        )   << "Unknown pair model type "
             << PairModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid PairModel types are:" << nl
+            << "    Valid pair model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
index 9fba1b35e7..d2c9071ae3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ class PairSpringSliderDashpot
 public:
 
     //- Runtime type information
-    TypeName("PairSpringSliderDashpot");
+    TypeName("pairSpringSliderDashpot");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H
index 4062c9928c..700ce321ab 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,7 +122,7 @@ class WallLocalSpringSliderDashpot
 public:
 
     //- Runtime type information
-    TypeName("WallLocalSpringSliderDashpot");
+    TypeName("wallLocalSpringSliderDashpot");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
index 729a0c8bdf..cd06ec0b89 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ class WallModel
 public:
 
     //- Runtime type information
-    TypeName("WallModel");
+    TypeName("wallModel");
 
     //- Declare runtime constructor selection table
     declareRunTimeSelectionTable
@@ -165,27 +165,12 @@ public:
     );
 
 
-#define makeWallModelType(SS, CloudType, ParcelType)                          \
+#define makeWallModelType(SS, CloudType)                                      \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
-    WallModel<CloudType<ParcelType> >::                                       \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
-
-
-#define makeWallModelThermoType(SS, CloudType, ParcelType, ThermoType)        \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug                                       \
-    (                                                                         \
-        SS<CloudType<ParcelType<ThermoType> > >,                              \
-        0                                                                     \
-    );                                                                        \
-                                                                              \
-    WallModel<CloudType<ParcelType<ThermoType> > >::                          \
-        adddictionaryConstructorToTable                                       \
-            <SS<CloudType<ParcelType<ThermoType> > > >                        \
-            add##SS##CloudType##ParcelType##ThermoType##ConstructorToTable_;
+    WallModel<CloudType>::adddictionaryConstructorToTable<SS<CloudType> >     \
+        add##SS##CloudType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C
index 3cb4cc24d4..ec83515e62 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,10 +35,9 @@ Foam::WallModel<CloudType>::New
     CloudType& owner
 )
 {
-    word WallModelType(dict.lookup("WallModel"));
+    word WallModelType(dict.lookup("wallModel"));
 
-    Info<< "Selecting WallModel " << WallModelType
-        << endl;
+    Info<< "Selecting wall model " << WallModelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(WallModelType);
@@ -52,10 +51,9 @@ Foam::WallModel<CloudType>::New
                 "const dictionary&, "
                 "CloudType&"
             ")"
-        )   << "Unknown WallModelType type "
-            << WallModelType
+        )   << "Unknown wall model type type " << WallModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid WallModel types are:" << nl
+            << "    Valid wall model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
index e11ac0127a..10010c60c3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ class WallSpringSliderDashpot
 public:
 
     //- Runtime type information
-    TypeName("WallSpringSliderDashpot");
+    TypeName("wallSpringSliderDashpot");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
index d5b80000c3..63ad6f0945 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
@@ -53,7 +53,7 @@ class DispersionModel
 public:
 
     //- Runtime type information
-    TypeName("DispersionModel");
+    TypeName("dispersionModel");
 
 
     // Declare runtime constructor selection table
@@ -132,7 +132,7 @@ public:
 
 #define makeDispersionModel(CloudType)                                        \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(DispersionModel<CloudType>, 0);       \
+    defineTemplateTypeNameAndDebug(DispersionModel<CloudType>, 0);            \
                                                                               \
     defineTemplateRunTimeSelectionTable                                       \
     (                                                                         \
@@ -141,13 +141,13 @@ public:
     );
 
 
-#define makeDispersionModelType(SS, CloudType, ParcelType)                    \
+#define makeDispersionModelType(SS, CloudType)                                \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
-    DispersionModel<CloudType<ParcelType> >::                                 \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    DispersionModel<CloudType>::                                              \
+        adddictionaryConstructorToTable<SS<CloudType> >                       \
+            add##SS##CloudType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C
index 75e1b5c9f6..c611ed54d2 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C
@@ -35,9 +35,9 @@ Foam::DispersionModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType(dict.lookup("DispersionModel"));
+    const word modelType(dict.lookup("dispersionModel"));
 
-    Info<< "Selecting DispersionModel " << modelType << endl;
+    Info<< "Selecting dispersion model " << modelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(modelType);
@@ -51,9 +51,9 @@ Foam::DispersionModel<CloudType>::New
                 "const dictionary&, "
                 "CloudType&"
             ")"
-        )   << "Unknown DispersionModel type "
+        )   << "Unknown dispersion model type "
             << modelType << nl << nl
-            << "Valid DispersionModel types are:" << nl
+            << "Valid dispersion model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
index 2f337915dd..2978469249 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
@@ -74,7 +74,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("DispersionRASModel");
+    TypeName("dispersionRASModel");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
index 4b741bb41f..e2cfcda7db 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
@@ -66,7 +66,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("GradientDispersionRAS");
+    TypeName("gradientDispersionRAS");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
index 5ac6cdb1a5..28f7659f66 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
@@ -53,7 +53,7 @@ class StochasticDispersionRAS
 public:
 
     //- Runtime type information
-    TypeName("StochasticDispersionRAS");
+    TypeName("stochasticDispersionRAS");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index c76fcf11b9..a5c9b61d9d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -127,7 +127,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("ConeInjection");
+    TypeName("coneInjection");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index cf5b023995..12c5d6c62e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -129,7 +129,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("FieldActivatedInjection");
+    TypeName("fieldActivatedInjection");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
index ab3f3d1822..dea4777891 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
@@ -125,7 +125,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("InflationInjection");
+    TypeName("inflationInjection");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index adfdd991a2..94b5a3d91b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -91,7 +91,12 @@ void Foam::InjectionModel<CloudType>::writeProps()
         propsDict.add("parcelsAddedTotal", parcelsAddedTotal_);
         propsDict.add("timeStep0", timeStep0_);
 
-        propsDict.regIOobject::write();
+        propsDict.writeObject
+        (
+            IOstream::ASCII,
+            IOstream::currentVersion,
+            this->owner().db().time().writeCompression()
+        );
     }
 }
 
@@ -204,7 +209,7 @@ bool Foam::InjectionModel<CloudType>::findCellAtPosition
 
     const vector p0 = position;
 
-    this->owner().findCellFacePt
+    this->owner().mesh().findCellFacePt
     (
         position,
         cellI,
@@ -571,7 +576,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
                 // Create a new parcel
                 parcelType* pPtr = new parcelType
                 (
-                    td.cloud(),
+                    td.cloud().pMesh(),
                     pos,
                     cellI,
                     tetFaceI,
@@ -671,7 +676,7 @@ void Foam::InjectionModel<CloudType>::injectSteadyState
             // Create a new parcel
             parcelType* pPtr = new parcelType
             (
-                td.cloud(),
+                td.cloud().pMesh(),
                 pos,
                 cellI,
                 tetFaceI,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index 3bbf913d5c..edd4d726f6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -69,6 +69,10 @@ class InjectionModel
 {
 public:
 
+    //- Convenience typedef for parcelType
+    typedef typename CloudType::parcelType parcelType;
+
+
     // Enumerations
 
         //- Parcel basis representation options
@@ -96,9 +100,6 @@ protected:
 
     // Protected data
 
-        //- Convenience typedef for parcel type
-        typedef typename CloudType::parcelType parcelType;
-
         // Global injection properties
 
             //- Start of injection [s]
@@ -192,7 +193,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("InjectionModel");
+    TypeName("injectionModel");
 
     //- Declare runtime constructor selection table
     declareRunTimeSelectionTable
@@ -305,7 +306,7 @@ public:
                 const label parcelI,
                 const label nParcels,
                 const scalar time,
-                typename CloudType::parcelType& parcel
+                parcelType& parcel
             );
 
             //- Flag to identify whether model fully describes the parcel
@@ -332,13 +333,12 @@ public:
     defineTemplateRunTimeSelectionTable(InjectionModel<CloudType>, dictionary);
 
 
-#define makeInjectionModelType(SS, CloudType, ParcelType)                     \
+#define makeInjectionModelType(SS, CloudType)                                 \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
-    InjectionModel<CloudType<ParcelType> >::                                  \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    InjectionModel<CloudType>::adddictionaryConstructorToTable<SS<CloudType> >\
+        add##SS##CloudType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C
index 189704dca3..a67593f6f4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C
@@ -35,9 +35,9 @@ Foam::InjectionModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType(dict.lookup("InjectionModel"));
+    const word modelType(dict.lookup("injectionModel"));
 
-    Info<< "Selecting InjectionModel " << modelType << endl;
+    Info<< "Selecting injection model " << modelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(modelType);
@@ -51,9 +51,9 @@ Foam::InjectionModel<CloudType>::New
                 "const dictionary&, "
                 "CloudType&"
             ")"
-        )   << "Unknown InjectionModel type "
+        )   << "Unknown injection model type "
             << modelType << nl << nl
-            << "Valid InjectionModel types are:" << nl
+            << "Valid injection model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
index 0c84e17ffb..242797a120 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("KinematicLookupTableInjection");
+    TypeName("kinematicLookupTableInjection");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
index c741179e1d..a6437e1f94 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
@@ -99,7 +99,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("ManualInjection");
+    TypeName("manualInjection");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
index 2c1092bc21..c32181e376 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
@@ -108,7 +108,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("PatchInjection");
+    TypeName("patchInjection");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/DragForce/NonSphereDrag/NonSphereDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/DragForce/NonSphereDrag/NonSphereDragForce.C
index 5ee4d8c0b6..888e42abf5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/DragForce/NonSphereDrag/NonSphereDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/DragForce/NonSphereDrag/NonSphereDragForce.C
@@ -28,9 +28,9 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::scalar Foam::NonSphereDragForce<CloudType>::Cd(const scalar Re) const
+Foam::scalar Foam::NonSphereDragForce<CloudType>::CdRe(const scalar Re) const
 {
-    return 24.0/Re*(1.0 + a_*pow(Re, b_)) + Re*c_/(Re + d_);
+    return 24.0*(1.0 + a_*pow(Re, b_)) + Re*c_/(1 + d_/(Re + ROOTVSMALL));
 }
 
 
@@ -93,7 +93,7 @@ Foam::NonSphereDragForce<CloudType>::~NonSphereDragForce()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::forceSuSp Foam::NonSphereDragForce<CloudType>::calcNonCoupled
+Foam::forceSuSp Foam::NonSphereDragForce<CloudType>::calcCoupled
 (
     const typename CloudType::parcelType& p,
     const scalar dt,
@@ -104,8 +104,7 @@ Foam::forceSuSp Foam::NonSphereDragForce<CloudType>::calcNonCoupled
 {
     forceSuSp value(vector::zero, 0.0);
 
-    const scalar ReCorr = max(Re, 1e-6);
-    value.Sp() = mass*0.75*muc*Cd(ReCorr)*ReCorr/(p.rho()*sqr(p.d()));
+    value.Sp() = mass*0.75*muc*CdRe(Re)/(p.rho()*sqr(p.d()));
 
     return value;
 }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/DragForce/NonSphereDrag/NonSphereDragForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/DragForce/NonSphereDrag/NonSphereDragForce.H
index ce886f133b..b84f1cef6f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/DragForce/NonSphereDrag/NonSphereDragForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/DragForce/NonSphereDrag/NonSphereDragForce.H
@@ -97,8 +97,8 @@ protected:
 
     // Private Member Functions
 
-        //- Drag coefficient
-        scalar Cd(const scalar Re) const;
+        //- Drag coefficient multiplied by Reynolds number
+        scalar CdRe(const scalar Re) const;
 
 
 public:
@@ -140,7 +140,7 @@ public:
         // Evaluation
 
             //- Calculate the non-coupled force
-            virtual forceSuSp calcNonCoupled
+            virtual forceSuSp calcCoupled
             (
                 const typename CloudType::parcelType& p,
                 const scalar dt,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/DragForce/SphereDrag/SphereDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/DragForce/SphereDrag/SphereDragForce.C
index da37d5131b..7887c3d027 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/DragForce/SphereDrag/SphereDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/DragForce/SphereDrag/SphereDragForce.C
@@ -28,15 +28,15 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::scalar Foam::SphereDragForce<CloudType>::Cd(const scalar Re) const
+Foam::scalar Foam::SphereDragForce<CloudType>::CdRe(const scalar Re) const
 {
     if (Re > 1000.0)
     {
-        return 0.424;
+        return 0.424*Re;
     }
     else
     {
-        return 24.0/Re*(1.0 + 1.0/6.0*pow(Re, 2.0/3.0));
+        return 24.0*(1.0 + 1.0/6.0*pow(Re, 2.0/3.0));
     }
 }
 
@@ -76,7 +76,7 @@ Foam::SphereDragForce<CloudType>::~SphereDragForce()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::forceSuSp Foam::SphereDragForce<CloudType>::calcNonCoupled
+Foam::forceSuSp Foam::SphereDragForce<CloudType>::calcCoupled
 (
     const typename CloudType::parcelType& p,
     const scalar dt,
@@ -87,8 +87,7 @@ Foam::forceSuSp Foam::SphereDragForce<CloudType>::calcNonCoupled
 {
     forceSuSp value(vector::zero, 0.0);
 
-    const scalar ReCorr = max(Re, 1e-6);
-    value.Sp() = mass*0.75*muc*Cd(ReCorr)*ReCorr/(p.rho()*sqr(p.d()));
+    value.Sp() = mass*0.75*muc*CdRe(Re)/(p.rho()*sqr(p.d()));
 
     return value;
 }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/DragForce/SphereDrag/SphereDragForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/DragForce/SphereDrag/SphereDragForce.H
index f9e2cca78e..484d90a503 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/DragForce/SphereDrag/SphereDragForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/DragForce/SphereDrag/SphereDragForce.H
@@ -49,8 +49,8 @@ class SphereDragForce
 {
     // Private Member Functions
 
-        //- Drag coefficient
-        scalar Cd(const scalar Re) const;
+        //- Drag coefficient multiplied by Reynolds number
+        scalar CdRe(const scalar Re) const;
 
 
 public:
@@ -91,8 +91,8 @@ public:
 
         // Evaluation
 
-            //- Calculate the non-coupled force
-            virtual forceSuSp calcNonCoupled
+            //- Calculate the coupled force
+            virtual forceSuSp calcCoupled
             (
                 const typename CloudType::parcelType& p,
                 const scalar dt,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H
index e06646ca03..2cbca12d10 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H
@@ -206,13 +206,12 @@ public:
     defineTemplateRunTimeSelectionTable(ParticleForce<CloudType>, dictionary);
 
 
-#define makeParticleForceModelType(SS, CloudType, ParcelType)                 \
+#define makeParticleForceModelType(SS, CloudType)                             \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
-    ParticleForce<CloudType<ParcelType> >::                                   \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    ParticleForce<CloudType>::adddictionaryConstructorToTable<SS<CloudType> > \
+        add##SS##CloudType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
index 465dd9b04f..56a9ce61a6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
@@ -48,13 +48,18 @@ Foam::label Foam::LocalInteraction<CloudType>::applyToPatch
 template<class CloudType>
 void Foam::LocalInteraction<CloudType>::readProps()
 {
+    if (!this->owner().solution().transient())
+    {
+        return;
+    }
+
     IOobject propsDictHeader
     (
         "localInteractionProperties",
         this->owner().db().time().timeName(),
         "uniform"/cloud::prefix/this->owner().name(),
         this->owner().db(),
-        IOobject::MUST_READ,
+        IOobject::MUST_READ_IF_MODIFIED,
         IOobject::NO_WRITE,
         false
     );
@@ -62,7 +67,6 @@ void Foam::LocalInteraction<CloudType>::readProps()
     if (propsDictHeader.headerOk())
     {
         const IOdictionary propsDict(propsDictHeader);
-
         propsDict.readIfPresent("nEscape", nEscape0_);
         propsDict.readIfPresent("massEscape", massEscape0_);
         propsDict.readIfPresent("nStick", nStick0_);
@@ -80,6 +84,11 @@ void Foam::LocalInteraction<CloudType>::writeProps
     const scalarList& massStick
 ) const
 {
+    if (!this->owner().solution().transient())
+    {
+        return;
+    }
+
     if (this->owner().db().time().outputTime())
     {
         IOdictionary propsDict
@@ -101,7 +110,12 @@ void Foam::LocalInteraction<CloudType>::writeProps
         propsDict.add("nStick", nStick);
         propsDict.add("massStick", massStick);
 
-        propsDict.regIOobject::write();
+        propsDict.writeObject
+        (
+            IOstream::ASCII,
+            IOstream::currentVersion,
+            this->owner().db().time().writeCompression()
+        );
     }
 }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
index 7360b66f16..42b641aeab 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
@@ -108,7 +108,7 @@ class LocalInteraction
 public:
 
     //- Runtime type information
-    TypeName("LocalInteraction");
+    TypeName("localInteraction");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
index 5d0c848594..e2e1c67d24 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
@@ -47,32 +47,31 @@ Foam::word Foam::PatchInteractionModel<CloudType>::interactionTypeToWord
     const interactionType& itEnum
 )
 {
+    word it = "other";
+
     switch (itEnum)
     {
         case itRebound:
         {
-            return "rebound";
+            it = "rebound";
             break;
         }
         case itStick:
         {
-            return "stick";
+            it = "stick";
             break;
         }
         case itEscape:
         {
-            return "escape";
+            it = "escape";
             break;
         }
         default:
         {
-            return "other";
         }
     }
-#ifdef __ICC
-    // Prevent Icc complaining about missing return statement.
-    return word::null;
-#endif
+
+    return it;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
index 45e36a68d3..f95a9802bb 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
@@ -85,7 +85,7 @@ private:
 public:
 
     //- Runtime type information
-    TypeName("PatchInteractionModel");
+    TypeName("patchInteractionModel");
 
     //- Declare runtime constructor selection table
     declareRunTimeSelectionTable
@@ -201,13 +201,13 @@ public:
     );
 
 
-#define makePatchInteractionModelType(SS, CloudType, ParcelType)              \
+#define makePatchInteractionModelType(SS, CloudType)                          \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
-    PatchInteractionModel<CloudType<ParcelType> >::                           \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    PatchInteractionModel<CloudType>::                                        \
+        adddictionaryConstructorToTable<SS<CloudType> >                       \
+            add##SS##CloudType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C
index e8b8f4fd99..3080a13013 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,9 +35,9 @@ Foam::PatchInteractionModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType(dict.lookup("PatchInteractionModel"));
+    const word modelType(dict.lookup("patchInteractionModel"));
 
-    Info<< "Selecting PatchInteractionModel " << modelType << endl;
+    Info<< "Selecting patch interaction model " << modelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(modelType);
@@ -51,9 +51,9 @@ Foam::PatchInteractionModel<CloudType>::New
                 "const dictionary&, "
                 "CloudType&"
             ")"
-        )   << "Unknown PatchInteractionModel type "
+        )   << "Unknown patch interaction model type "
             << modelType << nl << nl
-            << "Valid PatchInteractionModel types are:" << nl
+            << "Valid patch interaction model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
index a79ea75824..a2fe59b0e1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
@@ -57,7 +57,7 @@ class Rebound
 public:
 
     //- Runtime type information
-    TypeName("Rebound");
+    TypeName("rebound");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
index dd89d28927..39551d0503 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
@@ -25,6 +25,83 @@ License
 
 #include "StandardWallInteraction.H"
 
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::StandardWallInteraction<CloudType>::readProps()
+{
+    if (!this->owner().solution().transient())
+    {
+        return;
+    }
+
+    IOobject propsDictHeader
+    (
+        "standardWallInteractionProperties",
+        this->owner().db().time().timeName(),
+        "uniform"/cloud::prefix/this->owner().name(),
+        this->owner().db(),
+        IOobject::MUST_READ_IF_MODIFIED,
+        IOobject::NO_WRITE,
+        false
+    );
+
+    if (propsDictHeader.headerOk())
+    {
+        const IOdictionary propsDict(propsDictHeader);
+        propsDict.readIfPresent("nEscape", nEscape0_);
+        propsDict.readIfPresent("massEscape", massEscape0_);
+        propsDict.readIfPresent("nStick", nStick0_);
+        propsDict.readIfPresent("massStick", massStick0_);
+    }
+}
+
+
+template<class CloudType>
+void Foam::StandardWallInteraction<CloudType>::writeProps
+(
+    const label nEscape,
+    const scalar massEscape,
+    const label nStick,
+    const scalar massStick
+) const
+{
+    if (!this->owner().solution().transient())
+    {
+        return;
+    }
+
+    if (this->owner().db().time().outputTime())
+    {
+        IOdictionary propsDict
+        (
+            IOobject
+            (
+                "standardWallInteractionProperties",
+                this->owner().db().time().timeName(),
+                "uniform"/cloud::prefix/this->owner().name(),
+                this->owner().db(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            )
+        );
+
+        propsDict.add("nEscape", nEscape);
+        propsDict.add("massEscape", massEscape);
+        propsDict.add("nStick", nStick);
+        propsDict.add("massStick", massStick);
+
+        propsDict.writeObject
+        (
+            IOstream::ASCII,
+            IOstream::currentVersion,
+            this->owner().db().time().writeCompression()
+        );
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class CloudType>
@@ -40,7 +117,15 @@ Foam::StandardWallInteraction<CloudType>::StandardWallInteraction
         this->wordToInteractionType(this->coeffDict().lookup("type"))
     ),
     e_(0.0),
-    mu_(0.0)
+    mu_(0.0),
+    nEscape0_(0),
+    massEscape0_(0.0),
+    nStick0_(0),
+    massStick0_(0.0),
+    nEscape_(0),
+    massEscape_(0.0),
+    nStick_(0),
+    massStick_(0.0)
 {
     switch (interactionType_)
     {
@@ -85,7 +170,15 @@ Foam::StandardWallInteraction<CloudType>::StandardWallInteraction
     PatchInteractionModel<CloudType>(pim),
     interactionType_(pim.interactionType_),
     e_(pim.e_),
-    mu_(pim.mu_)
+    mu_(pim.mu_),
+    nEscape0_(pim.nEscape0_),
+    massEscape0_(pim.massEscape0_),
+    nStick0_(pim.nStick0_),
+    massStick0_(pim.massStick0_),
+    nEscape_(pim.nEscape_),
+    massEscape_(pim.massEscape_),
+    nStick_(pim.nStick_),
+    massStick_(pim.massStick_)
 {}
 
 
@@ -121,6 +214,7 @@ bool Foam::StandardWallInteraction<CloudType>::correct
                 keepParticle = false;
                 active = false;
                 U = vector::zero;
+                nEscape_++;
                 break;
             }
             case PatchInteractionModel<CloudType>::itStick:
@@ -128,6 +222,7 @@ bool Foam::StandardWallInteraction<CloudType>::correct
                 keepParticle = true;
                 active = false;
                 U = vector::zero;
+                nStick_++;
                 break;
             }
             case PatchInteractionModel<CloudType>::itRebound:
@@ -183,4 +278,21 @@ bool Foam::StandardWallInteraction<CloudType>::correct
 }
 
 
+template<class CloudType>
+void Foam::StandardWallInteraction<CloudType>::info(Ostream& os) const
+{
+    label npe = returnReduce(nEscape_, sumOp<label>()) + nEscape0_;
+    scalar mpe = returnReduce(massEscape_, sumOp<scalar>()) + massEscape0_;
+
+    label nps = returnReduce(nStick_, sumOp<label>()) + nStick0_;
+    scalar mps = returnReduce(massStick_, sumOp<scalar>()) + massStick0_;
+
+    os  << "    Parcel fates:" << nl
+        << "      - escape                      = " << npe << ", " << mpe << nl
+        << "      - stick                       = " << nps << ", " << mps << nl;
+
+    writeProps(npe, mpe, nps, mps);
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
index 60421a08c7..bc7d52b383 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
@@ -74,10 +74,55 @@ protected:
         scalar mu_;
 
 
+        // Counters for initial particle fates
+
+            //- Number of parcels escaped
+            label nEscape0_;
+
+            //- Mass of parcels escaped
+            scalar massEscape0_;
+
+            //- Number of parcels stuck to patches
+            label nStick0_;
+
+            //- Mass of parcels stuck to patches
+            scalar massStick0_;
+
+
+        // Counters for particle fates
+
+            //- Number of parcels escaped
+            label nEscape_;
+
+            //- Mass of parcels escaped
+            scalar massEscape_;
+
+            //- Number of parcels stuck to patches
+            label nStick_;
+
+            //- Mass of parcels stuck to patches
+            scalar massStick_;
+
+
+    // Protected Member Functions
+
+        //- Read interaction properties from file
+        void readProps();
+
+        //- Write interaction properties to file
+        void writeProps
+        (
+            const label nEscape,
+            const scalar massEscape,
+            const label nStick,
+            const scalar massStick
+        ) const;
+
+
 public:
 
     //- Runtime type information
-    TypeName("StandardWallInteraction");
+    TypeName("standardWallInteraction");
 
 
     // Constructors
@@ -114,6 +159,12 @@ public:
             const scalar trackFraction,
             const tetIndices& tetIs
         );
+
+
+        // I-O
+
+            //- Write patch interaction info to stream
+            virtual void info(Ostream& os) const;
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.C
index 799afdfa4c..65c2d49487 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -137,7 +137,7 @@ void Foam::ParticleTracks<CloudType>::postFace(const parcelType& p)
         {
             cloudPtr_->append
             (
-                static_cast<parcelType*>(p.clone(cloudPtr_()).ptr())
+                static_cast<parcelType*>(p.clone(this->owner().mesh()).ptr())
             );
         }
     }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.H
index 6bdb3d7478..1e1265ff3d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,7 +89,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("ParticleTracks");
+    TypeName("particleTracks");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H
index fbfd6b6231..df075084d4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,7 +53,7 @@ class PatchPostProcessing
 {
     // Private data
 
-        typedef typename CloudType::parcelType parcelType;
+        typedef typename CloudType::particleType parcelType;
 
         //- Maximum number of parcels to store
         label maxStoredParcels_;
@@ -85,7 +85,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("PatchPostProcessing");
+    TypeName("patchPostProcessing");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H
index ba8f3bb9ef..bb1352302c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ class PostProcessingModel
 public:
 
     //- Runtime type information
-    TypeName("PostProcessingModel");
+    TypeName("postProcessingModel");
 
     //- Declare runtime constructor selection table
     declareRunTimeSelectionTable
@@ -154,13 +154,13 @@ public:
     );
 
 
-#define makePostProcessingModelType(SS, CloudType, ParcelType)                \
+#define makePostProcessingModelType(SS, CloudType)                            \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
-    PostProcessingModel<CloudType<ParcelType> >::                             \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    PostProcessingModel<CloudType>::                                          \
+        adddictionaryConstructorToTable<SS<CloudType> >                       \
+            add##SS##CloudType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C
index 111d6bcbee..d74ec05353 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,9 +35,9 @@ Foam::PostProcessingModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType(dict.lookup("PostProcessingModel"));
+    const word modelType(dict.lookup("postProcessingModel"));
 
-    Info<< "Selecting PostProcessingModel " << modelType << endl;
+    Info<< "Selecting post-processing model " << modelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(modelType);
@@ -51,9 +51,9 @@ Foam::PostProcessingModel<CloudType>::New
                 "const dictionary&, "
                 "CloudType&"
             ")"
-        )   << "Unknown PostProcessingModel type "
+        )   << "Unknown post-processing model type "
             << modelType << nl << nl
-            << "Valid PostProcessingModel types are:" << nl
+            << "Valid post-processing model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
index a454c5daad..38fa34ccf7 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -149,7 +149,7 @@ void Foam::SurfaceFilmModel<CloudType>::inject(TrackData& td)
         const directMappedWallPolyPatch& wpp =
             refCast<const directMappedWallPolyPatch>
             (
-                 this->owner().mesh().boundaryMesh()[primaryPatchI]
+                this->owner().mesh().boundaryMesh()[primaryPatchI]
             );
 
         const labelList& injectorCellsPatch = wpp.faceCells();
@@ -177,10 +177,10 @@ void Foam::SurfaceFilmModel<CloudType>::inject(TrackData& td)
                 const point& pos = this->owner().mesh().C()[cellI];
 
                 // Create a new parcel
-                typename CloudType::parcelType* pPtr =
-                    new typename CloudType::parcelType
+                parcelType* pPtr =
+                    new parcelType
                     (
-                        td.cloud(),
+                        this->owner().pMesh(),
                         pos,
                         cellI,
                         tetFaceI,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
index 35c4157512..fe4de983b9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,7 +128,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("SurfaceFilmModel");
+    TypeName("surfaceFilmModel");
 
     //- Declare runtime constructor selection table
     declareRunTimeSelectionTable
@@ -249,13 +249,13 @@ public:
     );
 
 
-#define makeSurfaceFilmModelType(SS, CloudType, ParcelType)                   \
+#define makeSurfaceFilmModelType(SS, CloudType)                               \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
-    SurfaceFilmModel<CloudType<ParcelType> >::                                \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    SurfaceFilmModel<CloudType>::                                             \
+        adddictionaryConstructorToTable<SS<CloudType> >                       \
+            add##SS##CloudType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C
index 4916a99e2d..527bf0b36e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,9 +36,9 @@ Foam::SurfaceFilmModel<CloudType>::New
     const dimensionedVector& g
 )
 {
-    const word modelType(dict.lookup("SurfaceFilmModel"));
+    const word modelType(dict.lookup("surfaceFilmModel"));
 
-    Info<< "Selecting SurfaceFilmModel " << modelType << endl;
+    Info<< "Selecting surface film model " << modelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(modelType);
@@ -52,9 +52,9 @@ Foam::SurfaceFilmModel<CloudType>::New
                 "const dictionary&, "
                 "CloudType&"
             ")"
-        )   << "Unknown SurfaceFilmModel type "
+        )   << "Unknown surface film model type "
             << modelType << nl << nl
-            << "Valid SurfaceFilmModel types are:" << nl
+            << "Valid surface film model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index 04ec177d1c..2f38ff6a15 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -72,7 +72,7 @@ class CompositionModel
 public:
 
     //- Runtime type information
-    TypeName("CompositionModel");
+    TypeName("compositionModel");
 
     //- Declare runtime constructor selection table
     declareRunTimeSelectionTable
@@ -280,13 +280,13 @@ public:
     );
 
 
-#define makeCompositionModelType(SS, CloudType, ParcelType)                   \
+#define makeCompositionModelType(SS, CloudType)                               \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
-    CompositionModel<CloudType<ParcelType> >::                                \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    CompositionModel<CloudType>::                                             \
+        adddictionaryConstructorToTable<SS<CloudType> >                       \
+            add##SS##CloudType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C
index e97728a6c8..e66ff5d54e 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,9 +35,9 @@ Foam::CompositionModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType(dict.lookup("CompositionModel"));
+    const word modelType(dict.lookup("compositionModel"));
 
-    Info<< "Selecting CompositionModel " << modelType << endl;
+    Info<< "Selecting composition model " << modelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(modelType);
@@ -51,9 +51,9 @@ Foam::CompositionModel<CloudType>::New
                 "const dictionary&, "
                 "CloudType&"
             ")"
-        )   << "Unknown CompositionModel type "
+        )   << "Unknown composition model type "
             << modelType << nl << nl
-            << "Valid CompositionModel types are:" << nl
+            << "Valid composition model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
index 5b1186b3d1..b3d659b64b 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,7 +81,7 @@ class SingleMixtureFraction
 public:
 
     //- Runtime type information
-    TypeName("SingleMixtureFraction");
+    TypeName("singleMixtureFraction");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
index 0c58c923c7..06ea62c261 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ class SinglePhaseMixture
 public:
 
     //- Runtime type information
-    TypeName("SinglePhaseMixture");
+    TypeName("singlePhaseMixture");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
index a65a19588c..d132886b1a 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("ReactingLookupTableInjection");
+    TypeName("reactingLookupTableInjection");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index 6b72e9db0c..60c394e6a6 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -194,5 +194,50 @@ void Foam::LiquidEvaporation<CloudType>::calculate
     }
 }
 
+template<class CloudType>
+Foam::scalar Foam::LiquidEvaporation<CloudType>::dh
+(
+    const label idc,
+    const label idl,
+    const label p,
+    const label T
+) const
+{
+    scalar dh = 0;
+
+    typedef PhaseChangeModel<CloudType> parent;
+    switch (parent::enthalpyTransfer_)
+    {
+        case (parent::etLatentHeat):
+        {
+            dh = liquids_.properties()[idl].hl(p, T);
+            break;
+        }
+        case (parent::etEnthalpyDifference):
+        {
+            scalar hc = this->owner().composition().carrier().H(idc, T);
+            scalar hp = liquids_.properties()[idl].h(p, T);
+
+            dh = hc - hp;
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "Foam::scalar Foam::LiquidEvaporation<CloudType>::dh"
+                "("
+                    "const label, "
+                    "const label, "
+                    "const label, "
+                    "const label"
+                ")"
+            )   << "Unknown enthalpyTransfer type" << abort(FatalError);
+        }
+    }
+
+    return dh;
+}
+
 
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index 8c66c4fbbd..224aa08eae 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -78,7 +78,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("LiquidEvaporation");
+    TypeName("liquidEvaporation");
 
 
     // Constructors
@@ -118,6 +118,15 @@ public:
             const scalar pc,
             scalarField& dMassPC
         ) const;
+
+        //- Return the enthalpy per unit mass
+        virtual scalar dh
+        (
+            const label idc,
+            const label idl,
+            const label p,
+            const label T
+        ) const;
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
index 9d5db2b560..fb5ca61ec1 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,6 +156,19 @@ void Foam::PhaseChangeModel<CloudType>::calculate
 }
 
 
+template<class CloudType>
+Foam::scalar Foam::PhaseChangeModel<CloudType>::dh
+(
+    const label idc,
+    const label idl,
+    const label p,
+    const label T
+) const
+{
+    return 0.0;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "PhaseChangeModelNew.C"
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index 5ca5cd651d..e0e161c846 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("PhaseChangeModel");
+    TypeName("phaseChangeModel");
 
     //- Declare runtime constructor selection table
     declareRunTimeSelectionTable
@@ -165,6 +165,15 @@ public:
             const scalar pc,
             scalarField& dMassPC
         ) const;
+
+        //- Return the enthalpy per unit mass
+        virtual scalar dh
+        (
+            const label idc,
+            const label idl,
+            const label p,
+            const label T
+        ) const;
 };
 
 
@@ -185,13 +194,13 @@ public:
     );
 
 
-#define makePhaseChangeModelType(SS, CloudType, ParcelType)                   \
+#define makePhaseChangeModelType(SS, CloudType)                               \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
-    PhaseChangeModel<CloudType<ParcelType> >::                                \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    PhaseChangeModel<CloudType>::                                             \
+        adddictionaryConstructorToTable<SS<CloudType> >                       \
+            add##SS##CloudType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C
index 9931cc93ab..1922dd04ea 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,9 +35,9 @@ Foam::PhaseChangeModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType(dict.lookup("PhaseChangeModel"));
+    const word modelType(dict.lookup("phaseChangeModel"));
 
-    Info<< "Selecting PhaseChangeModel " << modelType << endl;
+    Info<< "Selecting phase change model " << modelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(modelType);
@@ -51,9 +51,9 @@ Foam::PhaseChangeModel<CloudType>::New
                 "const dictionary&, "
                 "CloudType&"
             ")"
-        )   << "Unknown PhaseChangeModel type "
+        )   << "Unknown phase change model type "
             << modelType << nl << nl
-            << "Valid PhaseChangeModel types are:" << nl
+            << "Valid phase change model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
index 98f664a5b0..ac7a3a6bd9 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,7 @@ class ConstantRateDevolatilisation
 public:
 
     //- Runtime type information
-    TypeName("ConstantRateDevolatilisation");
+    TypeName("constantRateDevolatilisation");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
index c376b3a0a9..697c5ce76b 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ class DevolatilisationModel
 public:
 
     //- Runtime type information
-    TypeName("DevolatilisationModel");
+    TypeName("devolatilisationModel");
 
     //- Declare runtime constructor selection table
     declareRunTimeSelectionTable
@@ -145,13 +145,13 @@ public:
     );
 
 
-#define makeDevolatilisationModelType(SS, CloudType, ParcelType)              \
+#define makeDevolatilisationModelType(SS, CloudType)                          \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
-    DevolatilisationModel<CloudType<ParcelType> >::                           \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    DevolatilisationModel<CloudType>::                                        \
+        adddictionaryConstructorToTable<SS<CloudType> >                       \
+            add##SS##CloudType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C
index 2ae1ee3b2a..eef80d948b 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,9 +35,9 @@ Foam::DevolatilisationModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType(dict.lookup("DevolatilisationModel"));
+    const word modelType(dict.lookup("devolatilisationModel"));
 
-    Info<< "Selecting DevolatilisationModel " << modelType << endl;
+    Info<< "Selecting devolatilisation model " << modelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(modelType);
@@ -51,9 +51,9 @@ Foam::DevolatilisationModel<CloudType>::New
                 "const dictionary&, "
                 "CloudType&"
             ")"
-        )   << "Unknown DevolatilisationModel type "
+        )   << "Unknown devolatilisation model type "
             << modelType << nl << nl
-            << "Valid DevolatilisationModel types are:" << nl
+            << "Valid devolatilisation model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
index c0534b9f5e..55483674a4 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -191,7 +191,7 @@ class SingleKineticRateDevolatilisation
 public:
 
     //- Runtime type information
-    TypeName("SingleKineticRateDevolatilisation");
+    TypeName("singleKineticRateDevolatilisation");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
index 807630b2c2..00c8c18734 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,7 +111,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("ReactingMultiphaseLookupTableInjection");
+    TypeName("reactingMultiphaseLookupTableInjection");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
index ff60f44a5a..a8b975c137 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
@@ -59,7 +59,7 @@ class SurfaceReactionModel
 public:
 
     //-Runtime type information
-    TypeName("SurfaceReactionModel");
+    TypeName("surfaceReactionModel");
 
 
     //- Declare runtime constructor selection table
@@ -158,13 +158,13 @@ public:
     );
 
 
-#define makeSurfaceReactionModelType(SS, CloudType, ParcelType)               \
+#define makeSurfaceReactionModelType(SS, CloudType)                           \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
-    SurfaceReactionModel<CloudType<ParcelType> >::                            \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    SurfaceReactionModel<CloudType>::                                         \
+        adddictionaryConstructorToTable<SS<CloudType> >                       \
+            add##SS##CloudType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C
index 3369cf5b08..9c93a2d80a 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C
@@ -35,9 +35,9 @@ Foam::SurfaceReactionModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType(dict.lookup("SurfaceReactionModel"));
+    const word modelType(dict.lookup("surfaceReactionModel"));
 
-    Info<< "Selecting SurfaceReactionModel " << modelType << endl;
+    Info<< "Selecting surface reaction model " << modelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(modelType);
@@ -51,9 +51,9 @@ Foam::SurfaceReactionModel<CloudType>::New
                 "const dictionary&, "
                 "CloudType&"
             ")"
-        )   << "Unknown SurfaceReactionModel type "
+        )   << "Unknown surface reaction model type "
             << modelType << nl << nl
-            << "Valid SurfaceReactionModel types are:" << nl
+            << "Valid surface reaction model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
index 2e670c6623..9769f80941 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
@@ -64,7 +64,7 @@ class HeatTransferModel
 public:
 
     //- Runtime type information
-    TypeName("HeatTransferModel");
+    TypeName("heatTransferModel");
 
     //- Declare runtime constructor selection table
     declareRunTimeSelectionTable
@@ -164,13 +164,13 @@ public:
     );
 
 
-#define makeHeatTransferModelType(SS, CloudType, ParcelType)                  \
+#define makeHeatTransferModelType(SS, CloudType)                              \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
-    HeatTransferModel<CloudType<ParcelType> >::                               \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    HeatTransferModel<CloudType>::                                            \
+        adddictionaryConstructorToTable<SS<CloudType> >                       \
+            add##SS##CloudType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C
index bcb6c2e4f2..cb051e87e9 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C
@@ -35,9 +35,9 @@ Foam::HeatTransferModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType(dict.lookup("HeatTransferModel"));
+    const word modelType(dict.lookup("heatTransferModel"));
 
-    Info<< "Selecting HeatTransferModel " << modelType << endl;
+    Info<< "Selecting heat transfer model " << modelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(modelType);
@@ -51,9 +51,9 @@ Foam::HeatTransferModel<CloudType>::New
                 "const dictionary&, "
                 "CloudType&"
             ")"
-        )   << "Unknown HeatTransferModel type "
+        )   << "Unknown heat transfer model type "
             << modelType << nl << nl
-            << "Valid HeatTransferModel types are:" << nl
+            << "Valid heat transfer model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
index cf7277428f..d3d5dfb929 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,7 +107,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("ThermoLookupTableInjection");
+    TypeName("thermoLookupTableInjection");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
index 84dc17c90d..6958547647 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
@@ -446,7 +446,7 @@ void Foam::ThermoSurfaceFilm<CloudType>::splashInteraction
         // Create a new parcel by copying source parcel
         parcelType* pPtr = new parcelType(p);
 
-        pPtr->origId() = this->owner().getNewParticleID();
+        pPtr->origId() = pPtr->getNewParticleID();
 
         pPtr->origProc() = Pstream::myProcNo();
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
index fa1b6a1af2..8aa316a6d5 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -242,7 +242,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("ThermoSurfaceFilm");
+    TypeName("thermoSurfaceFilm");
 
 
     // Constructors
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
index 7742ecc886..1163d3f184 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,29 +63,14 @@ Foam::tensor Foam::molecule::rotationTensorZ(scalar phi) const
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::molecule::trackData::trackData
-(
-    moleculeCloud& molCloud,
-    label part
-)
-:
-    Particle<molecule>::trackData(molCloud),
-    molCloud_(molCloud),
-    part_(part)
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-
-bool Foam::molecule::move(molecule::trackData& td, const scalar trackTime)
+bool Foam::molecule::move(molecule::trackingData& td, const scalar trackTime)
 {
     td.switchProcessor = false;
     td.keepParticle = true;
 
-    const constantProperties& constProps(td.molCloud().constProps(id_));
+    const constantProperties& constProps(td.cloud().constProps(id_));
 
     if (td.part() == 0)
     {
@@ -195,9 +180,8 @@ bool Foam::molecule::move(molecule::trackData& td, const scalar trackTime)
     }
     else
     {
-        FatalErrorIn("molecule::move(molecule::trackData& td)") << nl
-            << td.part()
-            << " is an invalid part of the integration method."
+        FatalErrorIn("molecule::move(trackingData&, const scalar)") << nl
+            << td.part() << " is an invalid part of the integration method."
             << abort(FatalError);
     }
 
@@ -207,7 +191,7 @@ bool Foam::molecule::move(molecule::trackData& td, const scalar trackTime)
 
 void Foam::molecule::transformProperties(const tensor& T)
 {
-    Particle<molecule>::transformProperties(T);
+    particle::transformProperties(T);
 
     Q_ = T & Q_;
 
@@ -229,7 +213,7 @@ void Foam::molecule::transformProperties(const tensor& T)
 
 void Foam::molecule::transformProperties(const vector& separation)
 {
-    Particle<molecule>::transformProperties(separation);
+    particle::transformProperties(separation);
 
     if (special_ == SPECIAL_TETHERED)
     {
@@ -257,20 +241,7 @@ void Foam::molecule::setSiteSizes(label size)
 bool Foam::molecule::hitPatch
 (
     const polyPatch&,
-    molecule::trackData&,
-    const label,
-    const scalar,
-    const tetIndices&
-)
-{
-    return false;
-}
-
-
-bool Foam::molecule::hitPatch
-(
-    const polyPatch&,
-    int&,
+    trackingData&,
     const label,
     const scalar,
     const tetIndices&
@@ -283,25 +254,17 @@ bool Foam::molecule::hitPatch
 void Foam::molecule::hitProcessorPatch
 (
     const processorPolyPatch&,
-    molecule::trackData& td
+    trackingData& td
 )
 {
     td.switchProcessor = true;
 }
 
 
-void Foam::molecule::hitProcessorPatch
-(
-    const processorPolyPatch&,
-    int&
-)
-{}
-
-
 void Foam::molecule::hitWallPatch
 (
     const wallPolyPatch& wpp,
-    molecule::trackData& td,
+    trackingData& td,
     const tetIndices& tetIs
 )
 {
@@ -320,31 +283,14 @@ void Foam::molecule::hitWallPatch
 }
 
 
-void Foam::molecule::hitWallPatch
-(
-    const wallPolyPatch&,
-    int&,
-    const tetIndices&
-)
-{}
-
-
 void Foam::molecule::hitPatch
 (
     const polyPatch&,
-    molecule::trackData& td
+    trackingData& td
 )
 {
     td.keepParticle = false;
 }
 
 
-void Foam::molecule::hitPatch
-(
-    const polyPatch&,
-    int&
-)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
index 622f8376b3..f2d5d758aa 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ SourceFiles
 #ifndef molecule_H
 #define molecule_H
 
-#include "Particle.H"
+#include "particle.H"
 #include "IOstream.H"
 #include "autoPtr.H"
 #include "diagTensor.H"
@@ -56,7 +56,7 @@ class moleculeCloud;
 
 class molecule
 :
-    public Particle<molecule>
+    public particle
 {
 
 public:
@@ -76,7 +76,6 @@ public:
     //- Class to hold molecule constant properties
     class constantProperties
     {
-
         // Private data
 
             Field<vector> siteReferencePositions_;
@@ -95,6 +94,7 @@ public:
 
             scalar mass_;
 
+
         // Private Member Functions
 
             void checkSiteListSizes() const;
@@ -150,12 +150,10 @@ public:
 
 
     //- Class used to pass tracking data to the trackToFace function
-    class trackData
+    class trackingData
     :
-        public Particle<molecule>::trackData
+        public particle::TrackingData<moleculeCloud>
     {
-        moleculeCloud& molCloud_;
-
         // label specifying which part of the integration algorithm is taking
         label part_;
 
@@ -164,17 +162,18 @@ public:
 
         // Constructors
 
-            trackData
-            (
-                moleculeCloud& molCloud,
-                label part
-            );
+            trackingData(moleculeCloud& cloud, label part)
+            :
+                particle::TrackingData<moleculeCloud>(cloud),
+                part_(part)
+            {}
 
         // Member functions
 
-            inline moleculeCloud& molCloud();
-
-            inline label part() const;
+            inline label part() const
+            {
+                return part_;
+            }
     };
 
 
@@ -226,7 +225,7 @@ public:
         //- Construct from components
         inline molecule
         (
-            const Cloud<molecule>& c,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             const label tetFaceI,
@@ -245,23 +244,42 @@ public:
         //- Construct from Istream
         molecule
         (
-            const Cloud<molecule>& c,
+            const polyMesh& mesh,
             Istream& is,
             bool readFields = true
         );
 
         //- Construct and return a clone
-        autoPtr<Particle<molecule> > clone() const
+        autoPtr<particle> clone() const
         {
-            return autoPtr<Particle<molecule> >(new molecule(*this));
+            return autoPtr<particle>(new molecule(*this));
         }
 
+        //- Factory class to read-construct particles used for
+        //  parallel transfer
+        class iNew
+        {
+            const polyMesh& mesh_;
+
+        public:
+
+            iNew(const polyMesh& mesh)
+            :
+                mesh_(mesh)
+            {}
+
+            autoPtr<molecule> operator()(Istream& is) const
+            {
+                return autoPtr<molecule>(new molecule(mesh_, is, true));
+            }
+        };
+
 
     // Member Functions
 
         // Tracking
 
-            bool move(trackData&, const scalar trackTime);
+            bool move(trackingData&, const scalar trackTime);
 
             void transformProperties(const tensor& T);
 
@@ -318,18 +336,7 @@ public:
         bool hitPatch
         (
             const polyPatch&,
-            molecule::trackData& td,
-            const label patchI,
-            const scalar trackFraction,
-            const tetIndices& tetIs
-        );
-
-        //- Overridable function to handle the particle hitting a patch
-        //  Executed before other patch-hitting functions without trackData
-        bool hitPatch
-        (
-            const polyPatch& p,
-            int& td,
+            trackingData& td,
             const label patchI,
             const scalar trackFraction,
             const tetIndices& tetIs
@@ -339,31 +346,14 @@ public:
         void hitProcessorPatch
         (
             const processorPolyPatch&,
-            molecule::trackData& td
-        );
-
-        //- Overridable function to handle the particle hitting a processorPatch
-        //  without trackData
-        void hitProcessorPatch
-        (
-            const processorPolyPatch&,
-            int&
+            trackingData& td
         );
 
         //- Overridable function to handle the particle hitting a wallPatch
         void hitWallPatch
         (
             const wallPolyPatch&,
-            molecule::trackData& td,
-            const tetIndices&
-        );
-
-        //- Overridable function to handle the particle hitting a wallPatch
-        //  without trackData
-        void hitWallPatch
-        (
-            const wallPolyPatch&,
-            int&,
+            trackingData& td,
             const tetIndices&
         );
 
@@ -371,15 +361,7 @@ public:
         void hitPatch
         (
             const polyPatch&,
-            molecule::trackData& td
-        );
-
-        //- Overridable function to handle the particle hitting a polyPatch
-        //  without trackData
-        void hitPatch
-        (
-            const polyPatch&,
-            int&
+            trackingData& td
         );
 
 
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
index be0c19985e..451ed5750c 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -219,7 +219,7 @@ inline Foam::molecule::constantProperties::constantProperties
 
 inline Foam::molecule::molecule
 (
-    const Cloud<molecule>& c,
+    const polyMesh& mesh,
     const vector& position,
     const label cellI,
     const label tetFaceI,
@@ -236,7 +236,7 @@ inline Foam::molecule::molecule
 
 )
 :
-    Particle<molecule>(c, position, cellI, tetFaceI, tetPtI),
+    particle(mesh, position, cellI, tetFaceI, tetPtI),
     Q_(Q),
     v_(v),
     a_(a),
@@ -254,8 +254,7 @@ inline Foam::molecule::molecule
 }
 
 
-// * * * constantProperties Private Member Functions * * * * * * * * * * * * //
-
+// * * * * * * * constantProperties Private Member Functions * * * * * * * * //
 
 inline void Foam::molecule::constantProperties::checkSiteListSizes() const
 {
@@ -394,6 +393,7 @@ Foam::molecule::constantProperties::electrostaticSites() const
     return electrostaticSites_;
 }
 
+
 inline bool Foam::molecule::constantProperties::electrostaticSite
 (
     label sId
@@ -462,19 +462,6 @@ inline Foam::label Foam::molecule::constantProperties::nSites() const
 
 }
 
-// * * * * * * * * * * *  trackData Member Functions * * * * * * * * * * * * //
-
-inline Foam::moleculeCloud& Foam::molecule::trackData::molCloud()
-{
-    return molCloud_;
-}
-
-
-inline Foam::label Foam::molecule::trackData::part() const
-{
-    return part_;
-}
-
 
 // * * * * * * * * * * * * molecule Member Functions * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
index e7ac44a972..77685e6c0d 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,12 +31,12 @@ License
 
 Foam::molecule::molecule
 (
-    const Cloud<molecule>& cloud,
+    const polyMesh& mesh,
     Istream& is,
     bool readFields
 )
 :
-    Particle<molecule>(cloud, is, readFields),
+    particle(mesh, is, readFields),
     Q_(tensor::zero),
     v_(vector::zero),
     a_(vector::zero),
@@ -104,7 +104,7 @@ void Foam::molecule::readFields(Cloud<molecule>& mC)
         return;
     }
 
-    Particle<molecule>::readFields(mC);
+    particle::readFields(mC);
 
     IOField<tensor> Q(mC.fieldIOobject("Q", IOobject::MUST_READ));
     mC.checkFieldIOobject(mC, Q);
@@ -153,7 +153,7 @@ void Foam::molecule::readFields(Cloud<molecule>& mC)
 
 void Foam::molecule::writeFields(const Cloud<molecule>& mC)
 {
-    Particle<molecule>::writeFields(mC);
+    particle::writeFields(mC);
 
     label np = mC.size();
 
@@ -262,7 +262,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const molecule& mol)
 {
     if (os.format() == IOstream::ASCII)
     {
-        os  << token::SPACE << static_cast<const Particle<molecule>&>(mol)
+        os  << token::SPACE << static_cast<const particle&>(mol)
             << token::SPACE << mol.face()
             << token::SPACE << mol.stepFraction()
             << token::SPACE << mol.Q_
@@ -280,7 +280,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const molecule& mol)
     }
     else
     {
-        os  << static_cast<const Particle<molecule>&>(mol);
+        os  << static_cast<const particle&>(mol);
         os.write
         (
             reinterpret_cast<const char*>(&mol.Q_),
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index 6ed75ee923..289735c170 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,6 @@ using namespace Foam::constant::mathematical;
 
 namespace Foam
 {
-    defineParticleTypeNameAndDebug(molecule, 0);
     defineTemplateTypeNameAndDebug(Cloud<molecule>, 0);
 }
 
@@ -746,7 +745,7 @@ void Foam::moleculeCloud::initialiseMolecules
                             label tetFace = -1;
                             label tetPt = -1;
 
-                            findCellFacePt
+                            mesh_.findCellFacePt
                             (
                                 globalPosition,
                                 cell,
@@ -834,7 +833,7 @@ void Foam::moleculeCloud::initialiseMolecules
                                         label tetFace = -1;
                                         label tetPt = -1;
 
-                                        findCellFacePt
+                                        mesh_.findCellFacePt
                                         (
                                             globalPosition,
                                             cell,
@@ -913,7 +912,7 @@ void Foam::moleculeCloud::initialiseMolecules
                                         label tetFace = -1;
                                         label tetPt = -1;
 
-                                        findCellFacePt
+                                        mesh_.findCellFacePt
                                         (
                                             globalPosition,
                                             cell,
@@ -1000,11 +999,9 @@ void Foam::moleculeCloud::createMolecule
     const vector& bulkVelocity
 )
 {
-    const Cloud<molecule>& cloud = *this;
-
     if (cell == -1)
     {
-        findCellFacePt(position, cell, tetFace, tetPt);
+        mesh_.findCellFacePt(position, cell, tetFace, tetPt);
     }
 
     if (cell == -1)
@@ -1063,7 +1060,7 @@ void Foam::moleculeCloud::createMolecule
     (
         new molecule
         (
-            cloud,
+            mesh_,
             position,
             cell,
             tetFace,
@@ -1159,18 +1156,18 @@ Foam::moleculeCloud::moleculeCloud
 
 void Foam::moleculeCloud::evolve()
 {
-    molecule::trackData td0(*this, 0);
+    molecule::trackingData td0(*this, 0);
     Cloud<molecule>::move(td0, mesh_.time().deltaTValue());
 
-    molecule::trackData td1(*this, 1);
+    molecule::trackingData td1(*this, 1);
     Cloud<molecule>::move(td1, mesh_.time().deltaTValue());
 
-    molecule::trackData td2(*this, 2);
+    molecule::trackingData td2(*this, 2);
     Cloud<molecule>::move(td2, mesh_.time().deltaTValue());
 
     calculateForce();
 
-    molecule::trackData td3(*this, 3);
+    molecule::trackingData td3(*this, 3);
     Cloud<molecule>::move(td3, mesh_.time().deltaTValue());
 }
 
diff --git a/src/lagrangian/solidParticle/solidParticle.C b/src/lagrangian/solidParticle/solidParticle.C
index 346a734b08..e477e3bdc4 100644
--- a/src/lagrangian/solidParticle/solidParticle.C
+++ b/src/lagrangian/solidParticle/solidParticle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,19 +25,25 @@ License
 
 #include "solidParticleCloud.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTemplateTypeNameAndDebug(Cloud<solidParticle>, 0);
+}
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::solidParticle::move
 (
-    solidParticle::trackData& td,
+    trackingData& td,
     const scalar trackTime
 )
 {
     td.switchProcessor = false;
     td.keepParticle = true;
 
-    const polyMesh& mesh = cloud().pMesh();
-    const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
+    const polyBoundaryMesh& pbMesh = mesh_.boundaryMesh();
 
     scalar tEnd = (1.0 - stepFraction())*trackTime;
     scalar dtMax = tEnd;
@@ -46,7 +52,7 @@ bool Foam::solidParticle::move
     {
         if (debug)
         {
-            Info<< "Time = " << mesh.time().timeName()
+            Info<< "Time = " << mesh_.time().timeName()
                 << " trackTime = " << trackTime
                 << " tEnd = " << tEnd
                 << " steptFraction() = " << stepFraction() << endl;
@@ -64,12 +70,12 @@ bool Foam::solidParticle::move
         tEnd -= dt;
         stepFraction() = 1.0 - tEnd/trackTime;
 
-        cellPointWeight cpw(mesh, position(), cellI, face());
+        cellPointWeight cpw(mesh_, position(), cellI, face());
         scalar rhoc = td.rhoInterp().interpolate(cpw);
         vector Uc = td.UInterp().interpolate(cpw);
         scalar nuc = td.nuInterp().interpolate(cpw);
 
-        scalar rhop = td.spc().rhop();
+        scalar rhop = td.cloud().rhop();
         scalar magUr = mag(Uc - U_);
 
         scalar ReFunc = 1.0;
@@ -100,20 +106,7 @@ bool Foam::solidParticle::move
 bool Foam::solidParticle::hitPatch
 (
     const polyPatch&,
-    solidParticle::trackData&,
-    const label,
-    const scalar,
-    const tetIndices&
-)
-{
-    return false;
-}
-
-
-bool Foam::solidParticle::hitPatch
-(
-    const polyPatch&,
-    int&,
+    trackingData&,
     const label,
     const scalar,
     const tetIndices&
@@ -126,29 +119,21 @@ bool Foam::solidParticle::hitPatch
 void Foam::solidParticle::hitProcessorPatch
 (
     const processorPolyPatch&,
-    solidParticle::trackData& td
+    trackingData& td
 )
 {
     td.switchProcessor = true;
 }
 
 
-void Foam::solidParticle::hitProcessorPatch
-(
-    const processorPolyPatch&,
-    int&
-)
-{}
-
-
 void Foam::solidParticle::hitWallPatch
 (
     const wallPolyPatch& wpp,
-    solidParticle::trackData& td,
+    trackingData& td,
     const tetIndices& tetIs
 )
 {
-    vector nw = tetIs.faceTri(cloud().pMesh()).normal();
+    vector nw = tetIs.faceTri(mesh_).normal();
     nw /= mag(nw);
 
     scalar Un = U_ & nw;
@@ -156,50 +141,33 @@ void Foam::solidParticle::hitWallPatch
 
     if (Un > 0)
     {
-        U_ -= (1.0 + td.spc().e())*Un*nw;
+        U_ -= (1.0 + td.cloud().e())*Un*nw;
     }
 
-    U_ -= td.spc().mu()*Ut;
+    U_ -= td.cloud().mu()*Ut;
 }
 
 
-void Foam::solidParticle::hitWallPatch
-(
-    const wallPolyPatch&,
-    int&,
-    const tetIndices&
-)
-{}
-
-
 void Foam::solidParticle::hitPatch
 (
     const polyPatch&,
-    solidParticle::trackData& td
+    trackingData& td
 )
 {
     td.keepParticle = false;
 }
 
 
-void Foam::solidParticle::hitPatch
-(
-    const polyPatch&,
-    int&
-)
-{}
-
-
 void Foam::solidParticle::transformProperties (const tensor& T)
 {
-    Particle<solidParticle>::transformProperties(T);
+    particle::transformProperties(T);
     U_ = transform(T, U_);
 }
 
 
 void Foam::solidParticle::transformProperties(const vector& separation)
 {
-    Particle<solidParticle>::transformProperties(separation);
+    particle::transformProperties(separation);
 }
 
 
diff --git a/src/lagrangian/solidParticle/solidParticle.H b/src/lagrangian/solidParticle/solidParticle.H
index c87a1def7a..017b05a71b 100644
--- a/src/lagrangian/solidParticle/solidParticle.H
+++ b/src/lagrangian/solidParticle/solidParticle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ SourceFiles
 #ifndef solidParticle_H
 #define solidParticle_H
 
-#include "Particle.H"
+#include "particle.H"
 #include "IOstream.H"
 #include "autoPtr.H"
 #include "interpolationCellPoint.H"
@@ -57,7 +57,7 @@ class solidParticleCloud;
 
 class solidParticle
 :
-    public Particle<solidParticle>
+    public particle
 {
     // Private member data
 
@@ -73,11 +73,10 @@ public:
     friend class Cloud<solidParticle>;
 
     //- Class used to pass tracking data to the trackToFace function
-    class trackData
+    class trackingData
+    :
+        public particle::TrackingData<solidParticleCloud>
     {
-        //- Reference to the cloud containing this particle
-        solidParticleCloud& spc_;
-
         // Interpolators for continuous phase fields
 
             const interpolationCellPoint<scalar>& rhoInterp_;
@@ -90,13 +89,9 @@ public:
 
     public:
 
-        bool switchProcessor;
-        bool keepParticle;
-
-
         // Constructors
 
-            inline trackData
+            inline trackingData
             (
                 solidParticleCloud& spc,
                 const interpolationCellPoint<scalar>& rhoInterp,
@@ -108,8 +103,6 @@ public:
 
         // Member functions
 
-            inline solidParticleCloud& spc();
-
             inline const interpolationCellPoint<scalar>& rhoInterp() const;
 
             inline const interpolationCellPoint<vector>& UInterp() const;
@@ -125,7 +118,7 @@ public:
         //- Construct from components
         inline solidParticle
         (
-            const Cloud<solidParticle>& c,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             const label tetFaceI,
@@ -137,17 +130,39 @@ public:
         //- Construct from Istream
         solidParticle
         (
-            const Cloud<solidParticle>& c,
+            const polyMesh& mesh,
             Istream& is,
             bool readFields = true
         );
 
         //- Construct and return a clone
-        virtual autoPtr<Particle<solidParticle> > clone() const
+        virtual autoPtr<particle> clone() const
         {
-            return autoPtr<Particle<solidParticle> >(new solidParticle(*this));
+            return autoPtr<particle>(new solidParticle(*this));
         }
 
+        //- Factory class to read-construct particles used for
+        //  parallel transfer
+        class iNew
+        {
+            const polyMesh& mesh_;
+
+        public:
+
+            iNew(const polyMesh& mesh)
+            :
+                mesh_(mesh)
+            {}
+
+            autoPtr<solidParticle> operator()(Istream& is) const
+            {
+                return autoPtr<solidParticle>
+                (
+                    new solidParticle(mesh_, is, true)
+                );
+            }
+        };
+
 
     // Member Functions
 
@@ -167,7 +182,7 @@ public:
         // Tracking
 
             //- Move
-            bool move(trackData&, const scalar);
+            bool move(trackingData&, const scalar);
 
 
         // Patch interactions
@@ -177,18 +192,7 @@ public:
             bool hitPatch
             (
                 const polyPatch&,
-                solidParticle::trackData& td,
-                const label patchI,
-                const scalar trackFraction,
-                const tetIndices& tetIs
-            );
-
-            //- Overridable function to handle the particle hitting a patch
-            //  Executed before other patch-hitting functions without trackData
-            bool hitPatch
-            (
-                const polyPatch& p,
-                int& td,
+                trackingData& td,
                 const label patchI,
                 const scalar trackFraction,
                 const tetIndices& tetIs
@@ -199,31 +203,14 @@ public:
             void hitProcessorPatch
             (
                 const processorPolyPatch&,
-                solidParticle::trackData& td
-            );
-
-            //- Overridable function to handle the particle hitting a
-            //  processorPatch without trackData
-            void hitProcessorPatch
-            (
-                const processorPolyPatch&,
-                int&
+                trackingData& td
             );
 
             //- Overridable function to handle the particle hitting a wallPatch
             void hitWallPatch
             (
                 const wallPolyPatch&,
-                solidParticle::trackData& td,
-                const tetIndices&
-            );
-
-            //- Overridable function to handle the particle hitting a wallPatch
-            //- without trackData
-            void hitWallPatch
-            (
-                const wallPolyPatch&,
-                int&,
+                trackingData& td,
                 const tetIndices&
             );
 
@@ -231,15 +218,7 @@ public:
             void hitPatch
             (
                 const polyPatch&,
-                solidParticle::trackData& td
-            );
-
-            //- Overridable function to handle the particle hitting a polyPatch
-            //- without trackData
-            void hitPatch
-            (
-                const polyPatch&,
-                int&
+                trackingData& td
             );
 
             //- Transform the physical properties of the particle
diff --git a/src/lagrangian/solidParticle/solidParticleCloud.C b/src/lagrangian/solidParticle/solidParticleCloud.C
index edf2495b01..364f448546 100644
--- a/src/lagrangian/solidParticle/solidParticleCloud.C
+++ b/src/lagrangian/solidParticle/solidParticleCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,8 +32,8 @@ License
 
 namespace Foam
 {
-    defineParticleTypeNameAndDebug(solidParticle, 0);
-    defineTemplateTypeNameAndDebug(Cloud<solidParticle>, 0);
+//    defineParticleTypeNameAndDebug(solidParticle, 0);
+//    defineTemplateTypeNameAndDebug(Cloud<solidParticle>, 0);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -81,7 +81,8 @@ void Foam::solidParticleCloud::move(const dimensionedVector& g)
     interpolationCellPoint<vector> UInterp(U);
     interpolationCellPoint<scalar> nuInterp(nu);
 
-    solidParticle::trackData td(*this, rhoInterp, UInterp, nuInterp, g.value());
+    solidParticle::trackingData
+        td(*this, rhoInterp, UInterp, nuInterp, g.value());
 
     Cloud<solidParticle>::move(td, mesh_.time().deltaTValue());
 }
diff --git a/src/lagrangian/solidParticle/solidParticleI.H b/src/lagrangian/solidParticle/solidParticleI.H
index 245ca1b9a5..83f5120ea7 100644
--- a/src/lagrangian/solidParticle/solidParticleI.H
+++ b/src/lagrangian/solidParticle/solidParticleI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-inline Foam::solidParticle::trackData::trackData
+inline Foam::solidParticle::trackingData::trackingData
 (
     solidParticleCloud& spc,
     const interpolationCellPoint<scalar>& rhoInterp,
@@ -34,7 +34,7 @@ inline Foam::solidParticle::trackData::trackData
     const vector& g
 )
 :
-    spc_(spc),
+    particle::TrackingData<solidParticleCloud>(spc),
     rhoInterp_(rhoInterp),
     UInterp_(UInterp),
     nuInterp_(nuInterp),
@@ -44,7 +44,7 @@ inline Foam::solidParticle::trackData::trackData
 
 inline Foam::solidParticle::solidParticle
 (
-    const Cloud<solidParticle>& c,
+    const polyMesh& mesh,
     const vector& position,
     const label cellI,
     const label tetFaceI,
@@ -53,7 +53,7 @@ inline Foam::solidParticle::solidParticle
     const vector& U
 )
 :
-    Particle<solidParticle>(c, position, cellI, tetFaceI, tetPtI),
+    particle(mesh, position, cellI, tetFaceI, tetPtI),
     d_(d),
     U_(U)
 {}
@@ -61,33 +61,27 @@ inline Foam::solidParticle::solidParticle
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline Foam::solidParticleCloud& Foam::solidParticle::trackData::spc()
-{
-    return spc_;
-}
-
-
 inline const Foam::interpolationCellPoint<Foam::scalar>&
-Foam::solidParticle::trackData::rhoInterp() const
+Foam::solidParticle::trackingData::rhoInterp() const
 {
     return rhoInterp_;
 }
 
 
 inline const Foam::interpolationCellPoint<Foam::vector>&
-Foam::solidParticle::trackData::UInterp() const
+Foam::solidParticle::trackingData::UInterp() const
 {
     return UInterp_;
 }
 
 
 inline const Foam::interpolationCellPoint<Foam::scalar>&
-Foam::solidParticle::trackData::nuInterp() const
+Foam::solidParticle::trackingData::nuInterp() const
 {
     return nuInterp_;
 }
 
-inline const Foam::vector& Foam::solidParticle::trackData::g() const
+inline const Foam::vector& Foam::solidParticle::trackingData::g() const
 {
     return g_;
 }
diff --git a/src/lagrangian/solidParticle/solidParticleIO.C b/src/lagrangian/solidParticle/solidParticleIO.C
index 10116abf36..d2a8a46c47 100644
--- a/src/lagrangian/solidParticle/solidParticleIO.C
+++ b/src/lagrangian/solidParticle/solidParticleIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,12 +30,12 @@ License
 
 Foam::solidParticle::solidParticle
 (
-    const Cloud<solidParticle>& cloud,
+    const polyMesh& mesh,
     Istream& is,
     bool readFields
 )
 :
-    Particle<solidParticle>(cloud, is, readFields)
+    particle(mesh, is, readFields)
 {
     if (readFields)
     {
@@ -65,6 +65,9 @@ void Foam::solidParticle::readFields(Cloud<solidParticle>& c)
     {
         return;
     }
+
+    particle::readFields(c);
+
     IOField<scalar> d(c.fieldIOobject("d", IOobject::MUST_READ));
     c.checkFieldIOobject(c, d);
 
@@ -85,7 +88,7 @@ void Foam::solidParticle::readFields(Cloud<solidParticle>& c)
 
 void Foam::solidParticle::writeFields(const Cloud<solidParticle>& c)
 {
-    Particle<solidParticle>::writeFields(c);
+    particle::writeFields(c);
 
     label np = c.size();
 
@@ -113,13 +116,13 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const solidParticle& p)
 {
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const Particle<solidParticle>&>(p)
+        os  << static_cast<const particle&>(p)
             << token::SPACE << p.d_
             << token::SPACE << p.U_;
     }
     else
     {
-        os  << static_cast<const Particle<solidParticle>&>(p);
+        os  << static_cast<const particle&>(p);
         os.write
         (
             reinterpret_cast<const char*>(&p.d_),
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
index be26fe0988..c2e7a6ffd0 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -283,7 +283,7 @@ Foam::label Foam::meshRefinement::markFeatureRefinement
     label tetFaceI = -1;
     label tetPtI = -1;
 
-    cloud.findCellFacePt(keepPoint, cellI, tetFaceI, tetPtI);
+    mesh_.findCellFacePt(keepPoint, cellI, tetFaceI, tetPtI);
 
     if (cellI != -1)
     {
@@ -309,7 +309,7 @@ Foam::label Foam::meshRefinement::markFeatureRefinement
                     (
                         new trackedParticle
                         (
-                            cloud,
+                            mesh_,
                             keepPoint,
                             cellI,
                             tetFaceI,
@@ -330,7 +330,7 @@ Foam::label Foam::meshRefinement::markFeatureRefinement
     labelList maxFeatureLevel(mesh_.nCells(), -1);
 
     // Database to pass into trackedParticle::move
-    trackedParticle::trackData td(cloud, maxFeatureLevel);
+    trackedParticle::trackingData td(cloud, maxFeatureLevel);
 
     // Track all particles to their end position (= starting feature point)
     cloud.move(td, GREAT);
diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C
index 214e7d6440..607a65ebaa 100644
--- a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C
+++ b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ License
 
 Foam::trackedParticle::trackedParticle
 (
-    const Cloud<trackedParticle>& c,
+    const polyMesh& mesh,
     const vector& position,
     const label cellI,
     const label tetFaceI,
@@ -40,7 +40,7 @@ Foam::trackedParticle::trackedParticle
     const label j
 )
 :
-    Particle<trackedParticle>(c, position, cellI, tetFaceI, tetPtI),
+    particle(mesh, position, cellI, tetFaceI, tetPtI),
     end_(end),
     level_(level),
     i_(i),
@@ -50,12 +50,12 @@ Foam::trackedParticle::trackedParticle
 
 Foam::trackedParticle::trackedParticle
 (
-    const Cloud<trackedParticle>& c,
+    const polyMesh& mesh,
     Istream& is,
     bool readFields
 )
 :
-    Particle<trackedParticle>(c, is, readFields)
+    particle(mesh, is, readFields)
 {
     if (readFields)
     {
@@ -89,7 +89,7 @@ Foam::trackedParticle::trackedParticle
 
 bool Foam::trackedParticle::move
 (
-    trackedParticle::trackData& td,
+    trackingData& td,
     const scalar trackedParticle
 )
 {
@@ -120,7 +120,7 @@ bool Foam::trackedParticle::move
 bool Foam::trackedParticle::hitPatch
 (
     const polyPatch&,
-    trackedParticle::trackData& td,
+    trackingData& td,
     const label patchI,
     const scalar trackFraction,
     const tetIndices& tetIs
@@ -130,42 +130,10 @@ bool Foam::trackedParticle::hitPatch
 }
 
 
-bool Foam::trackedParticle::hitPatch
-(
-    const polyPatch&,
-    int&,
-    const label,
-    const scalar trackFraction,
-    const tetIndices& tetIs
-)
-{
-    return false;
-}
-
-
 void Foam::trackedParticle::hitWedgePatch
 (
     const wedgePolyPatch&,
-    trackedParticle::trackData& td
-)
-{
-    // Remove particle
-    td.keepParticle = false;
-}
-
-
-void Foam::trackedParticle::hitWedgePatch
-(
-    const wedgePolyPatch&,
-    int&
-)
-{}
-
-
-void Foam::trackedParticle::hitSymmetryPatch
-(
-    const symmetryPolyPatch&,
-    trackedParticle::trackData& td
+    trackingData& td
 )
 {
     // Remove particle
@@ -176,15 +144,7 @@ void Foam::trackedParticle::hitSymmetryPatch
 void Foam::trackedParticle::hitSymmetryPatch
 (
     const symmetryPolyPatch&,
-    int&
-)
-{}
-
-
-void Foam::trackedParticle::hitCyclicPatch
-(
-    const cyclicPolyPatch&,
-    trackedParticle::trackData& td
+    trackingData& td
 )
 {
     // Remove particle
@@ -195,15 +155,18 @@ void Foam::trackedParticle::hitCyclicPatch
 void Foam::trackedParticle::hitCyclicPatch
 (
     const cyclicPolyPatch&,
-    int&
+    trackingData& td
 )
-{}
+{
+    // Remove particle
+    td.keepParticle = false;
+}
 
 
 void Foam::trackedParticle::hitProcessorPatch
 (
     const processorPolyPatch&,
-    trackedParticle::trackData& td
+    trackingData& td
 )
 {
     // Remove particle
@@ -211,18 +174,10 @@ void Foam::trackedParticle::hitProcessorPatch
 }
 
 
-void Foam::trackedParticle::hitProcessorPatch
-(
-    const processorPolyPatch&,
-    int&
-)
-{}
-
-
 void Foam::trackedParticle::hitWallPatch
 (
     const wallPolyPatch& wpp,
-    trackedParticle::trackData& td,
+    trackingData& td,
     const tetIndices&
 )
 {
@@ -231,32 +186,15 @@ void Foam::trackedParticle::hitWallPatch
 }
 
 
-void Foam::trackedParticle::hitWallPatch
-(
-    const wallPolyPatch& wpp,
-    int&,
-    const tetIndices&
-)
-{}
-
-
-void Foam::trackedParticle::hitPatch
-(
-    const polyPatch& wpp,
-    trackedParticle::trackData& td
-)
-{
-    // Remove particle
-    td.keepParticle = false;
-}
-
-
 void Foam::trackedParticle::hitPatch
 (
     const polyPatch& wpp,
-    int&
+    trackingData& td
 )
-{}
+{
+    // Remove particle
+    td.keepParticle = false;
+}
 
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
@@ -265,7 +203,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const trackedParticle& p)
 {
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const Particle<trackedParticle>&>(p)
+        os  << static_cast<const particle&>(p)
             << token::SPACE << p.end_
             << token::SPACE << p.level_
             << token::SPACE << p.i_
@@ -273,7 +211,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const trackedParticle& p)
     }
     else
     {
-        os  << static_cast<const Particle<trackedParticle>&>(p);
+        os  << static_cast<const particle&>(p);
         os.write
         (
             reinterpret_cast<const char*>(&p.end_),
diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H
index bfe0d9b385..256b056f0b 100644
--- a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H
+++ b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ SourceFiles
 #ifndef trackedParticle_H
 #define trackedParticle_H
 
-#include "Particle.H"
+#include "particle.H"
 #include "autoPtr.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,7 +52,7 @@ class trackedParticleCloud;
 
 class trackedParticle
 :
-    public Particle<trackedParticle>
+    public particle
 {
     // Private data
 
@@ -74,35 +74,26 @@ public:
     friend class Cloud<trackedParticle>;
 
     //- Class used to pass tracking data to the trackToFace function
-    class trackData
+    class trackingData
+    :
+        public particle::TrackingData<Cloud<trackedParticle> >
     {
-        //- Reference to the cloud containing this particle
-        Cloud<trackedParticle>& cloud_;
-
         labelList& maxLevel_;
 
     public:
 
-        bool switchProcessor;
-        bool keepParticle;
-
 
         // Constructors
 
-            trackData(Cloud<trackedParticle>& cloud, labelList& maxLevel)
+            trackingData(Cloud<trackedParticle>& cloud, labelList& maxLevel)
             :
-                cloud_(cloud),
+                particle::TrackingData<Cloud<trackedParticle> >(cloud),
                 maxLevel_(maxLevel)
             {}
 
 
         // Member functions
 
-            Cloud<trackedParticle>& cloud()
-            {
-                return cloud_;
-            }
-
             labelList& maxLevel()
             {
                 return maxLevel_;
@@ -116,7 +107,7 @@ public:
         //- Construct from components
         trackedParticle
         (
-            const Cloud<trackedParticle>& c,
+            const polyMesh& mesh,
             const vector& position,
             const label cellI,
             const label tetFaceI,
@@ -130,20 +121,39 @@ public:
         //- Construct from Istream
         trackedParticle
         (
-            const Cloud<trackedParticle>& c,
+            const polyMesh& mesh,
             Istream& is,
             bool readFields = true
         );
 
         //- Construct and return a clone
-        autoPtr<Particle<trackedParticle> > clone() const
+        autoPtr<particle> clone() const
         {
-            return autoPtr<Particle<trackedParticle> >
-            (
-                new trackedParticle(*this)
-            );
+            return autoPtr<particle>(new trackedParticle(*this));
         }
 
+        //- Factory class to read-construct particles used for
+        //  parallel transfer
+        class iNew
+        {
+            const polyMesh& mesh_;
+
+        public:
+
+            iNew(const polyMesh& mesh)
+            :
+                mesh_(mesh)
+            {}
+
+            autoPtr<trackedParticle> operator()(Istream& is) const
+            {
+                return autoPtr<trackedParticle>
+                (
+                    new trackedParticle(mesh_, is, true)
+                );
+            }
+        };
+
 
     // Member Functions
 
@@ -170,7 +180,7 @@ public:
         // Tracking
 
             //- Track all particles to their end point
-            bool move(trackData&, const scalar);
+            bool move(trackingData&, const scalar);
 
 
             //- Overridable function to handle the particle hitting a patch
@@ -178,30 +188,17 @@ public:
             bool hitPatch
             (
                 const polyPatch&,
-                trackedParticle::trackData& td,
+                trackingData& td,
                 const label patchI,
                 const scalar trackFraction,
                 const tetIndices& tetIs
             );
-            bool hitPatch
-            (
-                const polyPatch&,
-                int&,
-                const label patchI,
-                const scalar trackFraction,
-                const tetIndices& tetIs
-           );
 
             //- Overridable function to handle the particle hitting a wedge
             void hitWedgePatch
             (
                 const wedgePolyPatch&,
-                trackedParticle::trackData& td
-            );
-            void hitWedgePatch
-            (
-                const wedgePolyPatch&,
-                int&
+                trackingData& td
             );
 
             //- Overridable function to handle the particle hitting a
@@ -209,24 +206,14 @@ public:
             void hitSymmetryPatch
             (
                 const symmetryPolyPatch&,
-                trackedParticle::trackData& td
-            );
-            void hitSymmetryPatch
-            (
-                const symmetryPolyPatch&,
-                int&
+                trackingData& td
             );
 
             //- Overridable function to handle the particle hitting a cyclic
             void hitCyclicPatch
             (
                 const cyclicPolyPatch&,
-                trackedParticle::trackData& td
-            );
-            void hitCyclicPatch
-            (
-                const cyclicPolyPatch&,
-                int&
+                trackingData& td
             );
 
             //- Overridable function to handle the particle hitting a
@@ -234,25 +221,14 @@ public:
             void hitProcessorPatch
             (
                 const processorPolyPatch&,
-                trackedParticle::trackData& td
-            );
-            void hitProcessorPatch
-            (
-                const processorPolyPatch&,
-                int&
+                trackingData& td
             );
 
             //- Overridable function to handle the particle hitting a wallPatch
             void hitWallPatch
             (
                 const wallPolyPatch&,
-                trackedParticle::trackData& td,
-                const tetIndices&
-            );
-            void hitWallPatch
-            (
-                const wallPolyPatch&,
-                int&,
+                trackingData& td,
                 const tetIndices&
             );
 
@@ -260,20 +236,13 @@ public:
             void hitPatch
             (
                 const polyPatch&,
-                trackedParticle::trackData& td
-            );
-            void hitPatch
-            (
-                const polyPatch&,
-                int&
+                trackingData& td
             );
 
 
     // Ostream Operator
 
         friend Ostream& operator<<(Ostream&, const trackedParticle&);
-
-
 };
 
 
diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C
index 36f91db57d..87f8f3b7a6 100644
--- a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C
+++ b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineParticleTypeNameAndDebug(trackedParticle, 0);
+//defineParticleTypeNameAndDebug(trackedParticle, 0);
 defineTemplateTypeNameAndDebug(Cloud<trackedParticle>, 0);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index 47310b27e3..f52dedbf61 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -41,12 +41,9 @@ octree/octreeDataPointTreeLeaf.C
 octree/octreeDataEdges.C
 octree/octreeDataCell.C
 octree/octreeDataFace.C
-octree/treeBoundBox.C
 octree/treeNodeName.C
 octree/treeLeafName.C
 
-indexedOctree/indexedOctreeName.C
-indexedOctree/treeDataCell.C
 indexedOctree/treeDataEdge.C
 indexedOctree/treeDataFace.C
 indexedOctree/treeDataPoint.C
diff --git a/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C
index 1e07fee604..2de2f3b0c8 100644
--- a/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C
+++ b/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,8 +25,7 @@ License
 
 #include "reconstructLagrangian.H"
 #include "labelIOList.H"
-#include "Cloud.H"
-#include "passiveParticle.H"
+#include "passiveParticleCloud.H"
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
@@ -39,7 +38,7 @@ void Foam::reconstructLagrangianPositions
     const PtrList<labelIOList>& cellProcAddressing
 )
 {
-    Cloud<passiveParticle> lagrangianPositions
+    passiveParticleCloud lagrangianPositions
     (
         mesh,
         cloudName,
@@ -67,7 +66,7 @@ void Foam::reconstructLagrangianPositions
             (
                 new passiveParticle
                 (
-                    lagrangianPositions,
+                    mesh,
                     ppi.position(),
                     cellMap[ppi.cell()],
                     false
@@ -76,7 +75,7 @@ void Foam::reconstructLagrangianPositions
         }
     }
 
-    IOPosition<passiveParticle>(lagrangianPositions).write();
+    IOPosition<Cloud<passiveParticle> >(lagrangianPositions).write();
 }
 
 
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.C b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
index 45c25fb61c..52dd5288af 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ void Foam::streamLine::track()
         (
             new streamLineParticle
             (
-                particles,
+                mesh,
                 seedPoints[i],
                 seedPoints.cells()[i],
                 lifeTime_               // lifetime
@@ -215,7 +215,7 @@ void Foam::streamLine::track()
     }
 
     // additional particle info
-    streamLineParticle::trackData td
+    streamLineParticle::trackingData td
     (
         particles,
         vsInterp,
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
index 8b2127e995..f441b12bb7 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
@@ -30,16 +30,15 @@ License
 
 namespace Foam
 {
-    defineParticleTypeNameAndDebug(streamLineParticle, 0);
+//    defineParticleTypeNameAndDebug(streamLineParticle, 0);
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Estimate dt to cross cell in a few steps
 Foam::scalar Foam::streamLineParticle::calcSubCycleDeltaT
 (
-    streamLineParticle::trackData& td,
+    trackingData& td,
     const scalar dt,
     const vector& U
 ) const
@@ -58,7 +57,7 @@ Foam::scalar Foam::streamLineParticle::calcSubCycleDeltaT
 
 Foam::vector Foam::streamLineParticle::interpolateFields
 (
-    const streamLineParticle::trackData& td,
+    const trackingData& td,
     const point& position,
     const label cellI
 )
@@ -103,29 +102,27 @@ Foam::vector Foam::streamLineParticle::interpolateFields
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-//- Construct from components
 Foam::streamLineParticle::streamLineParticle
 (
-    const Cloud<streamLineParticle>& c,
+    const polyMesh& mesh,
     const vector& position,
     const label cellI,
     const label lifeTime
 )
 :
-    Particle<streamLineParticle>(c, position, cellI),
+    particle(mesh, position, cellI),
     lifeTime_(lifeTime)
 {}
 
 
-//- Construct from Istream
 Foam::streamLineParticle::streamLineParticle
 (
-    const Cloud<streamLineParticle>& c,
+    const polyMesh& mesh,
     Istream& is,
     bool readFields
 )
 :
-    Particle<streamLineParticle>(c, is, readFields)
+    particle(mesh, is, readFields)
 {
     if (readFields)
     {
@@ -157,16 +154,15 @@ Foam::streamLineParticle::streamLineParticle
 }
 
 
-// Construct copy
 Foam::streamLineParticle::streamLineParticle
 (
-    const streamLineParticle& c
+    const streamLineParticle& p
 )
 :
-    Particle<streamLineParticle>(c),
-    lifeTime_(c.lifeTime_),
-    sampledPositions_(c.sampledPositions_),
-    sampledScalars_(c.sampledScalars_)
+    particle(p),
+    lifeTime_(p.lifeTime_),
+    sampledPositions_(p.sampledPositions_),
+    sampledScalars_(p.sampledScalars_)
 {}
 
 
@@ -174,15 +170,17 @@ Foam::streamLineParticle::streamLineParticle
 
 bool Foam::streamLineParticle::move
 (
-    streamLineParticle::trackData& td,
+    trackingData& td,
     const scalar trackTime
 )
 {
+    streamLineParticle& p = static_cast<streamLineParticle&>(*this);
+
     td.switchProcessor = false;
     td.keepParticle = true;
 
     scalar tEnd = (1.0 - stepFraction())*trackTime;
-    scalar maxDt = cloud_.pMesh().bounds().mag();
+    scalar maxDt = mesh_.bounds().mag();
 
     while
     (
@@ -266,8 +264,7 @@ bool Foam::streamLineParticle::move
             if (debug)
             {
                 Pout<< "streamLineParticle : Removing stagnant particle:"
-                    << static_cast<Particle<streamLineParticle> >(*this)
-                    << " sampled positions:" << sampledPositions_.size()
+                    << p << " sampled positions:" << sampledPositions_.size()
                     << endl;
             }
             td.keepParticle = false;
@@ -281,13 +278,12 @@ bool Foam::streamLineParticle::move
             if (debug)
             {
                 Pout<< "streamLineParticle : Removing particle:"
-                    << static_cast<Particle<streamLineParticle> >(*this)
-                    << " sampled positions:" << sampledPositions_.size()
+                    << p << " sampled positions:" << sampledPositions_.size()
                     << endl;
             }
         }
 
-        // Transfer particle data into trackData.
+        // Transfer particle data into trackingData.
         //td.allPositions_.append(sampledPositions_);
         td.allPositions_.append(vectorList());
         vectorList& top = td.allPositions_.last();
@@ -316,7 +312,7 @@ bool Foam::streamLineParticle::move
 bool Foam::streamLineParticle::hitPatch
 (
     const polyPatch&,
-    streamLineParticle::trackData& td,
+    trackingData& td,
     const label patchI,
     const scalar trackFraction,
     const tetIndices& tetIs
@@ -327,24 +323,10 @@ bool Foam::streamLineParticle::hitPatch
 }
 
 
-bool Foam::streamLineParticle::hitPatch
-(
-    const polyPatch&,
-    int&,
-    const label,
-    const scalar,
-    const tetIndices&
-)
-{
-    // Disable generic patch interaction
-    return false;
-}
-
-
 void Foam::streamLineParticle::hitWedgePatch
 (
     const wedgePolyPatch& pp,
-    streamLineParticle::trackData& td
+    trackingData& td
 )
 {
     // Remove particle
@@ -352,18 +334,10 @@ void Foam::streamLineParticle::hitWedgePatch
 }
 
 
-void Foam::streamLineParticle::hitWedgePatch
-(
-    const wedgePolyPatch&,
-    int&
-)
-{}
-
-
 void Foam::streamLineParticle::hitSymmetryPatch
 (
     const symmetryPolyPatch& pp,
-    streamLineParticle::trackData& td
+    trackingData& td
 )
 {
     // Remove particle
@@ -371,18 +345,10 @@ void Foam::streamLineParticle::hitSymmetryPatch
 }
 
 
-void Foam::streamLineParticle::hitSymmetryPatch
-(
-    const symmetryPolyPatch&,
-    int&
-)
-{}
-
-
 void Foam::streamLineParticle::hitCyclicPatch
 (
     const cyclicPolyPatch& pp,
-    streamLineParticle::trackData& td
+    trackingData& td
 )
 {
     // Remove particle
@@ -390,18 +356,10 @@ void Foam::streamLineParticle::hitCyclicPatch
 }
 
 
-void Foam::streamLineParticle::hitCyclicPatch
-(
-    const cyclicPolyPatch&,
-    int&
-)
-{}
-
-
 void Foam::streamLineParticle::hitProcessorPatch
 (
     const processorPolyPatch&,
-    streamLineParticle::trackData& td
+    trackingData& td
 )
 {
     // Switch particle
@@ -409,18 +367,10 @@ void Foam::streamLineParticle::hitProcessorPatch
 }
 
 
-void Foam::streamLineParticle::hitProcessorPatch
-(
-    const processorPolyPatch&,
-    int&
-)
-{}
-
-
 void Foam::streamLineParticle::hitWallPatch
 (
     const wallPolyPatch& wpp,
-    streamLineParticle::trackData& td,
+    trackingData& td,
     const tetIndices&
 )
 {
@@ -429,32 +379,15 @@ void Foam::streamLineParticle::hitWallPatch
 }
 
 
-void Foam::streamLineParticle::hitWallPatch
-(
-    const wallPolyPatch& wpp,
-    int&,
-    const tetIndices&
-)
-{}
-
-
-void Foam::streamLineParticle::hitPatch
-(
-    const polyPatch& wpp,
-    streamLineParticle::trackData& td
-)
-{
-    // Remove particle
-    td.keepParticle = false;
-}
-
-
 void Foam::streamLineParticle::hitPatch
 (
     const polyPatch& wpp,
-    int&
+    trackingData& td
 )
-{}
+{
+    // Remove particle
+    td.keepParticle = false;
+}
 
 
 void Foam::streamLineParticle::readFields(Cloud<streamLineParticle>& c)
@@ -464,6 +397,8 @@ void Foam::streamLineParticle::readFields(Cloud<streamLineParticle>& c)
         return;
     }
 
+    particle::readFields(c);
+
     IOField<label> lifeTime
     (
         c.fieldIOobject("lifeTime", IOobject::MUST_READ)
@@ -495,7 +430,7 @@ void Foam::streamLineParticle::readFields(Cloud<streamLineParticle>& c)
 
 void Foam::streamLineParticle::writeFields(const Cloud<streamLineParticle>& c)
 {
-    Particle<streamLineParticle>::writeFields(c);
+    particle::writeFields(c);
 
     label np =  c.size();
 
@@ -534,7 +469,7 @@ void Foam::streamLineParticle::writeFields(const Cloud<streamLineParticle>& c)
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const streamLineParticle& p)
 {
-    os  << static_cast<const Particle<streamLineParticle>&>(p)
+    os  << static_cast<const particle&>(p)
         << token::SPACE << p.lifeTime_
         << token::SPACE << p.sampledPositions_
         << token::SPACE << p.sampledScalars_
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H
index 085b497393..6a4d944d1e 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ SourceFiles
 #ifndef streamLineParticle_H
 #define streamLineParticle_H
 
-#include "Particle.H"
+#include "particle.H"
 #include "autoPtr.H"
 #include "interpolationCellPoint.H"
 #include "vectorList.H"
@@ -49,20 +49,20 @@ namespace Foam
 class streamLineParticleCloud;
 
 /*---------------------------------------------------------------------------*\
-                           Class streamLineParticle Declaration
+                     Class streamLineParticle Declaration
 \*---------------------------------------------------------------------------*/
 
 class streamLineParticle
 :
-    public Particle<streamLineParticle>
+    public particle
 {
 
 public:
 
     //- Class used to pass tracking data to the trackToFace function
-    class trackData
+    class trackingData
     :
-        public Particle<streamLineParticle>::trackData
+        public particle::TrackingData<Cloud<streamLineParticle> >
     {
 
     public:
@@ -81,7 +81,7 @@ public:
 
         // Constructors
 
-            trackData
+            trackingData
             (
                 Cloud<streamLineParticle>& cloud,
                 const PtrList<interpolationCellPoint<scalar> >& vsInterp,
@@ -94,7 +94,7 @@ public:
                 List<DynamicList<vectorList> >& allVectors
             )
             :
-                Particle<streamLineParticle>::trackData(cloud),
+                particle::TrackingData<Cloud<streamLineParticle> >(cloud),
                 vsInterp_(vsInterp),
                 vvInterp_(vvInterp),
                 UIndex_(UIndex),
@@ -130,7 +130,7 @@ private:
         //  steps.
         scalar calcSubCycleDeltaT
         (
-            streamLineParticle::trackData& td,
+            trackingData& td,
             const scalar dt,
             const vector& U
         ) const;
@@ -138,7 +138,7 @@ private:
         //- Interpolate all quantities; return interpolated velocity.
         vector interpolateFields
         (
-            const streamLineParticle::trackData&,
+            const trackingData&,
             const point&,
             const label cellI
         );
@@ -151,7 +151,7 @@ public:
         //- Construct from components
         streamLineParticle
         (
-            const Cloud<streamLineParticle>& c,
+            const polyMesh& c,
             const vector& position,
             const label cellI,
             const label lifeTime
@@ -160,32 +160,49 @@ public:
         //- Construct from Istream
         streamLineParticle
         (
-            const Cloud<streamLineParticle>& c,
+            const polyMesh& c,
             Istream& is,
             bool readFields = true
         );
 
         //- Construct copy
-        streamLineParticle(const streamLineParticle& c);
+        streamLineParticle(const streamLineParticle& p);
 
         //- Construct and return a clone
-        autoPtr<Particle<streamLineParticle> > clone() const
+        autoPtr<particle> clone() const
         {
-            return autoPtr<Particle<streamLineParticle> >
-            (
-                new streamLineParticle(*this)
-            );
+            return autoPtr<particle>(new streamLineParticle(*this));
         }
 
+        //- Factory class to read-construct particles used for
+        //  parallel transfer
+        class iNew
+        {
+            const polyMesh& mesh_;
+
+        public:
+
+            iNew(const polyMesh& mesh)
+            :
+                mesh_(mesh)
+            {}
+
+            autoPtr<streamLineParticle> operator()(Istream& is) const
+            {
+                return autoPtr<streamLineParticle>
+                (
+                    new streamLineParticle(mesh_, is, true)
+                );
+            }
+        };
+
 
     // Member Functions
 
-
-
         // Tracking
 
             //- Track all particles to their end point
-            bool move(trackData&, const scalar trackTime);
+            bool move(trackingData&, const scalar trackTime);
 
 
             //- Overridable function to handle the particle hitting a patch
@@ -193,31 +210,17 @@ public:
             bool hitPatch
             (
                 const polyPatch&,
-                streamLineParticle::trackData& td,
+                trackingData& td,
                 const label patchI,
                 const scalar trackFraction,
                 const tetIndices& tetIs
             );
 
-            bool hitPatch
-            (
-                const polyPatch&,
-                int&,
-                const label,
-                const scalar,
-                const tetIndices&
-           );
-
             //- Overridable function to handle the particle hitting a wedge
             void hitWedgePatch
             (
                 const wedgePolyPatch&,
-                streamLineParticle::trackData& td
-            );
-            void hitWedgePatch
-            (
-                const wedgePolyPatch&,
-                int&
+                trackingData& td
             );
 
             //- Overridable function to handle the particle hitting a
@@ -225,24 +228,14 @@ public:
             void hitSymmetryPatch
             (
                 const symmetryPolyPatch&,
-                streamLineParticle::trackData& td
-            );
-            void hitSymmetryPatch
-            (
-                const symmetryPolyPatch&,
-                int&
+                trackingData& td
             );
 
             //- Overridable function to handle the particle hitting a cyclic
             void hitCyclicPatch
             (
                 const cyclicPolyPatch&,
-                streamLineParticle::trackData& td
-            );
-            void hitCyclicPatch
-            (
-                const cyclicPolyPatch&,
-                int&
+                trackingData& td
             );
 
             //- Overridable function to handle the particle hitting a
@@ -250,25 +243,14 @@ public:
             void hitProcessorPatch
             (
                 const processorPolyPatch&,
-                streamLineParticle::trackData& td
-            );
-            void hitProcessorPatch
-            (
-                const processorPolyPatch&,
-                int&
+                trackingData& td
             );
 
             //- Overridable function to handle the particle hitting a wallPatch
             void hitWallPatch
             (
                 const wallPolyPatch&,
-                streamLineParticle::trackData& td,
-                const tetIndices&
-            );
-            void hitWallPatch
-            (
-                const wallPolyPatch&,
-                int&,
+                trackingData& td,
                 const tetIndices&
             );
 
@@ -276,12 +258,7 @@ public:
             void hitPatch
             (
                 const polyPatch&,
-                streamLineParticle::trackData& td
-            );
-            void hitPatch
-            (
-                const polyPatch&,
-                int&
+                trackingData& td
             );
 
 
@@ -297,8 +274,6 @@ public:
     // Ostream Operator
 
         friend Ostream& operator<<(Ostream&, const streamLineParticle&);
-
-
 };
 
 
diff --git a/src/sampling/sampledSet/face/faceOnlySet.C b/src/sampling/sampledSet/face/faceOnlySet.C
index a9b574589f..1f6665d6f8 100644
--- a/src/sampling/sampledSet/face/faceOnlySet.C
+++ b/src/sampling/sampledSet/face/faceOnlySet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,10 +28,6 @@ License
 #include "DynamicList.H"
 #include "polyMesh.H"
 
-#include "Cloud.H"
-#include "passiveParticle.H"
-#include "IDLList.H"
-
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -45,11 +41,9 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-
-// Sample singly connected segment. Returns false if end_ reached.
 bool Foam::faceOnlySet::trackToBoundary
 (
-    Particle<passiveParticle>& singleParticle,
+    passiveParticle& singleParticle,
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
     DynamicList<label>& samplingFaces,
@@ -61,6 +55,9 @@ bool Foam::faceOnlySet::trackToBoundary
     const vector smallVec = tol*offset;
     const scalar smallDist = mag(smallVec);
 
+    passiveParticleCloud particleCloud(mesh());
+    particle::TrackingData<passiveParticleCloud> trackData(particleCloud);
+
     // Alias
     const point& trackPt = singleParticle.position();
 
@@ -68,7 +65,7 @@ bool Foam::faceOnlySet::trackToBoundary
     {
         point oldPoint = trackPt;
 
-        singleParticle.trackToFace(end_);
+        singleParticle.trackToFace(end_, trackData);
 
         if (singleParticle.face() != -1 && mag(oldPoint - trackPt) > smallDist)
         {
@@ -212,11 +209,9 @@ void Foam::faceOnlySet::calcSamples
         }
 
         // Initialize tracking starting from trackPt
-        Cloud<passiveParticle> particles(mesh(), IDLList<passiveParticle>());
-
         passiveParticle singleParticle
         (
-            particles,
+            mesh(),
             trackPt,
             trackCellI
         );
diff --git a/src/sampling/sampledSet/face/faceOnlySet.H b/src/sampling/sampledSet/face/faceOnlySet.H
index e2d5ad65be..f910c1f965 100644
--- a/src/sampling/sampledSet/face/faceOnlySet.H
+++ b/src/sampling/sampledSet/face/faceOnlySet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,16 +36,13 @@ SourceFiles
 
 #include "sampledSet.H"
 #include "DynamicList.H"
+#include "passiveParticleCloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward declaration of classes
-class passiveParticle;
-template<class Type> class Particle;
-
 /*---------------------------------------------------------------------------*\
                          Class faceOnlySet Declaration
 \*---------------------------------------------------------------------------*/
@@ -71,7 +68,7 @@ class faceOnlySet
         //  reached
         bool trackToBoundary
         (
-            Particle<passiveParticle>& singleParticle,
+            passiveParticle& singleParticle,
             DynamicList<point>& samplingPts,
             DynamicList<label>& samplingCells,
             DynamicList<label>& samplingFaces,
diff --git a/src/sampling/sampledSet/midPoint/midPointSet.C b/src/sampling/sampledSet/midPoint/midPointSet.C
index b7dab5e745..bc108b9108 100644
--- a/src/sampling/sampledSet/midPoint/midPointSet.C
+++ b/src/sampling/sampledSet/midPoint/midPointSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,8 +38,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Rework faceOnlySet samples.
-// Take two consecutive samples
 void Foam::midPointSet::genSamples()
 {
     // Generate midpoints.
@@ -112,6 +110,7 @@ void Foam::midPointSet::genSamples()
     );
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::midPointSet::midPointSet
diff --git a/src/sampling/sampledSet/midPoint/midPointSet.H b/src/sampling/sampledSet/midPoint/midPointSet.H
index 14922ff394..cf16de5932 100644
--- a/src/sampling/sampledSet/midPoint/midPointSet.H
+++ b/src/sampling/sampledSet/midPoint/midPointSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,8 +42,6 @@ namespace Foam
 {
 
 // Forward declaration of classes
-class passiveParticle;
-template<class Type> class particle;
 class meshSearch;
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.H b/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.H
index a0c021c5c5..e0b4057070 100644
--- a/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.H
+++ b/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,8 +42,6 @@ namespace Foam
 {
 
 // Forward declaration of classes
-class passiveParticle;
-template<class Type> class particle;
 class meshSearch;
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/sampling/sampledSet/polyLine/polyLineSet.C b/src/sampling/sampledSet/polyLine/polyLineSet.C
index 6f347e1d82..d57a33285e 100644
--- a/src/sampling/sampledSet/polyLine/polyLineSet.C
+++ b/src/sampling/sampledSet/polyLine/polyLineSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,10 +28,6 @@ License
 #include "DynamicList.H"
 #include "polyMesh.H"
 
-#include "Cloud.H"
-#include "passiveParticle.H"
-#include "IDLList.H"
-
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -45,10 +41,9 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Sample till hits boundary.
 bool Foam::polyLineSet::trackToBoundary
 (
-    Particle<passiveParticle>& singleParticle,
+    passiveParticle& singleParticle,
     label& sampleI,
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
@@ -56,6 +51,9 @@ bool Foam::polyLineSet::trackToBoundary
     DynamicList<scalar>& samplingCurveDist
 ) const
 {
+    passiveParticleCloud particleCloud(mesh());
+    particle::TrackingData<passiveParticleCloud> trackData(particleCloud);
+
     // Alias
     const point& trackPt = singleParticle.position();
 
@@ -70,7 +68,7 @@ bool Foam::polyLineSet::trackToBoundary
         do
         {
             singleParticle.stepFraction() = 0;
-            singleParticle.track(sampleCoords_[sampleI+1]);
+            singleParticle.track(sampleCoords_[sampleI+1], trackData);
         }
         while
         (
@@ -260,11 +258,9 @@ void Foam::polyLineSet::calcSamples
         //
 
         // Initialize tracking starting from sampleI
-        Cloud<passiveParticle> particles(mesh(), IDLList<passiveParticle>());
-
         passiveParticle singleParticle
         (
-            particles,
+            mesh(),
             trackPt,
             trackCellI
         );
diff --git a/src/sampling/sampledSet/polyLine/polyLineSet.H b/src/sampling/sampledSet/polyLine/polyLineSet.H
index 931904d703..09aa7e275c 100644
--- a/src/sampling/sampledSet/polyLine/polyLineSet.H
+++ b/src/sampling/sampledSet/polyLine/polyLineSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,16 +37,13 @@ SourceFiles
 
 #include "sampledSet.H"
 #include "DynamicList.H"
+#include "passiveParticleCloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward declaration of classes
-class passiveParticle;
-template<class Type> class Particle;
-
 /*---------------------------------------------------------------------------*\
                         Class polyLineSet Declaration
 \*---------------------------------------------------------------------------*/
@@ -68,7 +65,7 @@ class polyLineSet
         //  Returns false if end of samples reached.
         bool trackToBoundary
         (
-            Particle<passiveParticle>& singleParticle,
+            passiveParticle& singleParticle,
             label& sampleI,
             DynamicList<point>& samplingPts,
             DynamicList<label>& samplingCells,
diff --git a/src/sampling/sampledSet/uniform/uniformSet.C b/src/sampling/sampledSet/uniform/uniformSet.C
index 2964172e9f..7d9013972e 100644
--- a/src/sampling/sampledSet/uniform/uniformSet.C
+++ b/src/sampling/sampledSet/uniform/uniformSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,10 +28,6 @@ License
 #include "DynamicList.H"
 #include "polyMesh.H"
 
-#include "Cloud.H"
-#include "passiveParticle.H"
-#include "IDLList.H"
-
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -45,9 +41,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Finds along line (samplePt + t * offset) next sample beyond or equal to
-// currentPt.
-// Updates samplePt, sampleI
 bool Foam::uniformSet::nextSample
 (
     const point& currentPt,
@@ -82,10 +75,9 @@ bool Foam::uniformSet::nextSample
 }
 
 
-// Sample singly connected segment. Returns false if end_ reached.
 bool Foam::uniformSet::trackToBoundary
 (
-    Particle<passiveParticle>& singleParticle,
+    passiveParticle& singleParticle,
     point& samplePt,
     label& sampleI,
     DynamicList<point>& samplingPts,
@@ -102,6 +94,9 @@ bool Foam::uniformSet::trackToBoundary
     // Alias
     const point& trackPt = singleParticle.position();
 
+    passiveParticleCloud particleCloud(mesh());
+    particle::TrackingData<passiveParticleCloud> trackData(particleCloud);
+
     while(true)
     {
         // Find next samplePt on/after trackPt. Update samplePt, sampleI
@@ -161,7 +156,7 @@ bool Foam::uniformSet::trackToBoundary
         do
         {
             singleParticle.stepFraction() = 0;
-            singleParticle.track(samplePt);
+            singleParticle.track(samplePt, trackData);
 
             if (debug)
             {
@@ -310,14 +305,7 @@ void Foam::uniformSet::calcSamples
     while(true)
     {
         // Initialize tracking starting from trackPt
-        Cloud<passiveParticle> particles(mesh(), IDLList<passiveParticle>());
-
-        passiveParticle singleParticle
-        (
-            particles,
-            trackPt,
-            trackCellI
-        );
+        passiveParticle singleParticle(mesh(), trackPt, trackCellI);
 
         bool reachedBoundary = trackToBoundary
         (
diff --git a/src/sampling/sampledSet/uniform/uniformSet.H b/src/sampling/sampledSet/uniform/uniformSet.H
index 65d919b24f..a01af1b0b5 100644
--- a/src/sampling/sampledSet/uniform/uniformSet.H
+++ b/src/sampling/sampledSet/uniform/uniformSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,6 +34,7 @@ SourceFiles
 #ifndef uniformSet_H
 #define uniformSet_H
 
+#include "passiveParticleCloud.H"
 #include "sampledSet.H"
 #include "DynamicList.H"
 
@@ -42,10 +43,6 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
-class passiveParticle;
-template<class Type> class Particle;
-
 /*---------------------------------------------------------------------------*\
                            Class uniformSet Declaration
 \*---------------------------------------------------------------------------*/
@@ -85,7 +82,7 @@ class uniformSet
         //  reached
         bool trackToBoundary
         (
-            Particle<passiveParticle>& singleParticle,
+            passiveParticle& singleParticle,
             point& samplePt,
             label& sampleI,
             DynamicList<point>& samplingPts,
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
index d14b0872ae..66f7e31809 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
@@ -29,6 +29,7 @@ License
 #include "globalIndex.H"
 #include "treeDataCell.H"
 #include "treeDataFace.H"
+#include "meshTools.H"
 
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake
index a3cb03d44c..939464ceb7 100755
--- a/src/thermophysicalModels/Allwmake
+++ b/src/thermophysicalModels/Allwmake
@@ -12,14 +12,13 @@ wmake $makeOption basic
 wmake $makeOption reactionThermo
 wmake $makeOption laminarFlameSpeed
 wmake $makeOption chemistryModel
-wmake $makeOption radiationModels
 wmake $makeOption barotropicCompressibilityModel
 wmake $makeOption thermalPorousZone
-
 wmake $makeOption SLGThermo
 
 # Should be combined with solids&solidMixture
 wmake $makeOption basicSolidThermo
 
+wmake $makeOption radiationModels
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C
index 76361fa861..9827cda5d7 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C
+++ b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C
@@ -59,12 +59,12 @@ void Foam::radiation::absorptionCoeffs::checkT(const scalar T) const
 {
     if (T < Tlow_ || T > Thigh_)
     {
-        FatalErrorIn
+        WarningIn
         (
             "absorptionCoeffs::checkT(const scalar T) const"
-        )   << "attempt to use absCoeff out of temperature range:" << nl
+        )   << "usinf absCoeff out of temperature range:" << nl
             << "    " << Tlow_ << " -> " << Thigh_ << ";  T = " << T
-            << nl << abort(FatalError);
+            << nl << endl;
     }
 }
 
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties
index f9c1ae9b09..f2b0029933 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties
@@ -122,7 +122,7 @@ hollowConeInjectorCoeffs
 {
     sizeDistribution
     {
-        pdfType         RosinRammler;
+        type        RosinRammler;
         RosinRammlerDistribution
         {
             minValue        1e-06;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
index c3fb62ce4a..8b4ca414ad 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
@@ -24,21 +24,12 @@ solution
 
     sourceTerms
     {
-        rho
+        schemes
         {
-            semiImplicit    false;
-        }
-        U
-        {
-            semiImplicit    false;
-        }
-        Yi
-        {
-            semiImplicit    false;
-        }
-        hs
-        {
-            semiImplicit    false;
+            rho             explicit;
+            U               explicit;
+            Yi              explicit;
+            hs              explicit;
         }
     }
 
@@ -56,7 +47,7 @@ solution
     integrationSchemes
     {
         U               Euler;
-        T               Analytical;
+        T               analytical;
     }
 }
 
@@ -99,31 +90,29 @@ subModels
         );
     }
 
-    InjectionModel  ManualInjection;
+    injectionModel  manualInjection;
 
-    DispersionModel StochasticDispersionRAS;
+    dispersionModel stochasticDispersionRAS;
 
-    PatchInteractionModel StandardWallInteraction;
+    patchInteractionModel standardWallInteraction;
 
-    HeatTransferModel RanzMarshall;
+    heatTransferModel RanzMarshall;
 
-    CompositionModel SingleMixtureFraction;
+    compositionModel singleMixtureFraction;
 
-    PhaseChangeModel LiquidEvaporation;
+    phaseChangeModel liquidEvaporation;
 
-    DevolatilisationModel ConstantRateDevolatilisation;
+    devolatilisationModel constantRateDevolatilisation;
 
-    SurfaceReactionModel COxidationKineticDiffusionLimitedRate;
+    surfaceReactionModel COxidationKineticDiffusionLimitedRate;
 
-    PostProcessingModel none;
+    postProcessingModel none;
 
-    CollisionModel  none;
-
-    SurfaceFilmModel none;
+    surfaceFilmModel none;
 
     radiation       on;
 
-    ManualInjectionCoeffs
+    manualInjectionCoeffs
     {
         massTotal       0.0001;
         parcelBasisType mass;
@@ -132,7 +121,7 @@ subModels
         U0              ( 0 -10 0 );
         sizeDistribution
         {
-            pdfType         RosinRammler;
+            type        RosinRammler;
             RosinRammlerDistribution
             {
                 minValue        5e-06;
@@ -143,7 +132,7 @@ subModels
         }
     }
 
-    StandardWallInteractionCoeffs
+    standardWallInteractionCoeffs
     {
         type            rebound;
         e               1;
@@ -155,7 +144,7 @@ subModels
         BirdCorrection  true;
     }
 
-    SingleMixtureFractionCoeffs
+    singleMixtureFractionCoeffs
     {
         phases
         (
@@ -180,7 +169,7 @@ subModels
         YSolidTot0      0.763;
     }
 
-    LiquidEvaporationCoeffs
+    liquidEvaporationCoeffs
     {
         enthalpyTransfer enthalpyDifference;
 
@@ -190,7 +179,7 @@ subModels
         );
     }
 
-    ConstantRateDevolatilisationCoeffs
+    constantRateDevolatilisationCoeffs
     {
         volatileData
         (
@@ -201,6 +190,7 @@ subModels
 
     COxidationKineticDiffusionLimitedRateCoeffs
     {
+        Sb              1;
         C1              5.0E-12;
         C2              0.002;
         E               7.9E+07;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
index cdec67c7f1..7676293a75 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
@@ -24,13 +24,10 @@ solution
 
     sourceTerms
     {
-        U
+        schemes
         {
-            semiImplicit    false;
-        }
-        hs
-        {
-            semiImplicit    false;
+            U               explicit;
+            hs              explicit;
         }
     }
 
@@ -47,7 +44,7 @@ solution
     integrationSchemes
     {
         U               Euler;
-        T               Analytical;
+        T               analytical;
     }
 }
 
@@ -83,23 +80,21 @@ subModels
         );
     }
 
-    InjectionModel  ManualInjection;
+    injectionModel  manualInjection;
 
-    DispersionModel StochasticDispersionRAS;
+    dispersionModel stochasticDispersionRAS;
 
-    PatchInteractionModel StandardWallInteraction;
+    patchInteractionModel standardWallInteraction;
 
-    HeatTransferModel RanzMarshall;
+    heatTransferModel RanzMarshall;
 
-    PostProcessingModel none;
+    postProcessingModel none;
 
-    CollisionModel  none;
-
-    SurfaceFilmModel none;
+    surfaceFilmModel none;
 
     radiation       on;
 
-    ManualInjectionCoeffs
+    manualInjectionCoeffs
     {
         massTotal       0.0001;
         parcelBasisType mass;
@@ -108,7 +103,7 @@ subModels
         U0              ( 0 0 0 );
         sizeDistribution
         {
-            pdfType         RosinRammler;
+            type        RosinRammler;
             RosinRammlerDistribution
             {
                 minValue        5e-06;
@@ -119,7 +114,7 @@ subModels
         }
     }
 
-    StandardWallInteractionCoeffs
+    standardWallInteractionCoeffs
     {
         type            rebound;
         e               1;
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/G b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/G
index 0b83afbf39..993b5237c3 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/G
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/G
@@ -25,6 +25,7 @@ boundaryField
     {
         type            MarshakRadiation;
         T               T;
+        emissivityMode  lookup;
         emissivity      1;
         value           uniform 0;
         refValue        uniform 0;
@@ -35,6 +36,7 @@ boundaryField
     {
         type            MarshakRadiation;
         T               T;
+        emissivityMode  lookup;
         emissivity      1;
         value           uniform 0;
         refValue        uniform 0;
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/G b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/G
index 0b83afbf39..993b5237c3 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/G
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/G
@@ -25,6 +25,7 @@ boundaryField
     {
         type            MarshakRadiation;
         T               T;
+        emissivityMode  lookup;
         emissivity      1;
         value           uniform 0;
         refValue        uniform 0;
@@ -35,6 +36,7 @@ boundaryField
     {
         type            MarshakRadiation;
         T               T;
+        emissivityMode  lookup;
         emissivity      1;
         value           uniform 0;
         refValue        uniform 0;
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
index 5929021b71..3a16d684ef 100755
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
@@ -24,8 +24,9 @@ createBaffles cycLeft '(cycLeft_half0 cycLeft_half1)' -overwrite > log.createBaf
 
 # create the second cyclic - rhs of porous zone
 createBaffles cycRight '(cycRight_half0 cycRight_half1)' -overwrite > log.createBaffles2 2>&1
+
 # Initialise newly created patchFields to 0
-changeDictionary
+runApplication changeDictionary
 
 runApplication $application
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
index 3da7874bf9..c1025505b5 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
@@ -24,21 +24,12 @@ solution
 
     sourceTerms
     {
-        rho
+        schemes
         {
-            semiImplicit    false;
-        }
-        U
-        {
-            semiImplicit    false;
-        }
-        Yi
-        {
-            semiImplicit    false;
-        }
-        hs
-        {
-            semiImplicit    false;
+            rho             explicit;
+            U               explicit;
+            Yi              explicit;
+            hs              explicit;
         }
     }
 
@@ -55,7 +46,7 @@ solution
     integrationSchemes
     {
         U               Euler;
-        T               Analytical;
+        T               analytical;
     }
 }
 
@@ -98,31 +89,29 @@ subModels
         );
     }
 
-    InjectionModel  ReactingMultiphaseLookupTableInjection;
+    injectionModel  reactingMultiphaseLookupTableInjection;
 
-    DispersionModel none;
+    dispersionModel none;
 
-    PatchInteractionModel LocalInteraction;
+    patchInteractionModel localInteraction;
 
-    HeatTransferModel RanzMarshall;
+    heatTransferModel RanzMarshall;
 
-    CompositionModel SingleMixtureFraction;
+    compositionModel singleMixtureFraction;
 
-    PhaseChangeModel LiquidEvaporation;
+    phaseChangeModel liquidEvaporation;
 
-    PostProcessingModel PatchPostProcessing;
+    postProcessingModel patchPostProcessing;
 
-    DevolatilisationModel none;
+    devolatilisationModel none;
 
-    SurfaceReactionModel none;
+    surfaceReactionModel none;
 
-    SurfaceFilmModel none;
-
-    CollisionModel  none;
+    surfaceFilmModel none;
 
     radiation       off;
 
-    ReactingMultiphaseLookupTableInjectionCoeffs
+    reactingMultiphaseLookupTableInjectionCoeffs
     {
         massTotal       1e-2;
         parcelBasisType mass;
@@ -132,7 +121,7 @@ subModels
         parcelsPerSecond 250;
     }
 
-    LocalInteractionCoeffs
+    localInteractionCoeffs
     {
         patches
         (
@@ -156,7 +145,7 @@ subModels
         BirdCorrection  true;
     }
 
-    SingleMixtureFractionCoeffs
+    singleMixtureFractionCoeffs
     {
         phases
         (
@@ -176,14 +165,14 @@ subModels
         YSolidTot0      0;
     }
 
-    LiquidEvaporationCoeffs
+    liquidEvaporationCoeffs
     {
         enthalpyTransfer enthalpyDifference;
 
         activeLiquids   ( H2O );
     }
 
-    PatchPostProcessingCoeffs
+    patchPostProcessingCoeffs
     {
         maxStoredParcels 20;
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
index a1620b8346..39fb1895e3 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
@@ -56,7 +56,7 @@ libs
     "libOpenFOAM.so"
     "libcompressibleTurbulenceModel.so"
     "libcompressibleRASModels.so"
-    "libradiation.so"
+    "libradiationModels.so"
 );
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
index 644a5dacd5..db94abd0f8 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
@@ -24,21 +24,12 @@ solution
 
     sourceTerms
     {
-        rho
+        schemes
         {
-            semiImplicit    false;
-        }
-        U
-        {
-            semiImplicit    false;
-        }
-        Yi
-        {
-            semiImplicit    false;
-        }
-        hs
-        {
-            semiImplicit    false;
+            rho             explicit;
+            U               explicit;
+            Yi              explicit;
+            hs              explicit;
         }
     }
 
@@ -98,31 +89,29 @@ subModels
         );
     }
 
-    InjectionModel  ManualInjection;
+    injectionModel  manualInjection;
 
-    DispersionModel none;
+    dispersionModel none;
 
-    PatchInteractionModel StandardWallInteraction;
+    patchInteractionModel standardWallInteraction;
 
-    HeatTransferModel RanzMarshall;
+    heatTransferModel RanzMarshall;
 
-    CompositionModel SingleMixtureFraction;
+    compositionModel singleMixtureFraction;
 
-    PhaseChangeModel LiquidEvaporation;
+    phaseChangeModel liquidEvaporation;
 
-    DevolatilisationModel none;
+    devolatilisationModel none;
 
-    SurfaceReactionModel none;
+    surfaceReactionModel none;
 
-    PostProcessingModel none;
+    postProcessingModel none;
 
-    SurfaceFilmModel none;
-
-    CollisionModel none;
+    surfaceFilmModel none;
 
     radiation       off;
 
-    ManualInjectionCoeffs
+    manualInjectionCoeffs
     {
         massTotal       5.23599e-10; // 1 droplet of density 1000 kg/m3
         parcelBasisType mass;
@@ -131,7 +120,7 @@ subModels
         U0              (0 0 0);
         sizeDistribution
         {
-            distributionModelType uniform;
+            type uniform;
             uniformDistribution
             {
                 minValue        100e-06;
@@ -139,7 +128,8 @@ subModels
             }
         }
     }
-    StandardWallInteractionCoeffs
+
+    standardWallInteractionCoeffs
     {
         type            rebound;
     }
@@ -149,7 +139,7 @@ subModels
         BirdCorrection  off;
     }
 
-    SingleMixtureFractionCoeffs
+    singleMixtureFractionCoeffs
     {
         phases
         (
@@ -169,7 +159,7 @@ subModels
         YSolidTot0      0;
     }
 
-    LiquidEvaporationCoeffs
+    liquidEvaporationCoeffs
     {
         enthalpyTransfer enthalpyDifference; // latentHeat;
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index be83c13df0..4d8a02f0bb 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -24,21 +24,12 @@ solution
 
     sourceTerms
     {
-        rho
+        schemes
         {
-            semiImplicit    false;
-        }
-        U
-        {
-            semiImplicit    false;
-        }
-        Yi
-        {
-            semiImplicit    false;
-        }
-        hs
-        {
-            semiImplicit    false;
+            rho             explicit;
+            U               explicit;
+            Yi              explicit;
+            hs              explicit;
         }
     }
 
@@ -55,7 +46,7 @@ solution
     integrationSchemes
     {
         U               Euler;
-        T               Analytical;
+        T               analytical;
     }
 }
 
@@ -98,31 +89,29 @@ subModels
         );
     }
 
-    InjectionModel  PatchInjection;
+    injectionModel  patchInjection;
 
-    DispersionModel StochasticDispersionRAS;
+    dispersionModel stochasticDispersionRAS;
 
-    PatchInteractionModel StandardWallInteraction;
+    patchInteractionModel standardWallInteraction;
 
-    HeatTransferModel RanzMarshall;
+    heatTransferModel RanzMarshall;
 
-    CompositionModel SingleMixtureFraction;
+    compositionModel singleMixtureFraction;
 
-    PhaseChangeModel LiquidEvaporation;
+    phaseChangeModel liquidEvaporation;
 
-    DevolatilisationModel none;
+    devolatilisationModel none;
 
-    SurfaceReactionModel none;
+    surfaceReactionModel none;
 
-    PostProcessingModel PatchPostProcessing;
+    postProcessingModel patchPostProcessing;
 
-    SurfaceFilmModel none;
-
-    CollisionModel none;
+    surfaceFilmModel none;
 
     radiation       off;
 
-    PatchInjectionCoeffs
+    patchInjectionCoeffs
     {
         SOI             0.01;
         massTotal       8;
@@ -134,7 +123,7 @@ subModels
         flowRateProfile constant 1;
         sizeDistribution
         {
-            distributionModelType general;
+            type        general;
             generalDistribution
             {
                 distribution
@@ -161,7 +150,7 @@ subModels
         }
     }
 
-    StandardWallInteractionCoeffs
+    standardWallInteractionCoeffs
     {
         type            rebound;
     }
@@ -171,7 +160,7 @@ subModels
         BirdCorrection  off;
     }
 
-    SingleMixtureFractionCoeffs
+    singleMixtureFractionCoeffs
     {
         phases
         (
@@ -191,14 +180,14 @@ subModels
         YSolidTot0      0;
     }
 
-    LiquidEvaporationCoeffs
+    liquidEvaporationCoeffs
     {
         enthalpyTransfer enthalpyDifference;
 
         activeLiquids   ( H2O );
     }
 
-    PatchPostProcessingCoeffs
+    patchPostProcessingCoeffs
     {
         maxStoredParcels 100;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
index 313f51e9be..f49cbb914f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
@@ -24,21 +24,12 @@ solution
 
     sourceTerms
     {
-        rho
+        schemes
         {
-            semiImplicit    false;
-        }
-        U
-        {
-            semiImplicit    false;
-        }
-        Yi
-        {
-            semiImplicit    false;
-        }
-        hs
-        {
-            semiImplicit    false;
+            rho             explicit;
+            U               explicit;
+            Yi              explicit;
+            hs              explicit;
         }
     }
 
@@ -55,7 +46,7 @@ solution
     integrationSchemes
     {
         U               Euler;
-        T               Analytical;
+        T               analytical;
     }
 }
 
@@ -95,27 +86,25 @@ subModels
         );
     }
 
-    InjectionModel  ManualInjection;
+    injectionModel  manualInjection;
 
-    DispersionModel none;
+    dispersionModel none;
 
-    PatchInteractionModel StandardWallInteraction;
+    patchInteractionModel standardWallInteraction;
 
-    HeatTransferModel RanzMarshall;
+    heatTransferModel RanzMarshall;
 
-    CompositionModel SinglePhaseMixture;
+    compositionModel singlePhaseMixture;
 
-    PhaseChangeModel LiquidEvaporation;
+    phaseChangeModel liquidEvaporation;
 
-    PostProcessingModel none;
+    postProcessingModel none;
 
-    CollisionModel none;
-
-    SurfaceFilmModel none;
+    surfaceFilmModel none;
 
     radiation       off;
 
-    ManualInjectionCoeffs
+    manualInjectionCoeffs
     {
         massTotal       1e-8;
         parcelBasisType mass;
@@ -124,7 +113,7 @@ subModels
         U0              ( 0 0 0 );
         sizeDistribution
         {
-            pdfType         uniform;
+            type        uniform;
             uniformDistribution
             {
                 minValue        1e-04;
@@ -133,7 +122,7 @@ subModels
         }
     }
 
-    StandardWallInteractionCoeffs
+    standardWallInteractionCoeffs
     {
         type            rebound;
     }
@@ -143,7 +132,7 @@ subModels
         BirdCorrection  true;
     }
 
-    SinglePhaseMixtureCoeffs
+    singlePhaseMixtureCoeffs
     {
         phases
         (
@@ -154,7 +143,7 @@ subModels
         );
     }
 
-    LiquidEvaporationCoeffs
+    liquidEvaporationCoeffs
     {
         enthalpyTransfer enthalpyDifference;
 
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options
index 345c5148f7..bb5791463c 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options
@@ -4,10 +4,10 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
index eb5945f5d2..f5de50c4ca 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
@@ -24,9 +24,9 @@ solution
 
     sourceTerms
     {
-        U
+        schemes
         {
-            semiImplicit    false;
+            U               explicit;
         }
     }
 
@@ -67,19 +67,17 @@ subModels
         );
     }
 
-    InjectionModel  ManualInjection;
+    injectionModel  manualInjection;
 
-    DispersionModel StochasticDispersionRAS;
+    dispersionModel stochasticDispersionRAS;
 
-    PatchInteractionModel StandardWallInteraction;
+    patchInteractionModel standardWallInteraction;
 
-    PostProcessingModel none;
+    postProcessingModel none;
 
-    SurfaceFilmModel none;
+    surfaceFilmModel none;
 
-    CollisionModel none;
-
-    ManualInjectionCoeffs
+    manualInjectionCoeffs
     {
         massTotal       0.0002;
         parcelBasisType mass;
@@ -88,7 +86,7 @@ subModels
         U0              ( 0 0 0 );
         sizeDistribution
         {
-            pdfType         RosinRammler;
+            type        RosinRammler;
             RosinRammlerDistribution
             {
                 minValue        5e-05;
@@ -99,7 +97,7 @@ subModels
         }
     }
 
-    StandardWallInteractionCoeffs
+    standardWallInteractionCoeffs
     {
         type            rebound;
     }
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
index 713b1977a6..01cc6bd7b0 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
@@ -24,13 +24,10 @@ solution
 
     sourceTerms
     {
-        U
+        schemes
         {
-            semiImplicit    false;
-        }
-        hs
-        {
-            semiImplicit    false;
+            U               explicit;
+            hs              explicit;
         }
     }
 
@@ -46,7 +43,7 @@ solution
     integrationSchemes
     {
         U               Euler;
-        T               Analytical;
+        T               analytical;
     }
 }
 
@@ -82,23 +79,21 @@ subModels
         );
     }
 
-    InjectionModel  ManualInjection;
+    injectionModel  manualInjection;
 
-    DispersionModel StochasticDispersionRAS;
+    dispersionModel stochasticDispersionRAS;
 
-    PatchInteractionModel StandardWallInteraction;
+    patchInteractionModel standardWallInteraction;
 
-    HeatTransferModel RanzMarshall;
+    heatTransferModel RanzMarshall;
 
-    PostProcessingModel none;
+    postProcessingModel none;
 
-    CollisionModel none;
-
-    SurfaceFilmModel none;
+    surfaceFilmModel none;
 
     radiation       off;
 
-    ManualInjectionCoeffs
+    manualInjectionCoeffs
     {
         massTotal       0.0001;
         parcelBasisType mass;
@@ -107,7 +102,7 @@ subModels
         U0              ( 0 0 0 );
         sizeDistribution
         {
-            pdfType         RosinRammler;
+            type        RosinRammler;
             RosinRammlerDistribution
             {
                 minValue        5e-06;
@@ -118,7 +113,7 @@ subModels
         }
     }
 
-    StandardWallInteractionCoeffs
+    standardWallInteractionCoeffs
     {
         type            rebound;
     }
diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 45a6113ef3..7137bf6f17 100644
--- a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -30,24 +30,12 @@ solution
     sourceTerms
     {
         resetOnStartup  false;
-        U
+        schemes
         {
-            alpha           1;
-            semiImplicit    true;
-        }
-        hs
-        {
-            alpha           1;
-            semiImplicit    true;
-        }
-        rho
-        {
-            alpha           1;
-            semiImplicit    false;
-        }
-        Yi
-        {
-            semiImplicit    true;
+            rho             semiImplicit 1;
+            U               semiImplicit 1;
+            Yi              semiImplicit 1;
+            hs              semiImplicit 1;
         }
     }
 
@@ -64,7 +52,7 @@ solution
     integrationSchemes
     {
         U               Euler;
-        T               Analytical;
+        T               analytical;
     }
 }
 
@@ -109,32 +97,30 @@ subModels
         );
     }
 
-    InjectionModel  PatchInjection;
+    injectionModel  patchInjection;
 
-    DispersionModel StochasticDispersionRAS;
+    dispersionModel stochasticDispersionRAS;
 
-    PatchInteractionModel StandardWallInteraction;
+    patchInteractionModel standardWallInteraction;
 
-    HeatTransferModel RanzMarshall;
+    heatTransferModel RanzMarshall;
 
-    CompositionModel SingleMixtureFraction;
+    compositionModel singleMixtureFraction;
 
-    PhaseChangeModel LiquidEvaporation;
+    phaseChangeModel liquidEvaporation;
 
-    DevolatilisationModel none;
+    devolatilisationModel none;
 
-    SurfaceReactionModel none;
+    surfaceReactionModel none;
 
-    PostProcessingModel ParticleTracks;
+    postProcessingModel particleTracks;
 
-    SurfaceFilmModel none;
-
-    CollisionModel none;
+    surfaceFilmModel none;
 
     radiation       off;
 
 
-    PatchInjectionCoeffs
+    patchInjectionCoeffs
     {
         massFlowRate    0.8e-03;
         parcelBasisType mass;
@@ -145,7 +131,7 @@ subModels
         flowRateProfile constant 1;
         sizeDistribution
         {
-            distributionModelType general;
+            type        general;
             generalDistribution
             {
                 distribution
@@ -172,7 +158,7 @@ subModels
         }
     }
 
-    StandardWallInteractionCoeffs
+    standardWallInteractionCoeffs
     {
         type            rebound;
     }
@@ -182,7 +168,7 @@ subModels
         BirdCorrection  off;
     }
 
-    SingleMixtureFractionCoeffs
+    singleMixtureFractionCoeffs
     {
         phases
         (
@@ -202,19 +188,19 @@ subModels
         YSolidTot0      0;
     }
 
-    LiquidEvaporationCoeffs
+    liquidEvaporationCoeffs
     {
         enthalpyTransfer enthalpyDifference;
         activeLiquids   ( H2O );
     }
 
-    PatchPostProcessingCoeffs
+    patchPostProcessingCoeffs
     {
         maxStoredParcels 100;
         patches         ( outlet );
     }
 
-    ParticleTracksCoeffs
+    particleTracksCoeffs
     {
         trackInterval   5;
         maxSamples      1000000;