Work in progress, add gateway selection