Updated some more of Antonio's code and added some model test plots