Started to add Gems

But they don't work properly yet.