Continuing on working on the Item handlers

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>