Expanded Matrix class

Now has multiplication etc.