Revert "Revert "Finished Merge Emu - New Verson""

This reverts commit 122090d473a40a834f4f13173c8adcc9265f99fd.