Beginning work on Upgrading emulator to 0.154. #230