More identify/control client stubs + todo notes