Beginning to support multiple devices within the simulator