Need to work on major changes
Plotting system now working as intended