This should be up in NetworkManager itself surely? As we may well need it for the set based stuff within their functions. But nicer than what I had before either way.