First version of the model in place now