Feature/figaro