Ordered some stuff, put the basic structure for mulitple calculation types