Pull Request by Request

Haven't done a pull request before, hopefully this works however it should. I'll be doing a bit more work on the emu starting next week. (Vacation atm)