Finished cleaning up the extra code in order to use the existing node/edge classes.