Restructured the way that graphing takes place - and created a new class to help