Remove the emulator from here, most of the code is on the dedi at the moment.