Begin refactor for multiple graphs from one request
Further flow inversion, we now pass a function that gets a function to pass the thing to plot to, which sound a bit odd)