Better item management, that should all work