#37 y #38 - Written features for this sprint