A little more work on Item handling, need to test