Changed the structure.  Find should now go the whole way to the gateway