[CUR-276] Redo this gem (best is from scratch)