Gem Refactor.

Test not working :(.