First try for model implementation
Merge branch 'master' of github.com:Foomy/pollux