Commit error, FIX.

Accidently merged file incorrectly. Have re-added Model class.