Finished for now; fixed graphing component