Polishing gems

Almost there...