added gems and such
merge conflicts