Add figaro
Upload part 1/2
fixing conflicts