Similarly, i'm not convinced we want to be exposing this to clients. This could live in Server instead.