Item classes

I continued work on the item classes and sub classes.