Small refactor to prep for scatter plots.
Small refactor to prep for scatter plots.
Support for scatter plots and re-arranged the arguments.