diff --git a/src/device/cpu.rs b/src/device/cpu.rs
index aec0334..ff058ab 100644
--- a/src/device/cpu.rs
+++ b/src/device/cpu.rs
@@ -1,52 +1,65 @@
 use byteorder::{BigEndian, ByteOrder};
-use crate::device::cpu::Instruction::{ClearScreen, JumpTo};
+use crate::device::cpu::Instruction::{ClearScreen, JumpTo, SetRegister};
 
 #[derive(Eq, PartialEq, Debug)]
-enum Instruction{
+enum Instruction {
     ClearScreen,
     /// Jump to location
     JumpTo(u16),
-    SetRegister(usize,u8),
-    AddValueToRegister(usize,u8),
+    SetRegister(usize, u8),
+    AddValueToRegister(usize, u8),
     SetIndex(u16),
     ///
-    DRAW(usize,usize,u8)
+    DRAW(usize, usize, u8),
 }
-impl Instruction{
-    pub fn parse_fetched_instruction(location: &[u8])->Instruction{
-        assert_eq!(location.len(),2);
+
+impl Instruction {
+    pub fn parse_fetched_instruction(location: &[u8]) -> Instruction {
+        assert_eq!(location.len(), 2);
         let instruction = BigEndian::read_u16(location);
 
-        if instruction == 0xe0{
+        if instruction == 0xe0 {
             return ClearScreen;
-        } else if (instruction & 0x1000)==0x1000 {
+        } else if (instruction & 0x1000) == 0x1000 {
             return JumpTo(instruction & 0xfff);
+        } else if (instruction & 0x6000) == 0x6000 {
+            return SetRegister(((instruction & 0x0f00)>>8) as usize, (instruction & 0xff) as u8);
+        } else {
+            todo!();
         }
-        todo!();
     }
 }
 
 #[cfg(test)]
-mod tests{
+mod tests {
     use crate::device::cpu::Instruction;
-    use crate::device::cpu::Instruction::{ClearScreen, JumpTo};
+    use crate::device::cpu::Instruction::{ClearScreen, JumpTo, SetRegister};
 
     #[test]
-    fn test_clear_screen(){
+    fn test_clear_screen() {
         let instruction_bytes = 0x00e0_u16.to_be_bytes();
         let ins = Instruction::parse_fetched_instruction(&instruction_bytes);
-        assert_eq!(ins,ClearScreen);
+        assert_eq!(ins, ClearScreen);
     }
+
     #[test]
-    fn test_jump_to_instruction_1(){
+    fn test_jump_to_instruction_1() {
         let instruction_bytes = 0x1123_u16.to_be_bytes();
         let ins = Instruction::parse_fetched_instruction(&instruction_bytes);
-        assert_eq!(ins,JumpTo(0x123));
+        assert_eq!(ins, JumpTo(0x123));
     }
+
     #[test]
-    fn test_jump_to_instruction_2(){
+    fn test_jump_to_instruction_2() {
         let instruction_bytes = 0x1faf_u16.to_be_bytes();
         let ins = Instruction::parse_fetched_instruction(&instruction_bytes);
-        assert_eq!(ins,JumpTo(0xfaf));
+        assert_eq!(ins, JumpTo(0xfaf));
+    }
+
+    #[test]
+    fn test_set_instruction(){
+        let instruction_bytes = 0x6a00_u16.to_be_bytes();
+        let ins = Instruction::parse_fetched_instruction(&instruction_bytes);
+        assert_eq!(ins, SetRegister(10,0));
     }
 }
\ No newline at end of file