Finished up stuff in the model