Updating Gems

Not yet ready to merge.