edited classes, and webapp now with graphs