diff --git a/Data/Packed/Static.hs b/Data/Packed/Static.hs
new file mode 100644
--- /dev/null
+++ b/Data/Packed/Static.hs
@@ -0,0 +1,29 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Data.Packed.Static
+-- Copyright   :  (c) Reiner Pope 2008
+-- License     :  GPL-style
+--
+-- Maintainer  :  Reiner Pope <reiner.pope@gmail.com>
+-- Stability   :  provisional
+-- Portability :  portable
+--
+-- Statically-dimensioned vectors and matrices.
+--
+-----------------------------------------------------------------------------
+
+
+module Data.Packed.Static(
+     module Data.Packed.Static.Shapes,
+     module Data.Packed.Static.Vector,
+     module Data.Packed.Static.Matrix,
+     module Data.Packed.Static.Syntax,
+     module Data.Packed.Static.Imports,
+ ) where
+
+import Data.Packed.Static.Shapes
+import Data.Packed.Static.Vector
+import Data.Packed.Static.Matrix
+import Data.Packed.Static.Syntax
+import Data.Packed.Static.Imports
+
diff --git a/Data/Packed/Static/Convert.hs b/Data/Packed/Static/Convert.hs
new file mode 100644
--- /dev/null
+++ b/Data/Packed/Static/Convert.hs
@@ -0,0 +1,82 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Data.Packed.Static.Convert
+-- Copyright   :  (c) Reiner Pope 2008
+-- License     :  GPL-style
+--
+-- Maintainer  :  Reiner Pope <reiner.pope@gmail.com>
+-- Stability   :  experimental
+-- Portability :  portable
+--
+-- Conversions to other forms.
+--
+-----------------------------------------------------------------------------
+
+module Data.Packed.Static.Convert where
+
+import qualified Data.Packed.Convert as HS
+import qualified Numeric.LinearAlgebra as H
+
+import Data.Packed.Static.Shapes
+import Data.Packed.Static.Internal
+import Data.Packed.Static.Imports
+import Data.Packed.Static.Vector
+import Data.Packed.Static.Matrix
+
+import Data.Array.MArray
+import Data.Array.IArray
+import Data.Array.Unboxed
+import Data.Array.Storable
+import Control.Monad.ST
+
+-- | Constructs a vector from an hmatrix (dynamically-lengthed) vector.
+fromHVectorU :: H.Vector t -> Vector Unknown t
+fromHVectorU = wrapU
+
+-- | Gives the underlying hmatrix representation.
+toHVector :: Vector n t -> H.Vector t
+toHVector = unWrap
+
+
+arrayFromVector :: (Storable t) => Vector n t -> Array Int t
+arrayFromVector = HS.arrayFromVector . unVector
+
+vectorFromArray :: Storable t => Array Int t -> Vector Unknown t
+vectorFromArray = Vector . HS.vectorFromArray
+
+mArrayFromVector :: (MArray b t (ST s), Storable t) =>                    Vector n t -> ST s (b Int t)
+mArrayFromVector = HS.mArrayFromVector . unVector
+
+vectorFromMArray :: (Storable t) => Array Int t -> Vector n t
+vectorFromMArray = Vector . HS.vectorFromArray
+
+vectorToStorableArray :: (Storable t) => 
+       Vector n t -> IO (StorableArray Int t)
+vectorToStorableArray = HS.vectorToStorableArray . unVector
+
+storableArrayToVector :: Storable t =>
+       StorableArray Int t -> IO (Vector Unknown t)
+storableArrayToVector = fmap Vector . HS.storableArrayToVector
+
+-- | Constructs a vector from an hmatrix (dynamically-lengthed) vector.
+fromHMatrixU :: H.Matrix t -> Matrix (Unknown,Unknown) t
+fromHMatrixU = wrapU
+
+-- | Gives the underlying hmatrix representation.
+toHMatrix :: Matrix (m,n) t -> H.Matrix t
+toHMatrix = unWrap
+
+
+arrayFromMatrix :: Matrix mn Double -> UArray (Int, Int) Double
+arrayFromMatrix = HS.arrayFromMatrix . unMatrix
+
+matrixFromArray :: UArray (Int, Int) Double -> Matrix mn Double
+matrixFromArray = Matrix . HS.matrixFromArray
+
+mArrayFromMatrix :: (MArray b Double m) =>
+                    Matrix mn Double -> m (b (Int, Int) Double)
+mArrayFromMatrix = HS.mArrayFromMatrix . unMatrix
+
+matrixFromMArray :: (MArray a Double (ST s)) =>
+                    a (Int, Int) Double -> ST s (Matrix mn Double)
+matrixFromMArray = fmap Matrix . HS.matrixFromMArray
diff --git a/Data/Packed/Static/Imports.hs b/Data/Packed/Static/Imports.hs
new file mode 100644
--- /dev/null
+++ b/Data/Packed/Static/Imports.hs
@@ -0,0 +1,33 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Data.Packed.Static.Imports
+-- Copyright   :  (c) Reiner Pope 2008
+-- License     :  GPL-style
+--
+-- Maintainer  :  Reiner Pope <reiner.pope@gmail.com>
+-- Stability   :  experimental
+-- Portability :  portable
+--
+-- Useful imports from other packages. In particular:
+-- imports from TFP, Foreign.Storable, and HMatrix.
+--
+-----------------------------------------------------------------------------
+
+module Data.Packed.Static.Imports(
+   H.Element,
+   H.Field,
+   H.Linear,
+   F.Storable,
+   module Types.Data.Num,
+   True,
+   (:<=:),
+   Min,
+  ) where
+
+import qualified Numeric.LinearAlgebra as H
+import qualified Foreign.Storable as F
+
+import Types.Data.Num
+import Types.Data.Bool(True)
+import Types.Data.Ord((:<=:), Min)
+
diff --git a/Data/Packed/Static/Internal.hs b/Data/Packed/Static/Internal.hs
new file mode 100644
--- /dev/null
+++ b/Data/Packed/Static/Internal.hs
@@ -0,0 +1,21 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Data.Packed.Static.Internal
+-- Copyright   :  (c) Reiner Pope 2008
+-- License     :  GPL-style
+--
+-- Maintainer  :  Reiner Pope <reiner.pope@gmail.com>
+-- Stability   :  experimental
+-- Portability :  portable
+--
+-- Internals.
+--
+-----------------------------------------------------------------------------
+
+module Data.Packed.Static.Internal(
+   module Data.Packed.Static.Internal.Vector,
+   module Data.Packed.Static.Internal.Matrix,
+  ) where
+
+import Data.Packed.Static.Internal.Vector
+import Data.Packed.Static.Internal.Matrix
diff --git a/Data/Packed/Static/Internal/Matrix.hs b/Data/Packed/Static/Internal/Matrix.hs
new file mode 100644
--- /dev/null
+++ b/Data/Packed/Static/Internal/Matrix.hs
@@ -0,0 +1,23 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Data.Packed.Static.Internal.Matrix
+-- Copyright   :  (c) Reiner Pope 2008
+-- License     :  GPL-style
+--
+-- Maintainer  :  Reiner Pope <reiner.pope@gmail.com>
+-- Stability   :  experimental
+-- Portability :  portable
+--
+-- Matrix newtype definition.
+--
+-----------------------------------------------------------------------------
+
+
+module Data.Packed.Static.Internal.Matrix(
+   Matrix(..),
+ ) where
+
+import qualified Numeric.LinearAlgebra as H
+
+-- | A matrix with @m@ rows, @n@ columns.
+newtype Matrix mn t = Matrix { unMatrix :: H.Matrix t } deriving()
diff --git a/Data/Packed/Static/Internal/Vector.hs b/Data/Packed/Static/Internal/Vector.hs
new file mode 100644
--- /dev/null
+++ b/Data/Packed/Static/Internal/Vector.hs
@@ -0,0 +1,50 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Data.Packed.Static.Internal.Vector
+-- Copyright   :  (c) Reiner Pope 2008
+-- License     :  GPL-style
+--
+-- Maintainer  :  Reiner Pope <reiner.pope@gmail.com>
+-- Stability   :  experimental
+-- Portability :  portable
+--
+-- Vector newtype definition.
+--
+-----------------------------------------------------------------------------
+
+
+module Data.Packed.Static.Internal.Vector(
+   Vector(..),
+ ) where
+
+import qualified Numeric.LinearAlgebra as H
+
+-- | A vector with elements of type @t@ and length @n@.
+-- The type @n@ encodes the vector's length, and will
+-- usually either be 'Unknown' or will satisfy 'PositiveT'.
+-- 
+-- Operations which return vectors of length 'Unknown'
+-- will return vectors whose lengths are determined
+-- at runtime. All operations which mention 'Unknown'
+-- lengths will have names ending in an uppercase U,
+-- for example 'fromListU', 'subVectorU'.
+-- 
+-- The use of 'Unknown' facilitates manipulation
+-- of dynamically-lengthed vectors without
+-- using continuations for each operation, since
+-- most operations work equally well for lengthed
+-- as well as unlengthed vectors. When vectors
+-- of 'Unknown' length are used, runtime length
+-- mismatches may arise, and the system is as safe
+-- as hmatrix.
+-- 
+-- When the length of every vector is known, if
+-- the code typechecks, then there will be
+-- no runtime vector length mismatches. Equivalently,
+-- there will be no runtime vector length mismatches
+-- if:
+-- 
+--   * no unsafe functions are used; and 
+-- 
+--   * no functions mentioning 'Unknown' are used, i.e. no functions with suffix U are used.
+newtype Vector n t = Vector { unVector :: H.Vector t } 
diff --git a/Data/Packed/Static/Matrix.hs b/Data/Packed/Static/Matrix.hs
new file mode 100644
--- /dev/null
+++ b/Data/Packed/Static/Matrix.hs
@@ -0,0 +1,487 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Data.Packed.Static.Matrix
+-- Copyright   :  (c) Reiner Pope 2008
+-- License     :  GPL-style
+--
+-- Maintainer  :  Reiner Pope <reiner.pope@gmail.com>
+-- Stability   :  experimental
+-- Portability :  portable
+--
+-- Statically-dimensioned 2D matrices.
+--
+-----------------------------------------------------------------------------
+
+module Data.Packed.Static.Matrix(
+  Matrix,
+  -- * Shaping
+  refineMat,
+  forgetRowsU,
+  forgetColsU,
+  atRows,
+  atCols,
+  withShape,
+  withRows,
+  withCols,
+  withSquare,
+  -- * To/from lists
+  (><),
+  matFromList,
+  fromListsU,
+  toLists,
+  -- * To/from rows/column vectors
+  fromRowsU,
+  toRows,
+  fromColumnsU,
+  toColumns,
+  fromBlocksU,
+  asRow,
+  asColumn,
+  -- * Other operations
+  rows,
+  cols,
+  trans,
+  reshapeU,
+  flatten,
+  (@@>),
+  repmatU,
+  flipud,
+  fliprl,
+  subMatrixU,
+  takeRows,
+  dropRows,
+  takeColumns,
+  dropColumns,
+  extractRowsU,
+  ident,
+  diag,
+  diagRect,
+  takeDiag, 
+  liftMatrix,
+  -- * Conversions / file input
+  format,
+  readMatrix,
+  fromFile,
+  fromArray2D,
+ ) where
+
+import Data.Array
+
+import Data.Maybe(fromJust)
+import Data.List(intercalate,transpose)
+import qualified Numeric.LinearAlgebra as H
+
+import Data.Packed.Static.Shapes
+import Data.Packed.Static.Imports
+import Data.Packed.Static.Internal
+
+instance ShapedContainer Matrix where
+    type Unwrapped Matrix = H.Matrix
+    unWrap = unMatrix
+    wrapU = Matrix
+
+    type UnknownShape Matrix = (Unknown, Unknown)
+    unsafeReshape = Matrix . unMatrix
+
+------ Shaping
+refineMat :: forall m n t a. Matrix (m,n) t -> (forall m' n'. (PositiveT m', PositiveT n') => Matrix (m', n') t -> a) -> a
+refineMat m k = fromJust.fromJust $ reifyPositiveD (toInteger $ rows m) (\r ->
+                   reifyPositiveD (toInteger $ cols m) (\c -> 
+                         k (unsafeReshape m `atShape` (r,c))))
+
+forgetRowsU :: Matrix (m,n) t -> Matrix (Unknown,n) t
+forgetRowsU = unsafeReshape
+
+forgetColsU :: Matrix (m,n) t -> Matrix (m,Unknown) t
+forgetColsU = unsafeReshape
+
+{- | Fixes a matrix's static row length.
+Essentially a mechanism for partial type signatures:
+you can specify the row length without specifying the 
+rest of matrix's type.
+
+@\>ident \`atRows\` d5
+[$mat| 1.0, 0.0, 0.0, 0.0, 0.0;
+       0.0, 1.0, 0.0, 0.0, 0.0;
+       0.0, 0.0, 1.0, 0.0, 0.0;
+       0.0, 0.0, 0.0, 1.0, 0.0;
+       0.0, 0.0, 0.0, 0.0, 1.0 |]@
+-}
+atRows :: Matrix (m,n) t -> m -> Matrix (m,n) t
+atRows = const
+
+{- | Fixes a matrix's static column length.
+
+@\> ident \`atCols\` d4
+[$mat| 1.0, 0.0, 0.0, 0.0;
+       0.0, 1.0, 0.0, 0.0;
+       0.0, 0.0, 1.0, 0.0;
+       0.0, 0.0, 0.0, 1.0 |]@
+-}
+atCols :: Matrix (m,n) t -> n -> Matrix (m,n) t
+atCols = const
+
+withShape :: forall m n t. (PositiveT m, PositiveT n) => (Int -> Int -> Matrix (m,n) t) -> Matrix (m,n) t
+withShape f = f m n where
+    m = fromIntegerT (undefined :: m)
+    n = fromIntegerT (undefined :: n)
+
+withRows :: forall m n t. (PositiveT m) => (Int -> Matrix (m,n) t) -> Matrix (m,n) t
+withRows = ($ m) where
+    m = fromIntegerT (undefined :: m)
+
+withCols :: forall m n t. (PositiveT n) => (Int -> Matrix (m,n) t) -> Matrix (m,n) t
+withCols = ($ n) where
+    n = fromIntegerT (undefined :: n)
+
+withSquare :: forall n t. PositiveT n => (Int -> Matrix (n,n) t) -> Matrix (n,n) t
+withSquare = ($ n) where
+    n = fromIntegerT (undefined :: n)
+
+--------- to/from lists
+{- | Constructs a matrix from a list. The size
+in the matrix's type and the list's length must agree or
+else a runtime error will be raised.
+
+@\> matFromList [1,2,3,4,5,6] \`atShape\` (d2,d3)
+[$mat| 1.0, 2.0, 3.0;
+       4.0, 5.0, 6.0 |]@
+-}
+matFromList :: (Element t, PositiveT m, PositiveT n) => [t] -> Matrix (m,n) t
+matFromList xs = withShape (\m n -> Matrix $ (m H.>< n) xs)
+
+{- | Constructs a matrix from a list. The size
+in the matrix's type and the list's length must agree or
+else a runtime error will be raised.
+
+@\> (d2 >< d3)[1,2,3,4,5,6]
+[$mat| 1.0, 2.0, 3.0;
+       4.0, 5.0, 6.0 |]@
+-}
+(><) :: (PositiveT m, PositiveT n, Element t) => m -> n -> [t] -> Matrix (m,n) t
+(><) m n xs = Matrix $ ((fromIntegerT m) H.>< (fromIntegerT n)) xs
+
+{- | Constructs a matrix from a list of lists of elements.
+Each sublist must be of equal size or a runtime error
+will be raised.
+
+@\> fromListsU [[1,2,3],[4,5,6]]
+[$mat| 1.0, 2.0, 3.0;
+       4.0, 5.0, 6.0 |]@
+-}
+fromListsU :: (Element t) => [[t]] -> Matrix (Unknown,Unknown) t
+fromListsU = wrapU . H.fromLists
+
+{- | Converts a matrix to a list of its rows, each as
+a list.
+
+@\> toLists [$mat|1,2,3;4,5,6|]
+[[1.0,2.0,3.0],[4.0,5.0,6.0]]@
+-}
+toLists :: (Element t) => Matrix (m,n) t -> [[t]]
+toLists = H.toLists . unMatrix
+
+--------- to/from row/column vectors
+{- | Interprets a vector as a 1-row matrix. 
+
+@\> asRow [$vec|1,2,3|]
+[$mat| 1.0, 2.0, 3.0 |]@
+-}
+asRow :: (Element a) => Vector n a -> Matrix (D1,n) a
+asRow = Matrix . H.asRow . unVector
+
+{- | Interprets a vector as a 1-column matrix.
+
+@\> asColumn [$vec|1,2,3|]
+[$mat| 1.0;
+       2.0;
+       3.0 |]@
+-}
+asColumn :: (Element a) => Vector n a -> Matrix (n,D1) a
+asColumn = Matrix . H.asColumn . unVector
+
+{- | Constructs a matrix from a list of rows.
+
+@\> fromRowsU [[$vec|1,2,3|],[$vec|4,5,6|]]
+[$mat| 1.0, 2.0, 3.0;
+       4.0, 5.0, 6.0 |]@
+-}
+fromRowsU :: (Element t) => [Vector n t] -> Matrix (Unknown,n) t
+fromRowsU = Matrix . H.fromRows . map unVector
+
+{- | Converts a matrix to a list of its rows.
+
+@\> toRows [$mat|1,2,3;4,5,6|]
+[[$vec| 1.0, 2.0, 3.0 |],[$vec| 4.0, 5.0, 6.0 |]]@
+-}
+toRows :: (Element t) => Matrix (m,n) t -> [Vector n t]
+toRows = map Vector . H.toRows . unMatrix
+
+{- | Constructs a matrix from a list of columns.
+
+@\> fromColumnsU [[$vec|1,2,3|],[$vec|4,5,6|]]
+[$mat| 1.0, 4.0;
+       2.0, 5.0;
+       3.0, 6.0 |]@
+-}
+fromColumnsU :: (Element t) => [Vector n t] -> Matrix (n,Unknown) t
+fromColumnsU = Matrix . H.fromColumns . map unVector
+
+{- | Converts a matrix to a list of its columns.
+
+@\> toColumns [$mat|1,2,3;4,5,6|]
+[[$vec| 1.0, 4.0 |],[$vec| 2.0, 5.0 |],[$vec| 3.0, 6.0 |]]@
+-}
+toColumns :: (Element t) => Matrix (m,n) t -> [Vector m t]
+toColumns = map Vector . H.toColumns . unMatrix
+
+-------- other operations
+{- | Returns the number of rows of the matrix.
+
+@\> rows [$mat|1::Double,2,3;4,5,6|]
+2@
+-}
+rows :: Matrix (m,n) t -> Int
+rows = H.rows . unMatrix
+
+{- | Returns the number of columns of the matrix.
+
+@\> cols [$mat|1::Double,2,3;4,5,6|]
+3@
+-}
+cols :: Matrix (m,n) t -> Int
+cols = H.cols . unMatrix
+
+{- | Matrix transpose.
+
+@\> trans [$mat|1,2,3;4,5,6|]
+[$mat| 1.0, 4.0;
+       2.0, 5.0;
+       3.0, 6.0 |]@
+-}
+trans :: Matrix (m,n) t -> Matrix (n,m) t
+trans = Matrix . H.trans . unMatrix
+
+--- we can't disappear the Int argument... (it would require type division)
+{- | Reshapes a vector into a matrix, 
+with the specified number of columns. If the vector's length
+is not a multiple of the required columns,
+a runtime error is raised.
+
+@\> reshapeU 3 [$vecU|1,2,3,4,5,6|]
+[$mat| 1.0, 2.0, 3.0;
+       4.0, 5.0, 6.0 |]@
+-}
+reshapeU :: (Element t) => Int -> Vector n t -> Matrix (Unknown,Unknown) t
+reshapeU n = wrapU . H.reshape n . unVector
+
+{- | Flattens a matrix into a vector.
+
+@\> flatten [$mat|1,2,3;4,5,6|]
+[$vec| 1.0, 2.0, 3.0, 4.0, 5.0, 6.0 |]@
+-}
+flatten :: (Element t) => Matrix (m,n) t -> Vector (m :*: n) t
+flatten = Vector . H.flatten . unMatrix
+
+{- | Indexes a matrix.
+
+@\> [$mat|1,2,3;4,5,6|] \@\@\> (1,2)
+6.0@
+-}
+(@@>) :: (Storable t) => Matrix (m,n) t -> (Int, Int) -> t
+(@@>) = (H.@@>) . unMatrix
+
+--- I say the size is (Unknown,Unknown) so the users don't think they all
+--- have to be of the same size.
+{- | Constructs a matrix from blocks.
+
+@\> fromBlocksU [[[$matU|1,2,3;4,5,6|],  [$matU|7,8,9;10,11,12|]],
+               [[$matU|11,12,13;14,15,16|],[$matU|21,22,23;24,25,26|]]]
+[$mat|  1.0,  2.0,  3.0,  7.0,  8.0,  9.0;
+        4.0,  5.0,  6.0, 10.0, 11.0, 12.0;
+       11.0, 12.0, 13.0, 21.0, 22.0, 23.0;
+       14.0, 15.0, 16.0, 24.0, 25.0, 26.0 |]@
+-}
+fromBlocksU :: (Element t) => [[Matrix (Unknown,Unknown) t]] -> Matrix (Unknown,Unknown) t
+fromBlocksU = Matrix . H.fromBlocks . map (map unMatrix)
+
+{- | 'replicate' for matrices.
+
+@\> repmatU [$mat|1;2|] 2 3
+[$mat| 1.0, 1.0, 1.0;
+       2.0, 2.0, 2.0;
+       1.0, 1.0, 1.0;
+       2.0, 2.0, 2.0 |]@
+-}
+repmatU :: (Element t) => Matrix (m,n) t -> Int -> Int -> Matrix (Unknown,Unknown) t
+repmatU m i j = Matrix $ H.repmat (unMatrix m) i j
+
+{- | Vertically flips a matrix.
+
+@\> flipud [$mat|1,2,3;4,5,6|]
+[$mat| 4.0, 5.0, 6.0;
+       1.0, 2.0, 3.0 |]@
+-}
+flipud :: (Element t) => Matrix (m,n) t -> Matrix (m,n) t
+flipud = Matrix . H.flipud . unMatrix
+
+{- | Horizonatlly flips a matrix.
+
+@\> fliprl [$mat|1,2,3;4,5,6|]
+[$mat| 3.0, 2.0, 1.0;
+       6.0, 5.0, 4.0 |]@
+-}
+fliprl :: (Element t) => Matrix (m,n) t -> Matrix (m,n) t
+fliprl = Matrix . H.fliprl . unMatrix
+
+{- | Extracts a submatrix.
+
+@\> subMatrixU (0,1) (2,2) [$mat|1,2,3,4;5,6,7,8;9,10,11,12|]
+[$mat| 2.0, 3.0;
+       6.0, 7.0 |]@
+-}
+subMatrixU :: (Element a) => (Int, Int) -> (Int, Int) -> Matrix (m,n) a -> Matrix (Unknown,Unknown) a
+subMatrixU a b = Matrix . H.subMatrix a b . unMatrix
+
+{- | Takes rows from the top of the matrix 
+until the required size is reached.
+
+@\> takeRows [$mat|1,2;3,4;5,6|] \`atRows\` d2
+[$mat| 1.0, 2.0;
+       3.0, 4.0 |]@
+-}
+takeRows :: (PositiveT m', Element t, (m' :<=: m) ~ True) => Matrix (m,n) t -> Matrix (m',n) t
+takeRows a = withRows (\m -> Matrix $ H.takeRows m $ unMatrix a)
+
+{- | Takes rows from the bottom of the matrix until
+the required size is reached.
+
+@\> dropRows [$mat|1,2;3,4;5,6|] \`atRows\` d2
+[$mat| 3.0, 4.0;
+       5.0, 6.0 |]@
+-}
+dropRows :: (PositiveT m', Element t, (m' :<=: m) ~ True) => Matrix (m,n) t -> Matrix (m',n) t
+dropRows a = withRows (\m -> Matrix $ H.dropRows (rows a - m) $ unMatrix a)
+
+{- | Takes columns from the left of the matrix until
+the required size is reached.
+
+@\> takeColumns [$mat|1,2,3;4,5,6|] \`atCols\` d2
+[$mat| 1.0, 2.0;
+       4.0, 5.0 |]@
+-}
+takeColumns :: (PositiveT n', Element t, (n' :<=: n) ~ True) => Matrix (m,n) t -> Matrix (m,n') t
+takeColumns a = withCols (\n -> Matrix $ H.takeColumns n $ unMatrix a)
+
+{- | Takes columns from the right of the matrix
+until the required size is reached.
+
+@\> dropColumns [$mat|1,2,3;4,5,6|] \`atCols\` d2
+[$mat| 2.0, 3.0;
+       5.0, 6.0 |]@
+-}
+dropColumns :: (PositiveT n', Element t, (n' :<=: n) ~ True) => Matrix (m,n) t -> Matrix (m,n') t
+dropColumns a = withCols (\n -> Matrix $ H.dropColumns (cols a - n) $ unMatrix a)
+
+{- | Extracts the given rows from a matrix.
+
+@\> extractRowsU [1,0] [$mat|1,2;3,4;5,6|]
+[$mat| 3.0, 4.0;
+       1.0, 2.0 |]@
+-}
+extractRowsU :: (Element t) => [Int] -> Matrix (m,n) t -> Matrix (Unknown,n) t
+extractRowsU is = Matrix . H.extractRows is . unMatrix
+
+{- | Constructs the identity matrix of any given size.
+
+@\> ident \`atRows\` d3
+[$mat| 1.0, 0.0, 0.0;
+       0.0, 1.0, 0.0;
+       0.0, 0.0, 1.0 |]@
+-}
+ident :: (Element t, PositiveT n) => Matrix (n,n) t
+ident = withSquare (Matrix . H.ident)
+
+{- | Constructs a square matrix with the given vector as its diagonal.
+
+@\> diag (linspace (1,3)) \`atRows\` d3
+[$mat| 1.0, 0.0, 0.0;
+       0.0, 2.0, 0.0;
+       0.0, 0.0, 3.0 |]@
+-}
+diag :: (Element a) => Vector n a -> Matrix (n,n) a
+diag = Matrix . H.diag . unVector
+
+{- | Constructs a rectangular matrix with the given vector as its diagonal.
+
+@\> diagRect (linspace (1,3)) \`atShape\` (d3,d4)
+[$mat| 1.0, 0.0, 0.0, 0.0;
+       0.0, 2.0, 0.0, 0.0;
+       0.0, 0.0, 3.0, 0.0 |]
+
+\> diagRect (linspace (1,3)) \`atShape\` (d4,d3)
+[$mat| 1.0, 0.0, 0.0;
+       0.0, 2.0, 0.0;
+       0.0, 0.0, 3.0;
+       0.0, 0.0, 0.0 |]@
+-}
+diagRect :: (Element a, PositiveT m, PositiveT n) => Vector (Min m n) a -> Matrix (m,n) a
+diagRect v = withShape (\m n -> Matrix $ H.diagRect (unVector v) m n)
+
+{- | Takes the diagonal from a matrix.
+
+@\> takeDiag [$mat|1,2,3;4,5,6|]
+[$vec| 1.0, 5.0 |]@
+-}
+takeDiag :: (Element t) => Matrix (m,n) t -> Vector (Min m n) t
+takeDiag = Vector . H.takeDiag . unMatrix
+
+{- | Operations on matrices viewed as operations on the vector of their elements 
+
+@\> liftMatrix (+constant 2) [$mat|1,2,3;4,5,6|]
+[$mat| 3.0, 4.0, 5.0;
+       6.0, 7.0, 8.0 |]@
+-}
+liftMatrix :: (Element a, Element b) => (Vector (m :*: n) a -> Vector (m :*: n) b) -> Matrix (m,n) a -> Matrix (m,n) b
+liftMatrix f = Matrix . H.liftMatrix (unVector . f . Vector) . unMatrix
+
+liftMatrix2 :: (Element t, Element a, Element b) =>
+               (Vector (m:*:n) a -> Vector (m:*:n) b -> Vector (m:*:n) t)
+               -> Matrix (m,n) a
+               -> Matrix (m,n) b
+               -> Matrix (m,n) t
+liftMatrix2 f a b = Matrix $ H.liftMatrix2 (\v w -> unVector $ f (Vector v) (Vector w)) (unMatrix a) (unMatrix b)
+
+-- | See hmatrix's 'H.format'.
+format :: (Element t) => String -> (t -> String) -> Matrix (m,n) t -> String
+format s f = H.format s f . unMatrix
+
+-- | See hmatrix's 'H.readMatrix'.
+readMatrix :: String -> Matrix (Unknown,Unknown) Double
+readMatrix = wrapU . H.readMatrix
+
+-- | See hmatrix's 'H.fromFile'.
+fromFile :: FilePath -> (Int, Int) -> IO (Matrix (Unknown,Unknown) Double)
+fromFile f s = fmap wrapU $ H.fromFile f s
+
+-- | See hmatrix's 'H.fromArray2D'.
+fromArray2D :: (Element t) => Array (Int, Int) t -> Matrix (Unknown,Unknown) t
+fromArray2D = wrapU . H.fromArray2D
+
+
+
+instance (Element e, Show e) => Show (Matrix (m,n) e) where
+    show m = "[$mat| " ++ format2 ", " ";\n       " m ++ " |]"
+
+-- internal helpers
+
+pad n str = replicate (n - length str) ' ' ++ str
+
+padLen :: [String] -> [String]
+padLen as = map (pad len) as where
+    len = maximum $ map length as
+
+padLens :: [[String]] -> [[String]]
+padLens = transpose . map padLen . transpose where
+
+format2 comma semi mat = intercalate semi . map (intercalate comma) $ padLens . map (map show) $ toLists mat
diff --git a/Data/Packed/Static/ST.hs b/Data/Packed/Static/ST.hs
new file mode 100644
--- /dev/null
+++ b/Data/Packed/Static/ST.hs
@@ -0,0 +1,119 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Data.Packed.Static.ST
+-- Copyright   :  (c) Reiner Pope 2008
+-- License     :  GPL-style
+--
+-- Maintainer  :  Reiner Pope <reiner.pope@gmail.com>
+-- Stability   :  experimental
+-- Portability :  portable
+--
+-- Manipulation of Matrix and Vector in the ST monad.
+--
+-----------------------------------------------------------------------------
+
+module Data.Packed.Static.ST where
+
+import qualified Data.Packed.ST as HS
+import qualified Numeric.LinearAlgebra as H
+
+import Data.Packed.Static.Internal
+import Data.Packed.Static.Imports
+
+import Control.Monad.ST
+
+
+----- vectors
+newtype STVector n s t = STVector { unSTVector :: HS.STVector s t }
+
+newVector :: forall n s t. (Element t, PositiveT n) => t -> ST s (STVector n s t) 
+newVector a = fmap STVector (HS.newVector a n) where
+    n = fromIntegerT (undefined :: n)
+
+thawVector :: (Storable t) => Vector n t -> ST s (STVector n s t)
+thawVector = fmap STVector . HS.thawVector . unVector
+
+freezeVector :: (Storable t) => STVector n s1 t -> ST s2 (Vector n t)
+freezeVector = fmap Vector . HS.freezeVector . unSTVector
+
+runSTVector :: (Storable t) => (forall s. ST s (STVector n s t)) -> Vector n t
+runSTVector = (Vector) . HS.runSTVector . (\v -> fmap unSTVector v) where
+
+readVector :: (Storable t) => STVector n s t -> Int -> ST s t
+readVector = HS.readVector . unSTVector
+
+writeVector :: (Storable t) => STVector n s t -> Int -> t -> ST s ()
+writeVector = HS.writeVector . unSTVector
+
+modifyVector :: (Storable t) => STVector n s t -> Int -> (t -> t) -> ST s ()
+modifyVector = HS.modifyVector . unSTVector
+
+liftSTVector :: (Storable t) => (Vector n t -> c) -> STVector n s1 t -> ST s2 c
+liftSTVector f v = HS.liftSTVector (f . Vector) (unSTVector v)
+
+----- matrices
+-- | A matrix with @m@ rows, @n@ columns.
+newtype STMatrix mn s t = STMatrix { unSTMatrix :: HS.STMatrix s t }
+
+newMatrix :: forall m n s t. (Element t, PositiveT m, PositiveT n) => t -> ST s (STMatrix (m, n) s t)
+newMatrix t = fmap STMatrix $ HS.newMatrix t m n where
+    m = fromIntegerT (undefined :: m)
+    n = fromIntegerT (undefined :: n)
+
+thawMatrix :: (Storable t) => Matrix (m, n) t -> ST s (STMatrix (m, n) s t)
+thawMatrix = fmap STMatrix . HS.thawMatrix . unMatrix
+
+freezeMatrix :: (Storable t) => STMatrix (m, n) s1 t -> ST s2 (Matrix (m, n) t)
+freezeMatrix = fmap (Matrix) . HS.freezeMatrix . unSTMatrix
+
+runSTMatrix :: (Storable t) => (forall s. ST s (STMatrix (m, n) s t)) -> Matrix (m, n) t
+runSTMatrix = (Matrix) . HS.runSTMatrix . (\m -> fmap unSTMatrix m)
+
+readMatrix :: (Storable t) => STMatrix (m, n) s t -> Int -> Int -> ST s t
+readMatrix = HS.readMatrix . unSTMatrix
+
+writeMatrix :: (Storable t) => STMatrix (m, n) s t -> Int -> Int -> t -> ST s ()
+writeMatrix = HS.writeMatrix . unSTMatrix
+
+modifyMatrix :: (Storable t) => STMatrix (m, n) s t -> Int -> Int -> (t -> t) -> ST s ()
+modifyMatrix = HS.modifyMatrix . unSTMatrix
+
+liftSTMatrix :: (Storable t) => (Matrix (m, n) t -> a) -> STMatrix (m, n) s1 t -> ST s2 a
+liftSTMatrix f m = HS.liftSTMatrix (f . Matrix) (unSTMatrix m)
+
+--------- unsafe
+unsafeReadVector :: (Storable t) => STVector n s t -> Int -> ST s t
+unsafeReadVector = HS.unsafeReadVector . unSTVector
+unsafeWriteVector :: (Storable t) => STVector n s t -> Int -> t -> ST s ()
+unsafeWriteVector = HS.unsafeWriteVector . unSTVector
+
+unsafeThawVector :: (Storable t) => Vector n t -> ST s (STVector n s t)
+unsafeThawVector = fmap STVector . HS.unsafeThawVector . unVector
+unsafeFreezeVector :: (Storable t) => STVector n s1 t -> ST s2 (Vector n t)
+unsafeFreezeVector =  fmap Vector . HS.unsafeFreezeVector . unSTVector
+
+unsafeReadMatrix :: (Storable t) => STMatrix (m, n) s t -> Int -> Int -> ST s t
+unsafeReadMatrix = HS.unsafeReadMatrix . unSTMatrix
+unsafeWriteMatrix :: (Storable t) => STMatrix (m, n) s t -> Int -> Int -> t -> ST s ()
+unsafeWriteMatrix = HS.unsafeWriteMatrix . unSTMatrix
+
+unsafeThawMatrix :: (Storable t) => Matrix (m, n) t -> ST s (STMatrix (m, n) s t)
+unsafeThawMatrix = fmap STMatrix . HS.unsafeThawMatrix . unMatrix
+unsafeFreeMatrix :: (Storable t) => STMatrix (m, n) s1 t -> ST s2 (Matrix (m, n) t)
+unsafeFreeMatrix = fmap (Matrix) . HS.unsafeFreezeMatrix . unSTMatrix
+
+
+{-
+--- for a later refactoring:
+class STMutable a where
+    data STRep a :: * -> * -> * -> *
+    unsafeThaw :: Storable t => a n t -> ST s (STRep a s n t)
+    unsafeFreeze :: Storable t => STRep a s n t -> ST s (a n t)
+    clone :: Storable t => STRep a s n t -> ST s (STRep a s n t)
+
+instance STMutable Vector where
+    newtype STRep Vector s n t = STVector { unSTVector :: HS.STVector s t }
+    unsafeThaw = fmap STVector . HS.unsafeThawVector . unVector
+    unsafeFreeze = fmap Vector . HS.unsafeFreezeVector . unSTVector
+    clone = undefined -- no "clone" function is available in hmatrix right now...
+-}
diff --git a/Data/Packed/Static/Shapes.hs b/Data/Packed/Static/Shapes.hs
new file mode 100644
--- /dev/null
+++ b/Data/Packed/Static/Shapes.hs
@@ -0,0 +1,142 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Data.Packed.Static.Shapes
+-- Copyright   :  (c) Reiner Pope 2008
+-- License     :  GPL-style
+--
+-- Maintainer  :  Reiner Pope <reiner.pope@gmail.com>
+-- Stability   :  experimental
+-- Portability :  portable
+--
+-- Shape-based functionality, common for matrices and vectors
+--
+-----------------------------------------------------------------------------
+
+{-# LANGUAGE UndecidableInstances #-}
+
+module Data.Packed.Static.Shapes (
+     Unknown,
+     ShapedContainer(..),
+     atShape,
+     shapeOf,
+     forgetShapeU,
+     unsafeWrap,
+ ) where
+
+import qualified Numeric.LinearAlgebra as H
+
+-- | Uninhabited type. Represents unknown lengths.
+-- Instances of 'ShapedContainer' use 'Unknown'
+-- for the 'UnknownShape' type.
+data Unknown
+
+class ShapedContainer a where
+    -- | Less-typed, hmatrix representation
+    type Unwrapped a :: * -> *
+    -- | Convert to hmatrix representation
+    unWrap :: a s t -> Unwrapped a t
+    -- | Convert from hmatrix representation
+    wrapU :: Unwrapped a t -> a (UnknownShape a) t
+    
+    -- | standard \'unknown\' shape. For vectors, @Unknown@; for matrices, @(Unknown,Unknown)@.
+    type UnknownShape a
+    -- | Coerce the static shape. Unsafe; the user
+    -- of this function has an obligation to prove that
+    -- the object's dynamic shape is the same as that
+    -- represented by s'.
+    unsafeReshape :: a s t -> a s' t
+
+-- | For type hints.
+-- 
+-- @\> constant (5::Double) `atShape` d4
+-- [$vec| 5.0, 5.0, 5.0, 5.0 |] :: Vector D4 Double@
+--
+-- Implementation:
+-- 
+-- @atShape = const@.
+atShape :: a s t -> s -> a s t
+atShape = const
+
+-- | For type hints.
+--
+-- @\> constant (5::Double) `atShape` shapeOf [$vec|1|]
+-- [$vec| 5.0 |]@
+--
+-- Implementation:
+--
+-- @shapeOf _ = undefined@
+shapeOf :: a s t -> s
+shapeOf _ = undefined
+
+-- | @unsafeWrap = unsafeReshape . wrapU@.
+unsafeWrap :: ShapedContainer a => Unwrapped a t -> a s t
+unsafeWrap = unsafeReshape . wrapU
+
+-- | Changes the static shape to the UnknownShape.
+-- Dynamic representation is unchanged.
+forgetShapeU :: ShapedContainer a => a s t -> a (UnknownShape a) t
+forgetShapeU = unsafeReshape
+
+------- instances
+
+liftH f = unsafeWrap . f . unWrap
+liftH2 f a b = unsafeWrap $ f (unWrap a) (unWrap b)
+liftH2' f a b = f (unWrap a) (unWrap b)
+
+instance (ShapedContainer a, H.Container (Unwrapped a) e) => H.Container (a n) e where
+    toComplex = uncurry $ liftH2 $ curry H.toComplex
+    fromComplex m = let (a,b) = H.fromComplex $ unWrap m in (unsafeWrap a, unsafeWrap b)
+    comp = liftH H.comp
+    conj = liftH H.conj
+    real = liftH H.real
+    complex = liftH H.complex
+
+instance (ShapedContainer a, H.Linear (Unwrapped a) e) => H.Linear (a n) e where
+    scale e       = liftH (H.scale e)
+    addConstant e = liftH (H.addConstant e)
+    add           = liftH2 H.add
+    sub           = liftH2 H.sub
+    mul           = liftH2 H.mul
+    divide        = liftH2 H.divide
+    scaleRecip e  = liftH (H.scaleRecip e)
+    equal         = liftH2' H.equal
+
+instance (ShapedContainer a, Eq (Unwrapped a t)) => Eq (a s t) where
+    (==) = liftH2' (==)
+
+instance (ShapedContainer a, Show (a n e), Num (Unwrapped a e)) => Num (a n e) where
+    (+) = liftH2 (+)
+    (*) = liftH2 (*)
+    (-) = liftH2 (-)
+    negate = liftH negate
+    abs = liftH abs
+    signum = liftH signum
+    fromInteger = error "fromInteger: Data.Packed.Static.Common"
+
+instance (ShapedContainer a, Show (a n e), Fractional (Unwrapped a e)) => Fractional (a n e) where
+    (/) = liftH2 (/)
+    recip = liftH recip
+    fromRational = error "fromRational: Data.Packed.Static.Common"
+
+instance (ShapedContainer a, Show (a n e), Floating (Unwrapped a e)) => Floating (a n e) where
+    pi      = error "pi: Data.Packed.Static.Common"
+    exp     = liftH exp
+    sqrt    = liftH sqrt
+    log     = liftH log
+    (**)    = liftH2 (**)
+    logBase = liftH2 logBase
+    sin     = liftH sin
+    tan     = liftH tan
+    cos     = liftH cos
+    asin    = liftH asin
+    atan    = liftH atan
+    acos    = liftH acos
+    sinh    = liftH sinh
+    tanh    = liftH tanh
+    cosh    = liftH cosh
+    asinh   = liftH asinh
+    atanh   = liftH atanh
+    acosh   = liftH acosh
+
+instance (ShapedContainer a, H.Normed (Unwrapped a e)) => H.Normed (a n e) where
+    pnorm p = H.pnorm p . unWrap
diff --git a/Data/Packed/Static/Syntax.hs b/Data/Packed/Static/Syntax.hs
new file mode 100644
--- /dev/null
+++ b/Data/Packed/Static/Syntax.hs
@@ -0,0 +1,223 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Data.Packed.Static.Syntax
+-- Copyright   :  (c) Reiner Pope 2008
+-- License     :  GPL-style
+--
+-- Maintainer  :  Reiner Pope <reiner.pope@gmail.com>
+-- Stability   :  experimental
+-- Portability :  portable
+--
+-- QuasiQuoting for matrices and vectors.
+--
+-- BIG WARNING: the expression quasiquoters for matrices and vectors
+-- are broken for infix expressions. All operators will be assumed to
+-- be left infix with infix level 9. To avoid unexpected parses, fully
+-- parenthesise all infix expressions.
+-----------------------------------------------------------------------------
+
+module Data.Packed.Static.Syntax(
+    mat,
+    matU,
+    vec,
+    vecU,
+    -- * Matrix views
+    MatView,
+    viewMat,
+    -- * Vector views
+    VecView,
+    viewVec,
+ ) where
+
+import Data.Complex
+
+import Control.Monad
+
+import Language.Haskell.TH
+import Language.Haskell.TH.Quote
+
+import Types.Data.Num.Decimal.Literals.TH
+import Data.Packed.Static.Imports
+import Data.Packed.Static.Shapes
+import Data.Packed.Static.Vector
+import Data.Packed.Static.Matrix
+
+import Text.Parsec
+import Text.Parsec.Language
+import Text.Parsec.String(Parser)
+import qualified Text.Parsec.Token as T
+
+
+import Foreign.Storable
+
+import qualified Language.Haskell.Meta.Parse as MP
+
+
+----- mat parser
+-- | Required for the 'mat' pattern quasiquoter. See 'mat'.
+data MatView n t = n :>< [[t]]
+-- | Required for the 'mat' pattern quasiquoter. See 'mat'.
+viewMat :: Element t => Matrix (m, n) t -> MatView (m, n) t
+viewMat m = shapeOf m :>< toLists m
+
+-- | The matrix quasiquoter for expressions and patterns. 
+-- 
+-- * Elements on the same row are separated by commas; rows 
+--   themselves are separated by semicolons. All whitespace is optional
+-- 
+-- * The expression quasiquoter allows arbitrary Haskell 
+--   expressions as its elements; the pattern quasiquoter
+--   requires that each element is a variable.
+-- 
+-- * Using the quasiquoter for patterns requires that you
+--   use the 'viewMat' view pattern first (this is a
+--    workaround since Template Haskell doesn't yet support
+--    view patterns).
+-- 
+-- For example,
+-- 
+-- @ example1 :: (Element t) => Matrix (D2,D3) t -> Matrix (D2,D2) t
+-- example1 (viewMat -> [$mat|a, b, c;
+--                            d, e, f|]) = [$mat|a+b,   b+c;
+--                                               sin c, f  |]@
+mat :: QuasiQuoter
+mat = QuasiQuoter parseMatExp parseMatPat
+
+{- | Quasiquoter for matrices of Unknown size. We should
+just use @[$matU|\<text\>|]@ as shorthand for @'forgetShapeU' [$mat|\<text\>|]@.
+
+No pattern quasiquoter exists, and I currently have
+no plans to introduce one. -}
+matU :: QuasiQuoter
+matU = QuasiQuoter parseMatUExp (error "No pattern quasiquoter for matU. Use mat instead")
+
+parseMat p s = do
+  xs <- parsecToQ (sepBy (sepBy p comma) semi) s
+  let rows = length xs
+      cols = length $ head xs
+  when (not $ all ((==cols) . length) xs) $ fail "Inconsistent row lengths in [$mat|...|]"
+  return (xs,rows,cols)
+
+parseMatExp s = do
+  (xs,rows,cols) <- parseMat expr s
+  [| ( $(decLiteralV $ fromIntegral rows) >< $(decLiteralV $ fromIntegral cols) )
+                $(return $ ListE (concat xs)) |]
+
+parseMatUExp s = do
+  (xs,rows,cols) <- parseMat expr s
+  [| fromListsU $(return $ ListE (map ListE xs)) |]
+
+parseMatPat s = do
+  (xs,rows,cols) <- parseMat identifier s
+  conP '(:><) [ sigP wildP (tupleT 2 `appT` (decLiteralT $ fromIntegral rows) `appT` (decLiteralT $ fromIntegral cols))
+              , listP (map (listP . map (varP . mkName)) xs) ]
+
+------- vec parser
+-- | Required for the 'vec' quasiquoter. See 'vec'.
+data VecView n t = n :|> [t]
+
+-- | Required for the 'vec' quasiquoter. See 'vec'.
+viewVec :: (Storable t) => Vector n t -> VecView n t
+viewVec v = shapeOf v :|> toList v
+
+-- | The vector quasiquoter for expressions and patterns. This is
+-- very similar to the 'mat' quasiquoter.
+-- 
+--  * Elements are separated by commas; whitespace is ignored.
+-- 
+--  * The expression quasiquoter allows arbitrary Haskell expressions for
+--    each element; the pattern quasiquoter requires that each element is
+--    a variable pattern.
+-- 
+--  * The pattern quasiquoter must be preceeded by a the 'viewVec' view pattern.
+-- 
+-- For example,
+-- 
+-- @ example2 :: (Storable t, Num t) => Vector D2 t -> Vector D3 t
+-- example2 (viewVec -> [$vec|a, b|]) = [$vec|a*b, 5, 7|]@
+vec :: QuasiQuoter
+vec = QuasiQuoter parseVecExp parseVecPat
+
+{- | Quasiquoter for vectors of unknown lengths. Like 'matU', 
+@[$vecU|\<text\>|]@ is just shorthand for @'forgetShapeU' [$vec|\<text\>|]@. -}
+vecU :: QuasiQuoter
+vecU = QuasiQuoter parseVecUExp (error "No pattern quasiquoter for vecU. Use the vec quasiquoter instead")
+
+--- Vec pattern parser
+parseVec p s = parsecToQ (sepBy p comma) s
+
+parseVecPat s = do
+  xs <- parseVec identifier s
+  conP '(:|>) [ sigP wildP (decLiteralT $ fromIntegral $ length xs)
+                         , return $ ListP (map (VarP . mkName) xs)  ]
+
+parseVecUExp s = [| fromListU $(ListE `liftM` parseVec expr s) |]
+
+parseVecExp s = do
+  xs <- parseVec expr s
+  [| unsafeReshape (fromListU $(return $ ListE xs)) `atShape` $(decLiteralV (fromIntegral $ length xs)) |]
+
+
+----- Haskell parsing
+-- | Does a simplistic parse using Parsec, which just counts brackets and escapes comments and string literals.
+-- This parse accumulates text, which is then parsed properly using haskell-src-exts.
+expr = do
+  s <- outerCode
+  case MP.parseExp s of
+    Left err -> fail err
+    Right exp -> return exp
+
+infixr >>+
+p1 >>+ p2 = do
+  x1 <- p1
+  x2 <- p2
+  return (x1 ++ x2)
+
+p >/> q = do
+  p' <- p
+  notFollowedBy q
+  return p'
+
+codeChar = noneOf "{}()[]-,;\"\'" <|> (try (char '-' >/> char '-'))
+innerCodeChar = codeChar <|> char ','
+
+outerCode = fmap concat $ many (fmap return codeChar <|> codeChoices)
+innerCode = fmap concat $ many (fmap return innerCodeChar <|> codeChoices)
+
+codeChoices = (nestedCommentCode <|> singleLineCommentCode <|>
+                  stringLit <|> charLit <|> bracesCode <|> parensCode <|> bracketsCode)
+
+bracesCode = string "{" >>+ innerCode >>+ string "}"
+parensCode = string "(" >>+ innerCode >>+ string ")"
+bracketsCode = string "[" >>+ innerCode >>+ string "]"
+nestedCommentCode = try (string "{-") >>+ insideNestedCode >>+ string "-}"
+insideNestedCode = fmap concat $ many (nestedCommentCode <|> fmap return (noneOf "-") <|> try (string "-" >/> char '}'))
+singleLineCommentCode = (try $ string "--") >>+ manyTill anyChar newline
+stringLit = fmap show $ stringLiteral 
+charLit = fmap show $ charLiteral
+
+identifier = T.identifier haskell
+comma = T.comma haskell <?> "comma"
+stringLiteral = T.stringLiteral haskell
+charLiteral = T.charLiteral haskell
+semi = T.semi haskell <?> "semicolon"
+
+---- to be later moved to another library
+parsecToQ :: Parser a -> String -> Q a
+parsecToQ p s = do
+    loc <- location
+    let file       = loc_filename loc
+        (line,col) = loc_start loc
+        p' = do  pos <- getPosition
+                 setPosition $
+                      (flip setSourceName) file $
+                      (flip setSourceLine) line $
+                      (flip setSourceColumn) col $  pos
+                 v <- p
+                 eof
+                 return v
+    e <- case runParser p' () "" s of
+      Left err -> fail $ show err
+      Right e  -> return e
+    return e
+
diff --git a/Data/Packed/Static/Vector.hs b/Data/Packed/Static/Vector.hs
new file mode 100644
--- /dev/null
+++ b/Data/Packed/Static/Vector.hs
@@ -0,0 +1,209 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Data.Packed.Static.Vector
+-- Copyright   :  (c) Reiner Pope 2008
+-- License     :  GPL-style
+--
+-- Maintainer  :  Reiner Pope <reiner.pope@gmail.com>
+-- Stability   :  experimental
+-- Portability :  portable
+--
+-- Statically-dimensioned 1D vectors.
+--
+-----------------------------------------------------------------------------
+
+module Data.Packed.Static.Vector(
+   Vector,
+   -- * Shaping
+   -- | Functions manipulating a vector's (static) shape.
+   refineVec,
+   atDim,
+   atShape,
+   -- * To/from lists
+   fromListU,
+   toList,
+   -- * Manipulation
+   dim,
+   (@>),
+   subVectorU,
+   joinU,
+   constant,
+   linspace,
+   vectorMin,
+   vectorMax,
+   vectorMinIndex,
+   vectorMaxIndex,
+   liftVector,
+   liftVector2,
+ ) where
+
+import Data.Maybe(fromJust)
+import Data.List(intercalate)
+
+import qualified Numeric.LinearAlgebra as H
+
+import Data.Packed.Static.Shapes
+import Data.Packed.Static.Imports
+import Data.Packed.Static.Internal
+
+instance ShapedContainer Vector where
+    type Unwrapped Vector = H.Vector
+    unWrap = unVector
+    wrapU = Vector
+                   
+    type UnknownShape Vector = Unknown
+    unsafeReshape = Vector . unVector
+
+------ Shaping
+-- | \"Reifies\" a Vector's length in types. Useful when vectors of length "Unknown"
+-- need to be used for a statically-sized operations. For instance, if @v :: Vector Unknown Double@, 
+-- then we can write
+-- 
+--    @refineVec v (\v -> forgetSize $ v + constant 5)@
+-- 
+-- to add a constant vector of 5s with the appropriate size.
+refineVec :: forall m t a. Vector m t -> (forall n. PositiveT n => Vector n t -> a) -> a
+refineVec v k = fromJust $ reifyPositiveD (toInteger $ dim v) (\n -> k (unsafeReshape v `atShape` n))
+
+withDim :: forall n a. PositiveT n => (Int -> Vector n a) -> Vector n a
+withDim f = f n where
+    n = fromIntegerT (undefined :: n)
+
+{- | Sets an arbitrary-length vector to a specific value.
+
+@\> constant 1 `atDim` 5
+[$vec| 1.0, 1.0, 1.0, 1.0, 1.0 |]@
+-}
+atDim :: (forall n. PositiveT n => Vector n t) -> Int -> Vector Unknown t
+atDim v n | n > 0     = fromJust $ reifyPositiveD (toInteger n) (\n -> forgetShapeU $ v `atShape` n)
+          | otherwise = error $ "atDim: negative vector length: " ++ show n
+
+-------- To / from lists
+{- | Constructs a vector from all the elements of a list.
+
+@\> fromListU [1,2,3,4,5]
+[$vec| 1.0, 2.0, 3.0, 4.0, 5.0 |]@
+-}
+fromListU :: (Storable a) => [a] -> Vector Unknown a
+fromListU = Vector . H.fromList
+
+{- | Converts to a list of elements.
+
+@\> toList [$vec|1,2,3|]
+[1.0,2.0,3.0]@
+-}
+toList :: (Storable a) => Vector n a -> [a]
+toList = H.toList . unVector
+
+------ Other operations
+{- | Vector's length.
+
+@\> dim [$vec|1::Double,2,3|]
+3@
+-}
+dim :: Vector n t -> Int
+dim = H.dim . unVector
+
+{- | Indexes a vector.
+
+@\> [$vec|1,2,3|] \@\> 1
+2.0@
+-}
+(@>) :: (Storable t) => Vector n t -> Int -> t
+(@>) = (H.@>) . unVector
+
+{- | Extracts a subvector.
+
+@\> subVectorU 2 3 [$vec|1,2,3,4,5|]
+[$vec| 3.0, 4.0, 5.0 |]@
+-}
+subVectorU :: (Storable t) => 
+              Int -- ^ Initial index
+           -> Int -- ^ Length of resultant vector
+           -> Vector n t
+           -> Vector Unknown t
+subVectorU a b = Vector . H.subVector a b . unVector
+
+--- I say the input Size is unknown, although it can be anything,
+--- so users don't think all the vectors must be of the same size.
+
+{- | Joins each vector in the list.
+
+@\> joinU [[$vecU|1,2,3|], [$vecU|4,5|]]
+[$vec| 1.0, 2.0, 3.0, 4.0, 5.0 |]@
+-}
+joinU :: (Storable t) => [Vector Unknown t] -> Vector Unknown t
+joinU = Vector . H.join . map unVector
+
+{- | Creates a constant vector of any length. The length is
+determined by the type.
+
+@\> [$vec|1,2,3|] + constant 2
+[$vec| 3.0, 4.0, 5.0 |]@
+-}
+constant :: (Element t, PositiveT n) => t -> Vector n t
+constant a = withDim (Vector . H.constant a)
+
+{- | Creates a vector of arbitrary length whose
+components range linearly from a to b. The vector's
+length is determined by its type.
+
+@\> linspace (1,5) `atShape` d4
+[$vec| 1.0, 2.333333333333333, 3.6666666666666665, 5.0 |]@
+-}
+linspace :: (PositiveT n) => (Double,Double) -> Vector n Double
+linspace r = withDim (\n -> Vector $ H.linspace n r) where
+
+{- | Gives the vector's minimum entry.
+
+@\> vectorMin [$vec|1,2,3|]
+1.0@
+-}
+vectorMin :: Vector n Double -> Double
+vectorMin = H.vectorMin . unVector
+
+{- | Gives the vector's maximum entry.
+
+@\> vectorMax [$vec|1,2,3|]
+3.0@
+-}
+vectorMax :: Vector n Double -> Double
+vectorMax = H.vectorMax . unVector
+
+{- | Gives the index of a vector's minimum entry.
+@\> vectorMinIndex [$vec|1,2,3|]
+0@
+-}
+vectorMinIndex :: Vector n Double -> Int
+vectorMinIndex = H.vectorMinIndex . unVector
+
+{- | Gives the index of a vector's maximum entry. 
+
+@\> vectorMaxIndex [$vec|1,2,3|]
+2@
+-}
+vectorMaxIndex :: Vector n Double -> Int
+vectorMaxIndex = H.vectorMaxIndex . unVector
+
+{- | 'map' for vectors.
+
+@\> (*2) `liftVector` [$vec|1,2,3|]
+[$vec| 2.0, 4.0, 6.0 |]@
+-}
+liftVector :: (Storable a, Storable b) => (a -> b) -> Vector n a -> Vector n b
+liftVector f = Vector . H.liftVector f . unVector
+
+--- note: this requires they are of the same size, whereas hmatrix allows
+--- different sizes; it uses the minimum size.
+{- | 'zipWith' for vectors. 
+
+@\> liftVector2 (+) [$vec|1,2,3|] (constant 3)
+[$vec| 4.0, 5.0, 6.0 |]@
+-}
+liftVector2 :: (Storable a, Storable b, Storable c) =>
+               (a -> b -> c) -> Vector n a -> Vector n b -> Vector n c
+liftVector2 f v1 v2 = Vector $ H.liftVector2 f (unVector v1) (unVector v2)
+
+instance (Storable e, Show e) => Show (Vector n e) where
+    show v = "[$vec| " ++ intercalate ", " (map show $ toList v) ++ " |]"
+
diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program 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.
+
+    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Numeric/LinearAlgebra/Static.hs b/Numeric/LinearAlgebra/Static.hs
new file mode 100644
--- /dev/null
+++ b/Numeric/LinearAlgebra/Static.hs
@@ -0,0 +1,21 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Numeric.LinearAlgebra.Static
+-- Copyright   :  (c) Reiner Pope 2008
+-- License     :  GPL-style
+--
+-- Maintainer  :  Reiner Pope <reiner.pope@gmail.com>
+-- Stability   :  experimental
+-- Portability :  portable
+--
+-- Main imported interface for this package.
+--
+-----------------------------------------------------------------------------
+
+module Numeric.LinearAlgebra.Static(
+  module Numeric.LinearAlgebra.Static.Algorithms,
+  module Data.Packed.Static,
+ ) where
+
+import Numeric.LinearAlgebra.Static.Algorithms
+import Data.Packed.Static
diff --git a/Numeric/LinearAlgebra/Static/Algorithms.hs b/Numeric/LinearAlgebra/Static/Algorithms.hs
new file mode 100644
--- /dev/null
+++ b/Numeric/LinearAlgebra/Static/Algorithms.hs
@@ -0,0 +1,315 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Numeric.LinearAlgebra.Static.Algorithms
+-- Copyright   :  (c) Reiner Pope 2008
+-- License     :  GPL-style
+--
+-- Maintainer  :  Reiner Pope <reiner.pope@gmail.com>
+-- Stability   :  experimental
+-- Portability :  portable
+--
+-- Common operations.
+--
+-----------------------------------------------------------------------------
+
+module Numeric.LinearAlgebra.Static.Algorithms(
+    -- * Type hints
+    matT,
+    vecT,
+    doubleT,
+    complexT,
+    -- * Multiplication                                           
+    Mul(..),
+    (<.>),
+    -- * Concatenating
+    (<->),
+    (<|>),
+    -- * Solving \/ inverting
+    (<\>),
+    linearSolve,
+    inv,
+    pinv,
+    -- * Determinant \/ rank \/ condition number
+    det,
+    rank,
+    rcond,
+    -- * Eigensystems
+    eig,
+    eigSH,
+
+    -- * Factorisations
+    -- ** SVD
+    svd,
+    fullSVD,
+    economySVDU,
+    -- ** QR
+    qr,
+    -- ** Cholesky
+    chol,
+    -- ** Hessenberg
+    hess,
+    -- ** Schur
+    schur,
+    -- ** LU
+    lu,
+    luPacked,
+    luSolve,
+
+    -- * Matrix functions
+    expm,
+    sqrtm,
+    matFunc,
+    
+    -- * Nullspace
+    nullspacePrec,
+    nullVector,
+
+    -- * Norms
+    pnorm,
+    H.NormType(..),
+
+    -- * Misc
+    ctrans,
+    eps,
+    i,
+    outer,
+    kronecker,
+ ) where
+
+import Data.Complex
+
+import Types.Data.Num
+import Types.Data.Ord
+import Types.Data.Bool
+
+import Data.Packed.Static
+import Data.Packed.Static.Internal
+
+import qualified Numeric.LinearAlgebra as H
+import           Numeric.LinearAlgebra(pnorm)
+
+matT :: Matrix s t -> a
+matT = const undefined
+
+vecT :: Vector s t -> a
+vecT = const undefined
+
+doubleT :: a s Double -> x
+doubleT = const undefined
+
+complexT :: a s (Complex Double) -> x
+complexT = const undefined
+
+class Mul a b where
+    -- | Overloaded matrix-matrix, matrix-vector, or vector-matrix product.
+    --   The instances have type equalities to improve the quality of
+    --   type inference.
+    (<>) :: Field t => a t -> b t -> MulResult a b t
+    type MulResult a b :: * -> *
+
+instance (n ~ n') => Mul (Matrix (m,n)) (Matrix (n',p)) where
+    a <> b = Matrix $ H.multiply (unMatrix a) (unMatrix b)
+    type MulResult (Matrix (m,n)) (Matrix (n',p)) = Matrix (m,p)
+
+instance (n ~ n') => Mul (Matrix (m,n)) (Vector n') where
+    m <> v = Vector (unMatrix m H.<> unVector v)
+    type MulResult (Matrix (m,n)) (Vector n') = Vector m
+
+instance (m ~ m') => Mul (Vector m) (Matrix (m',n)) where
+    v <> m = Vector (unVector v H.<> unMatrix m)
+    type MulResult (Vector m) (Matrix (m',n)) = Vector n
+
+-- | Dot product
+(<.>) :: (Field t) => Vector n t -> Vector n t -> t
+a <.> b = H.dot (unVector a) (unVector b)
+
+class JoinableV a b where
+    type JoinShapeV a b :: *
+    -- | Overloaded matrix-matrix, matrix-vector, vector-matrix, or vector-vector
+    --   vertical concatenation. The instances have type equalities
+    --   to improve the quality of type inference.
+    (<->) :: Element t => a t -> b t -> Matrix (JoinShapeV a b) t
+
+instance JoinableV (Matrix (m,n)) (Matrix (p,n)) where
+    type JoinShapeV (Matrix (m,n)) (Matrix (p,n)) = (m :+: p, n)
+    m <-> n = Matrix (unMatrix m H.<-> unMatrix n)
+
+instance JoinableV (Matrix (m,n)) (Vector n) where
+    type JoinShapeV (Matrix (m,n)) (Vector n) = (m :+: D1, n)
+    m <-> v = m <-> asRow v
+
+instance JoinableV (Vector n) (Matrix (m,n)) where
+    type JoinShapeV (Vector n) (Matrix (m,n)) = (D1 :+: m, n)
+    v <-> m = asRow v <-> m
+
+instance JoinableV (Vector n) (Vector n) where
+    type JoinShapeV (Vector n) (Vector n) = (D2, n)
+    v <-> w = asRow v <-> w
+
+class JoinableH a b where
+    type JoinShapeH a b :: *
+    -- | Overloaded matrix-matrix, matrix-vector, vector-matrix,
+    --   or vector-vector horizontal concatenation. The
+    --   instances have type equalities to
+    --   improve the quality of type inference.
+    (<|>) :: Element t => a t -> b t -> Matrix (JoinShapeH a b) t
+
+instance JoinableH (Matrix (m,n)) (Matrix (m,p)) where
+    type JoinShapeH (Matrix (m,n)) (Matrix (m,p)) = (m,n:+:p)
+    m <|> n = Matrix (unMatrix m H.<|> unMatrix n)
+
+instance JoinableH (Matrix (m,n)) (Vector m) where
+    type JoinShapeH (Matrix (m,n)) (Vector m) = (m,n:+:D1)
+    m <|> v = m <|> asColumn v
+
+instance JoinableH (Vector m) (Matrix (m,n)) where
+    type JoinShapeH (Vector m) (Matrix (m,n)) = (m,D1 :+: n)
+    v <|> m = asColumn v <|> m
+
+instance JoinableH (Vector m) (Vector m) where
+    type JoinShapeH (Vector m) (Vector m) = (m,D2)
+    v <|> w = asColumn v <|> w
+
+-- | Least squares solution of a linear equation.
+(<\>) :: Field t => Matrix (m,n) t -> Vector m t -> Vector n t
+(<\>) m = Vector . (H.<\>) (unMatrix m) . unVector
+
+linearSolve :: (H.Field t) => Matrix (m,m) t -> Matrix (m,n) t -> Matrix (m,n) t
+linearSolve a b = Matrix $ H.multiply (unMatrix a) (unMatrix b)
+
+inv :: (H.Field t) => Matrix (m,m) t -> Matrix (m,m) t
+inv = Matrix . H.inv . unMatrix
+
+pinv :: (H.Field t) => Matrix (m,n) t -> Matrix (n,m) t
+pinv = Matrix . H.pinv . unMatrix
+
+det :: (H.Field t) => Matrix (m,m) t -> t
+det = H.det . unMatrix
+
+rank :: (H.Field t) => Matrix (m,n) t -> Int
+rank = H.rank . unMatrix
+
+rcond :: (H.Field t) => Matrix (m,n) t -> Double
+rcond = H.rcond . unMatrix
+
+--------- SVD
+svd :: (H.Field t) => Matrix (m,n) t ->
+   (Matrix (m,m) t, Vector (Min m n) Double, Matrix (n,n) t)
+svd = svdBody
+
+-- private
+svdBody m = case H.svd $ unMatrix m of
+          (a,b,c) -> (Matrix a, Vector b, Matrix c)
+
+
+fullSVD :: (H.Field t) => Matrix mn t
+   -> (Matrix (m,m) t, Matrix (m,n) Double, Matrix (n,n) t)
+fullSVD m = case H.full H.svd $ unMatrix m of
+              (a,b,c) -> (Matrix a, Matrix b, Matrix c)
+
+economySVDU :: (H.Field t) => Matrix (m,n) t -> 
+   (Matrix (m,Unknown) t, 
+    Vector Unknown Double, 
+    Matrix (n,Unknown) t)
+economySVDU m = case H.economy H.svd $ unMatrix m of
+                 (a,b,c) -> (Matrix a, Vector b, Matrix c)
+
+---- eig
+eig :: H.Field t =>
+       Matrix (m,m) t
+    -> (Vector m (H.Complex Double), 
+        Matrix (m,m) (H.Complex Double))
+eig = liftEig H.eig
+
+eigSH :: (H.Field t) => 
+         Matrix (m,m) t 
+      -> (Vector m Double, Matrix (m,m) t)
+eigSH = liftEig H.eigSH
+
+liftEig f m = case f $ unMatrix m of
+                (a,b) -> (Vector a, Matrix b)
+
+---- qr
+qr :: (H.Field t) =>
+      Matrix (m,n) t -> (Matrix (m,m) t, Matrix (m,n) t)
+qr m = case H.qr $ unMatrix m of
+         (a,b) -> (Matrix a, Matrix b)
+
+--- cholesky
+chol :: (H.Field t) => Matrix (m,m) t -> Matrix (m,m) t
+chol = Matrix . H.chol . unMatrix
+
+-- hessenberg
+hess :: (H.Field t) =>
+        Matrix (m,m) t -> (Matrix (m,m) t, Matrix (m,m) t)
+hess m = case H.hess $ unMatrix m of
+           (a,b) -> (Matrix a, Matrix b)
+
+-- schur
+schur :: (H.Field t) =>
+         Matrix (m,m) t -> (Matrix (m,m) t, Matrix (m,m) t)
+schur m = case H.schur $ unMatrix m of
+            (a,b) -> (Matrix a, Matrix b)
+
+-- lu
+--- I hope these sizes is right !!
+lu :: (H.Field t) =>
+      Matrix (m,n) t 
+   -> (Matrix (m, Min m n) t, Matrix (Min m n, n) t, Matrix (m,m) t, t)
+lu m = case H.lu $ unMatrix m of
+         (a,b,c,d) -> (Matrix a, Matrix b, Matrix c, d)
+
+luPacked :: (H.Field t) =>
+            Matrix (m,n) t -> (Matrix (m,n) t, [Int])
+luPacked m = case H.luPacked $ unMatrix m of
+               (a,b) -> (Matrix a, b)
+
+--- is this right?
+luSolve :: (H.Field t) =>
+           (Matrix (m,n) t, [Int]) 
+        -> Matrix (m,p) t -> Matrix (n,p) t
+luSolve (Matrix lu,is) = Matrix . H.luSolve (lu,is) . unMatrix
+
+----
+
+expm :: (H.Field t) => Matrix (m,m) t -> Matrix (m,m) t
+expm = Matrix . H.expm . unMatrix
+
+sqrtm :: (H.Field t) => Matrix (m,m) t -> Matrix (m,m) t
+sqrtm = Matrix . H.sqrtm . unMatrix
+
+matFunc :: (H.Field t) => (Complex Double -> Complex Double)
+        -> Matrix (m,m) t
+        -> Matrix (m,m) (Complex Double)
+matFunc f = Matrix . H.matFunc f . unMatrix
+
+nullspacePrec :: (H.Field t) =>
+                 Double -> Matrix (m,n) t -> [Vector n t]
+nullspacePrec tol = map Vector . H.nullspacePrec tol . unMatrix
+
+nullVector :: (H.Field t) =>
+              Matrix (m, n) t -> Vector n t
+nullVector = last . nullspacePrec 1
+
+--- misc
+ctrans :: (H.Field t) =>
+          Matrix (m,n) t -> Matrix (n,m) t
+ctrans = Matrix . H.ctrans . unMatrix
+
+eps :: Double
+eps = H.eps
+
+i :: Complex Double
+i = H.i
+
+outer :: (H.Field t) =>
+         Vector m t -> Vector n t -> Matrix (m,n) t
+outer v w = Matrix $ H.outer (unVector v) (unVector w)
+
+kronecker :: (H.Field t) =>
+             Matrix (m,n) t -> Matrix (p,q) t -> Matrix (m :*: p, n :*: q) t
+kronecker m n = Matrix $ H.kronecker (unMatrix m) (unMatrix n)
+
+----
+-- omitted: haussholder, unpackQR, unpackHess
+
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,4 @@
+#! /usr/bin/env runhaskell
+
+import Distribution.Simple
+main = defaultMain
diff --git a/hmatrix-static.cabal b/hmatrix-static.cabal
new file mode 100644
--- /dev/null
+++ b/hmatrix-static.cabal
@@ -0,0 +1,53 @@
+Name:          hmatrix-static
+Version:       0.1
+Synopsis:      hmatrix with vector and matrix sizes encoded in types
+License:       GPL
+License-file:  LICENSE
+Author:	       Reiner Pope
+Maintainer:    Reiner Pope <reiner.pope@gmail.com>
+Stability:     experimental
+Homepage:      http://code.haskell.org/hmatrix-static/
+Description:   A thin, lightweight wrapper over hmatrix to support
+               static checking of matrix and vector sizes (for instance,
+	       addition of different-sized vectors will be disallowed
+	       at compile-time). 
+	       .
+	       Objects whose sizes are not statically known are given
+	       the special size 'Unknown', which allows a syntactically
+	       cheap way to step down to the statically unchecked system 
+	       of hmatrix. This is cheap in comparison to representing
+	       unknown sizes with exisential types, which forces pervasive
+	       continuation passing style.
+	       .	    
+	       WARNING: when using the QuasiQuoting in this package, 
+	       be aware of infix expressions. See the note in 
+	       "Data.Packed.Static.Syntax" for details.
+Category:      Math
+Tested-with:   GHC == 6.10.1
+Cabal-Version: >= 1.6
+build-type:    Simple
+
+Library
+  Exposed-Modules:
+       Data.Packed.Static,
+       Data.Packed.Static.Vector,
+       Data.Packed.Static.Matrix,
+       Data.Packed.Static.ST,
+       Data.Packed.Static.Syntax,
+       Data.Packed.Static.Convert,
+       Data.Packed.Static.Imports,
+       Data.Packed.Static.Shapes,
+       Numeric.LinearAlgebra.Static,
+       Numeric.LinearAlgebra.Static.Algorithms
+  Other-Modules:
+       Data.Packed.Static.Internal,
+       Data.Packed.Static.Internal.Vector,
+       Data.Packed.Static.Internal.Matrix
+  Extensions:
+       ScopedTypeVariables, FlexibleContexts,
+       FlexibleInstances, MultiParamTypeClasses,
+       Rank2Types, TypeFamilies, TypeOperators,
+       EmptyDataDecls, TemplateHaskell
+
+  Build-Depends: base==4.*, hmatrix==0.5.*, tfp==0.2.*, array==0.2.*, 
+                 haskell-src-meta>=0.0.3.1&&<0.0.4, parsec==3.*, template-haskell
