I implemented 17 before the relay kind was added. Haven't had a chance to add the relay selections bit yet.