diff --git a/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImage.cpp b/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImage.cpp
index 0001c88bfd..936bb32adb 100644
--- a/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImage.cpp
+++ b/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImage.cpp
@@ -1,50 +1,57 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date: 2008-02-08 11:19:03 +0100 (Fr, 08 Feb 2008) $
 Version:   $Revision: 11989 $
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
 #ifndef __mitkTbssImage__cpp
 #define __mitkTbssImage__cpp
 
 
 #include "mitkTbssImage.h"
 #include "itkImageRegionIterator.h"
 #include "itkImageRegionConstIterator.h"
 #include "mitkImageCast.h"
 
 
+
+template<typename TPixelType>
+mitk::TbssImage<TPixelType>::TbssImage() : m_PreprocessedFA(false)
+{
+
+}
+
 /*
 template<typename TPixelType>
 mitk::TbssImage<TPixelType>::TbssImage()
 {
 
 }
 
 template<typename TPixelType>
 mitk::TbssImage<TPixelType>::~TbssImage()
 {
 
 }
 
 
 template<typename TPixelType>
 void mitk::TbssImage<TPixelType>::InitializeFromImage()
 {
 
 }
 
 
 */
 #endif /* __mitkTbssImage__cpp */
diff --git a/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImage.h b/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImage.h
index fd74e652d9..2765508fea 100644
--- a/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImage.h
+++ b/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImage.h
@@ -1,127 +1,142 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date: 2008-02-07 17:17:57 +0100 (Do, 07 Feb 2008) $
 Version:   $Revision: 11989 $
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
 
 #ifndef __mitkTbssImage__h
 #define __mitkTbssImage__h
 
 #include "mitkImage.h"
 #include "itkImage.h"
 #include "mitkImageCast.h"
 
 namespace mitk 
 {
 
   /**
   * \brief this class encapsulates diffusion volumes (vectorimages not
   * yet supported by mitkImage)
   */
   template<class TPixelType>
   class TbssImage : public Image
   {
 
   public:
     typedef TPixelType PixelType;
     typedef typename itk::Image<TPixelType, 3>  ImageType;
     typedef itk::Index<3> IndexType;
     //typedef typename std::vector <Index<3> > RoiType;
 
     mitkClassMacro( TbssImage, Image )
     itkNewMacro(Self)
 
     enum Type{
       ROI,
       SKELETON
     };
 
 
     //void SetRequestedRegionToLargestPossibleRegion();
     //bool RequestedRegionIsOutsideOfTheBufferedRegion();
     //virtual bool VerifyRequestedRegion();
     //void SetRequestedRegion(itk::DataObject *data);
 
     typename ImageType::Pointer GetImage()
     {
       return m_Image;
     }
     void SetImage(typename ImageType::Pointer image )
     {
       this->m_Image = image;
     }
 
     itkSetMacro(TbssType, Type)
     itkGetMacro(TbssType, Type)
     itkGetMacro(PreprocessedFA, bool)
     itkSetMacro(PreprocessedFA, bool)
     itkGetMacro(PreprocessedFAFile, std::string)
     itkSetMacro(PreprocessedFAFile, std::string)
     itkGetMacro(Structure, std::string)
     itkSetMacro(Structure, std::string)
 
     void SetRoi(std::vector< itk::Index<3> > roi)
     {
       m_Roi = roi;
     }
 
+
+    // depricated
     std::vector< itk::Index<3> > GetRoi()
     {
       return m_Roi;
     }
 
     void InitializeFromImage()
     {
       MITK_INFO << "make an mitk image that can be shown by mitk";
       this->InitializeByItk(m_Image.GetPointer(),1,1);
     }
 
-  protected:
-    TbssImage():m_PreprocessedFA(false)
+    void SetNumberOfGroups(int i)
     {
+      m_NumberOfGroups = i;
+    }
 
+    int GetNumberOfGroups()
+    {
+      return m_NumberOfGroups;
     }
+
+
+  protected:
+    TbssImage();
     virtual ~TbssImage(){}
 
     typename ImageType::Pointer m_Image;
 
     Type m_TbssType;
 
     std::vector< itk::Index<3> > m_Roi;
 
     bool m_PreprocessedFA;
     std::string m_PreprocessedFAFile;
 
     std::string m_Structure;
 
+
+    int m_NumberOfGroups;
+    std::vector< std::pair<std::string, int> > m_Groups;
+
+
   };
 
 
   // Does the same es the normal CastToMitkImage, but needed to reimplemented due to the templatet pixeltype
   template <typename ItkOutputImageType, typename PixelType>
   void CastToTbssImage(const ItkOutputImageType* itkimage, itk::SmartPointer< mitk::TbssImage<PixelType> >& tbssoutputimage)
   {
     if(tbssoutputimage.IsNull())
     {
       tbssoutputimage = mitk::TbssImage<PixelType>::New();
     }
     tbssoutputimage->InitializeByItk(itkimage);
     tbssoutputimage->SetChannel(itkimage->GetBufferPointer());
   }
 
 } // namespace mitk
 
 #include "mitkTbssImage.cpp"
 #endif /* __mitkTbssImage__h */
