ExpiryDate implemented
finished off gateway base class