Matrix done
Matrix done
merged stuff