Pulling in Tim's code and starting the gemification process