                 @mouseMove(@position)
             if(cmd.action == 'scroll')
                 @scrollMouse cmd.direction, cmd.magnitude
-        if(cmd.type == 'keyboardTest')
-            @keyboardTest(cmd.action)
+        if(cmd.type == 'keyboard')
+            if(cmd.action in ['up', 'down', 'tap'])
+                @keyboard cmd.action, cmd.button
 
     activateRecipe: (recipeName) =>
         recipe = @recipes[recipeName]

            @mouseState[button] = 'up'
        #window.feedback.mouseStatus button, @mouseState[button] # This shouldn't be here..

    scrollMouse: (direction, magnitude = 50) =>
        if(direction == 'up' or direction == 'down')
            @robot.scrollMouse(magnitude, direction)

            console.log 'This aint 3d, man!'

    executeAction: (action) =>
        #console.log "Execute action: ", action
        cmd = @actions[action]
        #console.log "cmd: ", cmd

        if(cmd.feedback?)
            if(cmd.feedback.audio?)
