Some changes made to conform to new model; some testing needs to be done but it should be good. Run lesion study.