Updated model - now works (Must implement Serializable)
Merge remote-tracking branch 'origin/af' into af