Add a little data accessor
Make sure that we're actually working with the item
Slightly tidier