We should use the Switching ContentApi now, and move lookups into a Service. Not urgent, obvs.