Initial changes to plot, likely will want less hard-coding