Adding work done for widgets, including new classes and moving plot code
around