             return
         } else {
             switch input {
-            case "start":
+            case "s", "start":
                 logStart()
                 player.play()
+                
             case "n", "next":
                 player.advanceToNextItem()
                 player.play()
+
+                currentSongIndex++
+
             case "p", "previous":
                 jumpToPreviousSong()
                 player.play()
+
+                currentSongIndex--
+
             default:
                 print("Unrecognized command \"\(input)\" 😦 .")
             }

    }

    private func logInputTips() {
        print("\nType \"(n)ext\" or \"(p)revious\" to change song.")
        print("Type index number to play that song.")
    }

}

import Foundation
import AVFoundation

class RyCooder {

    private let runLoop = NSRunLoop.currentRunLoop()
    private let stdinHandle = NSFileHandle.fileHandleWithStandardInput()
    private let songs: [AVPlayerItem]
    private let player: AVQueuePlayer

    private var currentSongIndex = 0

    init(pathToStage: String) {
        let musicFiles = RyCooder.musicFilesInDirectory(pathToStage)
