Make progress on 'detect an amex brand'

#438 fixes