Lots of work on data and model. Things appear to be working