Moved everything to a single container class and began adding independant functions for the different matrixTypes. Consider changing this later on.