diff --git a/ComputerAvailCheck/ViewController.swift b/ComputerAvailCheck/ViewController.swift
@@ -7,19 +7,24 @@
 //
 
 import UIKit
+import MapKit
+import SVProgressHUD
 
 class ViewController: UIViewController, SOAPEngineDelegate {
 
 	let asmxURL = "https://clc.its.psu.edu/ComputerAvailabilityWS/Service.asmx"
 	let buildingSoapAction = "https://clc.its.psu.edu/ComputerAvailabilityWS/Service.asmx/Buildings"
 	let roomSoapAction = "https://clc.its.psu.edu/ComputerAvailabilityWS/Service.asmx/Rooms"
-
+    let initialLocation = CLLocationCoordinate2D(latitude: 40.799870, longitude: -77.863642)
+
+    @IBOutlet weak var buildingMapView: MKMapView!
 	@IBOutlet weak var buildingTableView: UITableView!
     var refreshControl = UIRefreshControl()
 
 	var soapManager = SoapManager()
-	var buildingModelArray: NSMutableArray = []
-
+	var buildingModelArray: [BuildingModel] = []
+    var buildingPinArray: [BuildingPin] = []
+
 	override func viewDidLoad() {
 		super.viewDidLoad()
 		// Do any additional setup after loading the view, typically from a nib.
@@ -33,6 +38,10 @@ class ViewController: UIViewController, SOAPEngineDelegate {
         self.buildingTableView.contentOffset = CGPointMake(0, -self.refreshControl.frame.size.height)
         self.buildingTableView.addSubview(self.refreshControl)
 
+        // Center map
+        let region = MKCoordinateRegionMakeWithDistance(self.initialLocation, 1080, 1920)
+        self.buildingMapView.region = region
+
 		// Make a request
 		self.refreshControl.beginRefreshing()
         self.loadBuildingData()
@@ -46,10 +55,21 @@ class ViewController: UIViewController, SOAPEngineDelegate {
 	// MARK: Instance Method
     
 	func loadBuildingData() {
-		self.buildingModelArray.removeAllObjects()
+		self.buildingModelArray.removeAll()
 		self.soapManager.requestURL(asmxURL, soapAction: buildingSoapAction, value: "UP", forKey: "Campus")
 	}
 
+    func jsonArrayFromFile(filename: String) -> NSArray {
+        let jsonData = NSData(contentsOfFile: filename)
+        do {
+            let jsonDict: NSDictionary = try NSJSONSerialization.JSONObjectWithData(jsonData!, options: NSJSONReadingOptions.MutableContainers) as! NSDictionary
+            return jsonDict["buildingData"] as! NSArray
+        } catch let error as NSError {
+            print(error.localizedDescription)
+        }
+        return []
+    }
+
 	// MARK: SOAPEngineDelegate
 	
 	func soapEngine(soapEngine: SOAPEngine!, didFinishLoading stringXML: String!, dictionary dict: [NSObject : AnyObject]!) {
@@ -60,27 +80,52 @@ class ViewController: UIViewController, SOAPEngineDelegate {
 		if let diffgram = responseDict["diffgram"] {
 			if let documentElement = (diffgram as! NSDictionary)["DocumentElement"] {
 				if let buildings: NSArray = ((documentElement as! NSDictionary)["Buildings"] as! NSArray) {
-					for dict in buildings {
-						let buildingModel = BuildingModel(dictionary: dict as! NSDictionary)
-						self.buildingModelArray.addObject(buildingModel)
-					}
-					self.buildingTableView.reloadData()
+                    // Read json file
+                    let fileName = NSBundle.mainBundle().pathForResource("BuildingData", ofType: "json")
+                    let jsonArray: NSArray = self.jsonArrayFromFile(fileName!)
+                    let buildingNameArray: NSMutableArray = []
+                    for dict in jsonArray {
+                        buildingNameArray.addObject(dict["name"] as! NSString)
+                    }
+
+                    for dict in buildings {
+                        let buildingModel = BuildingModel(dictionary: dict as! NSDictionary)
+                        self.buildingModelArray.append(buildingModel)
+
+                        // Add available building
+                        if buildingNameArray.containsObject(buildingModel.Building) {
+                            let index = buildingNameArray.indexOfObject(buildingModel.Building)
+                            let targetBuildingDict = jsonArray[index] as! NSDictionary
+                            let buildingAnnotation = BuildingAnnotation(dictionary: targetBuildingDict)
+                            let buildingPin = BuildingPin(buildingAnnotation: buildingAnnotation)
+                            self.buildingPinArray.append(buildingPin)
+                        }
+                    }
+                    // Refresh tableview
+                    self.buildingTableView.reloadData()
+                    // Add annotations
+                    self.buildingMapView.addAnnotations(self.buildingPinArray)
 				}
 			}
 		}
 	}
 
+    func soapEngine(soapEngine: SOAPEngine!, didFailWithError error: NSError!) {
+        self.refreshControl.endRefreshing()
+        SVProgressHUD.showErrorWithStatus(error.localizedDescription)
+    }
+
 	// MARK: UITableViewDataSource
 	
 	func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-		return buildingModelArray.count
+		return self.buildingModelArray.count
 	}
 
 	func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
 		let tableViewCell: BuildingTableViewCell = tableView.dequeueReusableCellWithIdentifier("buildingCell", forIndexPath: indexPath) as! BuildingTableViewCell
 
 		// Set model
-		tableViewCell.buildingModel = buildingModelArray[indexPath.row] as! BuildingModel
+		tableViewCell.buildingModel = self.buildingModelArray[indexPath.row]
 		return tableViewCell
 	}
 
@@ -95,5 +140,6 @@ class ViewController: UIViewController, SOAPEngineDelegate {
 
         return headerView
     }
+
 }