     @IBAction func editPriority(sender: AnyObject?) {
         defer { updateView() }
 
-        let oldPriority: IncidentPriority
-        if let priority = incident!.priority { oldPriority = priority } else { oldPriority = .Normal }
-        
         guard let selectedTag = priorityPopUp!.selectedItem?.tag else {
             logError("Unable to get selected priority tag")
             return

        
        let newPriority: IncidentPriority
        switch selectedPriority {
        case .High  : newPriority = .High
        case .Normal: newPriority = .Normal
        case .Low   : newPriority = .Low
        }
        
        if newPriority == oldPriority { return }
        
        logDebug("Priority changed to: \(newPriority)")
        

    @IBAction func editState(sender: AnyObject?) {
        defer { updateView() }

        guard let selectedTag = statePopUp!.selectedItem?.tag else {
            logError("Unable to get selected state tag")
            return
