Add Gem guard
WIP
WIP