Cleaned up some of the code, started implementation of graphview library.