diff --git a/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImporter.cpp b/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImporter.cpp
new file mode 100644
index 0000000000..4699da38b4
--- /dev/null
+++ b/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImporter.cpp
@@ -0,0 +1,183 @@
+/*=========================================================================
+
+Program:   Medical Imaging & Interaction Toolkit
+Language:  C++
+Date:      $Date: 2009-07-14 19:11:20 +0200 (Tue, 14 Jul 2009) $
+Version:   $Revision: 18127 $
+
+Copyright (c) German Cancer Research Center, Division of Medical and
+Biological Informatics. All rights reserved.
+See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
+
+This software is distributed WITHOUT ANY WARRANTY; without even
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
+#ifndef __mitkTbssImporter_cpp
+#define __mitkTbssImporter_cpp
+
+#include "mitkTbssImporter.h"
+#include <QDir>
+#include <QStringList>
+
+
+
+namespace mitk
+{
+  template<typename TPixelType>
+  mitk::TbssImporter<TPixelType>::TbssImporter()
+  {
+
+  }
+
+  template<typename TPixelType>
+  mitk::TbssImporter<TPixelType>::TbssImporter(std::string path) : m_InputPath(path)
+  {
+
+  }
+
+  template<typename TPixelType>
+  mitk::TbssImage<TPixelType>* mitk::TbssImporter<TPixelType>::Import()
+  {
+    // read all images with all_*.nii.gz
+
+
+    QDir currentDir = QDir(QString(m_InputPath.c_str()));
+    currentDir.setFilter( QDir::Files );
+    QStringList entries = currentDir.entryList();
+
+    std::vector<double> values;
+
+    for(int i=0; i<entries.size(); i++)
+    {
+
+      std::string filename = entries.at(i).toStdString();
+
+      if (std::string::npos != filename.find("all") && std::string::npos != filename.find("skeletonised"))
+      {
+
+        size_t found = m_InputPath.find_last_of("/");
+        size_t end = m_InputPath.size();
+
+        // Found a 4d skeletonized image
+        if(m_InputPath.find_last_of("/") != m_InputPath.size()-1)
+        {
+          m_InputPath += "/";
+        }
+
+        std::string file = m_InputPath + filename;
+        FileReaderType4D::Pointer reader = FileReaderType4D::New();
+        reader->SetFileName(file);
+        reader->Update();
+
+        FloatImage4DType::Pointer img = FloatImage4DType::New();
+        img = reader->GetOutput();
+
+        //Create new m_Data (only once)
+        if(m_Data.IsNull())
+        {
+          m_Data = DataImageType::New();
+
+
+          FloatImage4DType::SizeType size = img->GetLargestPossibleRegion().GetSize();
+          FloatImage4DType::SpacingType spacing = img->GetSpacing();
+
+
+          DataImageType::SizeType dataSize;
+          dataSize[0] = size[0];
+          dataSize[1] = size[1];
+          dataSize[2] = size[2];
+
+          m_Data->SetRegions(dataSize);
+
+
+          DataImageType::SpacingType dataSpacing;
+          dataSpacing[0] = spacing[0];
+          dataSpacing[1] = spacing[1];
+          dataSpacing[2] = spacing[2];
+
+          m_Data->SetSpacing(dataSpacing);
+
+          FloatImage4DType::PointType origin = img->GetOrigin();
+
+          DataImageType::PointType dataOrigin;
+          dataOrigin[0] = origin[0];
+          dataOrigin[1] = origin[1];
+          dataOrigin[2] = origin[2];
+
+          m_Data->SetOrigin(dataOrigin);
+
+
+          FloatImage4DType::DirectionType dir = img->GetDirection();
+
+          DataImageType::DirectionType dataDir;
+          for(int i=0; i<=2; i++)
+          {
+            for(int j=0; j<=2; j++)
+            {
+              dataDir[i][j] = dir[i][j];
+            }
+          }
+
+          m_Data->SetDirection(dataDir);
+
+          m_Data->Allocate();
+
+
+
+        }
+
+
+        // m_Data should be allocated here so move on filling it with values from the 4D image
+        FloatImage4DType::SizeType size = img->GetLargestPossibleRegion().GetSize();
+        DataImageType::SizeType dataSize = m_Data->GetLargestPossibleRegion().GetSize();
+
+
+        DataImageType::DirectionType dataDir;
+        for(int i=0; i<=2; i++)
+        {
+          for(int j=0; j<=2; j++)
+          {
+            for(int k=0; k<=2; k++)
+            {
+              itk::Index<3> ix;
+              ix[0] = i;
+              ix[1] = j;
+              ix[2] = k;
+              itk::VariableLengthVector<float> pixel = m_Data->GetPixel(ix);
+              int vecSize = pixel.Size();
+
+              pixel.SetSize(size[3]+vecSize, false);
+
+              for(int z=0; z<size[3]; z++)
+              {
+                itk::Index<4> ix4;
+                ix4[0] = i;
+                ix4[1] = j;
+                ix4[2] = k;
+                ix4[3] = z;
+                float value = img->GetPixel(ix4);
+
+                pixel.SetElement(z, value);
+              }
+            }
+          }
+        }
+
+
+        std::cout << "found!" << std::endl;
+      }
+
+
+
+    }
+
+  }
+
+}
+
+
+
+#endif // __mitkTbssImporter_cpp
diff --git a/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImporter.h b/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImporter.h
new file mode 100644
index 0000000000..a868dc3302
--- /dev/null
+++ b/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImporter.h
@@ -0,0 +1,73 @@
+/*=========================================================================
+
+Program:   Medical Imaging & Interaction Toolkit
+Language:  C++
+Date:      $Date: 2009-07-14 19:11:20 +0200 (Tue, 14 Jul 2009) $
+Version:   $Revision: 18127 $
+
+Copyright (c) German Cancer Research Center, Division of Medical and
+Biological Informatics. All rights reserved.
+See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
+
+This software is distributed WITHOUT ANY WARRANTY; without even
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
+#ifndef __mitkTbssImporter_h
+#define __mitkTbssImporter_h
+
+#include "mitkCommon.h"
+#include "mitkFileReader.h"
+
+#include "itkImage.h"
+#include "itkVectorImage.h"
+#include "itkImageFileReader.h"
+#include "mitkTbssImage.h"
+
+
+namespace mitk
+{
+  template<class TPixelType>
+  class TbssImporter : public itk::Object {
+
+  public:
+    typedef TPixelType PixelType;
+    typedef itk::VectorImage<float> DataImageType; // type of the 3d vector image containing the skeletonized images
+    typedef itk::Image<float, 4> FloatImage4DType;
+    typedef itk::ImageFileReader<FloatImage4DType> FileReaderType4D;
+
+    TbssImporter();
+
+    mitkClassMacro( TbssImporter, Object )
+    itkNewMacro(Self)
+
+
+
+    TbssImporter(std::string path);
+
+    void SetInputPath(std::string p)
+    {
+      m_InputPath = p;
+    }
+
+    mitk::TbssImage<TPixelType>* Import();
+
+  protected:
+
+
+
+    virtual ~TbssImporter(){}
+
+    std::string m_InputPath;
+
+    DataImageType::Pointer m_Data;
+
+
+  };
+
+}
+
+#include "mitkTbssImporter.cpp"
+#endif // __mitkTbssImporter_h
diff --git a/Modules/DiffusionImaging/files.cmake b/Modules/DiffusionImaging/files.cmake
index f7593f9911..09e8141b90 100644
--- a/Modules/DiffusionImaging/files.cmake
+++ b/Modules/DiffusionImaging/files.cmake
@@ -1,154 +1,155 @@
 SET(CPP_FILES
 
   # DicomImport
   DicomImport/mitkDicomDiffusionImageReader.cpp
   DicomImport/mitkGroupDiffusionHeadersFilter.cpp
   DicomImport/mitkDicomDiffusionImageHeaderReader.cpp
   DicomImport/mitkGEDicomDiffusionImageHeaderReader.cpp
   DicomImport/mitkPhilipsDicomDiffusionImageHeaderReader.cpp
   DicomImport/mitkSiemensDicomDiffusionImageHeaderReader.cpp
   DicomImport/mitkSiemensMosaicDicomDiffusionImageHeaderReader.cpp
 
   # DataStructures
   IODataStructures/mitkDiffusionImagingObjectFactory.cpp
 
   # DataStructures -> DWI
   IODataStructures/DiffusionWeightedImages/mitkDiffusionImageHeaderInformation.cpp
   IODataStructures/DiffusionWeightedImages/mitkDiffusionImageSource.cpp
   IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageReader.cpp
   IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageWriter.cpp
   IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageIOFactory.cpp
   IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageWriterFactory.cpp
   IODataStructures/DiffusionWeightedImages/mitkDiffusionImageSerializer.cpp
 
   # DataStructures -> QBall
   IODataStructures/QBallImages/mitkQBallImageSource.cpp
   IODataStructures/QBallImages/mitkNrrdQBallImageReader.cpp
   IODataStructures/QBallImages/mitkNrrdQBallImageWriter.cpp
   IODataStructures/QBallImages/mitkNrrdQBallImageIOFactory.cpp
   IODataStructures/QBallImages/mitkNrrdQBallImageWriterFactory.cpp
   IODataStructures/QBallImages/mitkQBallImage.cpp
   IODataStructures/QBallImages/mitkQBallImageSerializer.cpp
 
   # DataStructures -> Tensor
   IODataStructures/TensorImages/mitkTensorImageSource.cpp
   IODataStructures/TensorImages/mitkNrrdTensorImageReader.cpp
   IODataStructures/TensorImages/mitkNrrdTensorImageWriter.cpp
   IODataStructures/TensorImages/mitkNrrdTensorImageIOFactory.cpp
   IODataStructures/TensorImages/mitkNrrdTensorImageWriterFactory.cpp
   IODataStructures/TensorImages/mitkTensorImage.cpp
   IODataStructures/TensorImages/mitkTensorImageSerializer.cpp
 
   # DataStructures -> FiberBundle
   IODataStructures/FiberBundle/mitkFiberBundle.cpp
   IODataStructures/FiberBundle/mitkFiberBundleWriter.cpp
   IODataStructures/FiberBundle/mitkFiberBundleReader.cpp
   IODataStructures/FiberBundle/mitkFiberBundleIOFactory.cpp
   IODataStructures/FiberBundle/mitkFiberBundleWriterFactory.cpp
   IODataStructures/FiberBundle/mitkFiberBundleSerializer.cpp
   IODataStructures/FiberBundle/mitkParticle.cpp
   IODataStructures/FiberBundle/mitkParticleGrid.cpp
 
 # DataStructures -> FiberBundleX
   IODataStructures/FiberBundleX/mitkFiberBundleX.cpp
   IODataStructures/FiberBundleX/mitkFiberBundleXWriter.cpp
   IODataStructures/FiberBundleX/mitkFiberBundleXReader.cpp
   IODataStructures/FiberBundleX/mitkFiberBundleXIOFactory.cpp
   IODataStructures/FiberBundleX/mitkFiberBundleXWriterFactory.cpp
   IODataStructures/FiberBundleX/mitkFiberBundleXSerializer.cpp
   IODataStructures/FiberBundleX/mitkFiberBundleXThreadMonitor.cpp
 
 
   # DataStructures -> PlanarFigureComposite
   IODataStructures/PlanarFigureComposite/mitkPlanarFigureComposite.cpp
 
 
   # DataStructures -> Tbss
   IODataStructures/TbssImages/mitkTbssImageSource.cpp
   IODataStructures/TbssImages/mitkNrrdTbssImageReader.cpp
   IODataStructures/TbssImages/mitkNrrdTbssImageIOFactory.cpp
   IODataStructures/TbssImages/mitkTbssImage.cpp
   IODataStructures/TbssImages/mitkNrrdTbssImageWriter.cpp
   IODataStructures/TbssImages/mitkNrrdTbssImageWriterFactory.cpp
+  IODataStructures/TbssImages/mitkTbssImporter.cpp
 
 
   # Rendering
   Rendering/vtkMaskedProgrammableGlyphFilter.cpp
   Rendering/mitkCompositeMapper.cpp
   Rendering/mitkVectorImageVtkGlyphMapper3D.cpp
   Rendering/vtkOdfSource.cxx
   Rendering/vtkThickPlane.cxx
   Rendering/mitkOdfNormalizationMethodProperty.cpp
   Rendering/mitkOdfScaleByProperty.cpp
   Rendering/mitkFiberBundleMapper3D.cpp
   Rendering/mitkFiberBundleXMapper3D.cpp
   Rendering/mitkFiberBundleXThreadMonitorMapper3D.cpp
   
 # Interactions
   Interactions/mitkFiberBundleInteractor.cpp
 
   # Algorithms
   Algorithms/mitkPartialVolumeAnalysisHistogramCalculator.cpp
   Algorithms/mitkPartialVolumeAnalysisClusteringCalculator.cpp
 )
 
 SET(H_FILES
   # Rendering
   Rendering/mitkDiffusionImageMapper.h
   Rendering/mitkOdfVtkMapper2D.h
   Rendering/mitkFiberBundleMapper3D.h
   Rendering/mitkFiberBundleXMapper3D.h
   Rendering/mitkFiberBundleXThreadMonitorMapper3D.h
 
   # Reconstruction
   Reconstruction/itkDiffusionQballReconstructionImageFilter.h
   Reconstruction/mitkTeemDiffusionTensor3DReconstructionImageFilter.h
   Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.h
   Reconstruction/itkPointShell.h
   Reconstruction/itkOrientationDistributionFunction.h
 
   # IO Datastructures
   IODataStructures/DiffusionWeightedImages/mitkDiffusionImage.h
   IODataStructures/FiberBundle/itkSlowPolyLineParametricPath.h
   IODataStructures/TbssImages/mitkTbssImage.h
 
   # DataStructures -> FiberBundleX
   IODataStructures/FiberBundleX/mitkFiberBundleX.h
   IODataStructures/FiberBundleX/mitkFiberBundleXWriter.h
   IODataStructures/FiberBundleX/mitkFiberBundleXReader.h
   IODataStructures/FiberBundleX/mitkFiberBundleXIOFactory.h
   IODataStructures/FiberBundleX/mitkFiberBundleXWriterFactory.h
   IODataStructures/FiberBundleX/mitkFiberBundleXSerializer.h
   IODataStructures/FiberBundleX/mitkFiberBundleXThreadMonitor.h
 
 
 
   # Tractography
   Tractography/itkGibbsTrackingFilter.h
 
   # Algorithms
   Algorithms/itkDiffusionQballGeneralizedFaImageFilter.h
   Algorithms/itkDiffusionQballPrepareVisualizationImageFilter.h
   Algorithms/itkTensorDerivedMeasurementsFilter.h
   Algorithms/itkBrainMaskExtractionImageFilter.h
   Algorithms/itkB0ImageExtractionImageFilter.h
   Algorithms/itkTensorImageToDiffusionImageFilter.h
   Algorithms/itkTensorToL2NormImageFilter.h
   Algorithms/itkTractsToProbabilityImageFilter.h
   Algorithms/itkTractsToDWIImageFilter.h
   Algorithms/itkTractsToFiberEndingsImageFilter.h
   Algorithms/itkGaussianInterpolateImageFunction.h
   Algorithms/mitkPartialVolumeAnalysisHistogramCalculator.h
   Algorithms/mitkPartialVolumeAnalysisClusteringCalculator.h
   Algorithms/itkDiffusionTensorPrincipleDirectionImageFilter.h
   Algorithms/itkCartesianToPolarVectorImageFilter.h
   Algorithms/itkPolarToCartesianVectorImageFilter.h
 )
 
 SET( TOOL_FILES
 )
 
 IF(WIN32)
 ENDIF(WIN32)
 
 #MITK_MULTIPLEX_PICTYPE( Algorithms/mitkImageRegistrationMethod-TYPE.cpp )