Large batch of changes, added graphs and fixed the ring are the two biggest