Gem messages fully working and being collected
Merging Lauren's changes