Added emulator and stuff