Small changes to look at expanding graphing functionality