Updates

Added Item class, moved code into item class.