Instituted some more super classes to make code more broadly applicable.