Add emulator and startup