             return "Video"
         case .Drawing:
             return "Drawing"
+        case .Location:
+            return "Location"
+        case .Music:
+            return "Music"
+        case .Link:
+            return "Link"
         }
     }
     

        
        if let type = json["type"].string {
            switch type {
                case "gif":
                    msg.type = .GIF
                    if let stringWidth = json["width"].string {

                        msg.height = json["height"].int
                    }
                    msg.src = json["src"].string
                
                case "image":
                    msg.type = .Image
                    if let stringWidth = json["width"].string {
