Sane item storing
Still cleaning up old item references