Closes #28 - added the model and updated the calculations