Add teams and users wrapper

Nice catch. Move quickly and break stuff!