Added more classes
Merge branch 'master' of github.com:Falcora/warehouse