Feature/gems