Ongoing work on the model (other parts are still in the SVN)