Fix and implement martini