just about have everything working now. Need to run tests and make plots still