Updates, plots still not working
If you have time to take a look