Return a map of items rather than a slice.  This seems simpler but I could go either way.