match headers
tidy up finder method interface