Added an enumeration of gateway names.  Still figuring out how to make unit testing work when gateways are involved.