More work on models.
Merge branch 'master' of https://github.com/andallas/Tones-Adventure