Fixed models, however now needs an undesirable init method
Merge branch 'master' of github.com:mdlawson/emvy