Changed to Option<(String,String)> return, closer to the output type needed in section 7