initial invetory class definitions
Merge branch 'master' into scalable_effects