Starting to add funcionallities, the 'done' method is not yet implemented