Update on Item System

A whole lot of stuff