added figaro. ready to be merged later on
Ready for deploy