Moving code into the gem