More work on items, throwing, etc.