diff --git a/Roadmap.md b/Roadmap.md
index 850aee8..d18f88f 100644
--- a/Roadmap.md
+++ b/Roadmap.md
@@ -1,32 +1,33 @@
-There are lots of things to do...these are just some obvious ones before we can have a functional emulator!
-
-### Debugger/GUI
-- [x] Integrate symbols into disassembler view: *mattvail*
-- [x] Upgrade from Qt4 to Qt5: *xsacha*
-- [x] Implement a callstack widget: *mattvail*
-- [ ] Implement a breakpoint viewer/editor widget: *mattvail*
-- [ ] Fix emu_window support to display framebuffers in Qt window: *mattvail*
-
-### Core
-- [x] Implement hardware register I/O interface: *bunnei*
-- [x] Cleanup MemoryMap and remove MMU hacks: *bunnei*
-- [x] Implement loading/decrypting of CTR bootable formats and filesystems (e.g. CCI/CXI): *bunnei*
-- [ ] Implement better MMU emulation: *TBD*
-
-### Video
-- [x] Cleanup video interface and gut renderer code copied from Gekko: *bunnei*
-- [ ] Emulate I/O register reads/writes in hw_lcd: *TBD*
-- [ ] Implement decoding of other framebuffer formats: *TBD*
-
-### High-level Emulation
-- [x] Implement simple HLE interface: *bunnei*
-- [x] Emulate initial System Calls: *bunnei*
-- [x] Test Smealum's GPU homebrew demo and implement missing GSP GPU service calls: *bunnei*
-- [x] Emulate threading/mutexes/events for booting CTR demos: *bunnei*
-- [x] Emulate initial Filesystem services: *bunnei*
-- [ ] Emulate HID service calls to support basic user-input for homebrew: *mattvail*
-
-### Framework
-- [x] Fix CMakeLists.txt and build/test on Linux: *bunnei*
-- [x] Implement disk IO API for abstracting loading/access of various bootable formats: *bunnei*
-- [ ] Implement keyboard/gamepad library/window API for mapping user input: *TBD*
\ No newline at end of file
+There are lots of things to do...these are just some obvious ones before we can have a functional emulator!
+
+### Debugger/GUI
+- [x] Integrate symbols into disassembler view: *mattvail*
+- [x] Upgrade from Qt4 to Qt5: *xsacha*
+- [x] Implement a callstack widget: *mattvail*
+- [x] Fix emu_window support to display framebuffers in Qt window
+- [ ] Implement a breakpoint viewer/editor widget: *mattvail*
+
+### Core
+- [x] Implement hardware register I/O interface: *bunnei*
+- [x] Cleanup MemoryMap and remove MMU hacks: *bunnei*
+- [x] Implement loading/decrypting of CTR bootable formats and filesystems (e.g. CCI/CXI): *bunnei*
+- [ ] Implement better MMU emulation: *TBD*
+
+### Video
+- [x] Cleanup video interface and gut renderer code copied from Gekko: *bunnei*
+- [ ] Emulate I/O register reads/writes in hw_lcd: *TBD*
+- [ ] Implement decoding of other framebuffer formats: *TBD*
+
+### High-level Emulation
+- [x] Implement simple HLE interface: *bunnei*
+- [x] Emulate initial System Calls: *bunnei*
+- [x] Test Smealum's GPU homebrew demo and implement missing GSP GPU service calls: *bunnei*
+- [x] Emulate threading/mutexes/events for booting CTR demos: *bunnei*
+- [x] Emulate initial Filesystem services: *bunnei*
+- [x] Emulate HID service calls to support basic user-input for homebrew: *kevinhartman*
+
+### Framework
+- [x] Fix CMakeLists.txt and build/test on Linux: *bunnei*
+- [x] Implement disk IO API for abstracting loading/access of various bootable formats: *bunnei*
+- [ ] Implement keyboard/gamepad library/window API for mapping user input: *TBD*
+- [ ] Implement CLI tool for remapping input for Citra-CLI: *TBD* 
\ No newline at end of file