almost finished

Signed-off-by: Nico Magni <nicomagni@wolox.com.ar>