issue #80 WIP but done for first two collectibles