Refactor again so we can tell what item is being reshared in case the same...

Refactor again so we can tell what item is being reshared in case the same source shows up. This is the end of the share_api branch, moving to master.