a little tlc to Gem-ify at least to start