#16 done

but must talk about with de Product owner