diff --git a/JustUsed.xcodeproj/project.pbxproj b/JustUsed.xcodeproj/project.pbxproj
index e8bd733..c77275c 100644
--- a/JustUsed.xcodeproj/project.pbxproj
+++ b/JustUsed.xcodeproj/project.pbxproj
@@ -13,7 +13,6 @@
 		A92411EF1C69FB3F00DD6449 /* CalendarEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = A92411EE1C69FB3F00DD6449 /* CalendarEvent.swift */; };
 		A92411F11C69FD8F00DD6449 /* Person.swift in Sources */ = {isa = PBXBuildFile; fileRef = A92411F01C69FD8F00DD6449 /* Person.swift */; };
 		A92411F31C69FDCB00DD6449 /* SwiftyJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = A92411F21C69FDCB00DD6449 /* SwiftyJSON.swift */; };
-		A92574551BCF8F98004866B4 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = A92574541BCF8F98004866B4 /* Utils.swift */; };
 		A92574591BCF8FF9004866B4 /* XCGLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = A92574581BCF8FF9004866B4 /* XCGLogger.swift */; };
 		A925745B1BCF901D004866B4 /* JustUsedConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = A925745A1BCF901D004866B4 /* JustUsedConstants.swift */; };
 		A92574621BCF906A004866B4 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A925745D1BCF906A004866B4 /* AppDelegate.swift */; };
@@ -31,6 +30,12 @@
 		A9438DDC1B7A3F0400F1A54B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9438DDA1B7A3F0400F1A54B /* Main.storyboard */; };
 		A9438DE81B7A3F0400F1A54B /* JustUsedTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9438DE71B7A3F0400F1A54B /* JustUsedTests.swift */; };
 		A9647CDB1C03853D00485837 /* ChromeHistoryFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9647CDA1C03853D00485837 /* ChromeHistoryFetcher.swift */; };
+		A9BD83B81C6B505C00D62A61 /* PDFDocument+getText.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9BD83B71C6B505C00D62A61 /* PDFDocument+getText.swift */; };
+		A9BD83BA1C6B508600D62A61 /* NSURL+getMime.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9BD83B91C6B508600D62A61 /* NSURL+getMime.swift */; };
+		A9BD83BC1C6B50BA00D62A61 /* NSDate+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9BD83BB1C6B50BA00D62A61 /* NSDate+Extensions.swift */; };
+		A9BD83BE1C6B50F900D62A61 /* String+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9BD83BD1C6B50F900D62A61 /* String+Extensions.swift */; };
+		A9BD83C01C6B512600D62A61 /* CLGeoCoder+getDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9BD83BF1C6B512600D62A61 /* CLGeoCoder+getDescription.swift */; };
+		A9BD83C21C6B516100D62A61 /* EKCalendar+getCompositeName.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9BD83C11C6B516100D62A61 /* EKCalendar+getCompositeName.swift */; };
 		A9D4A2D51B7B9B3400EC1D68 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A9D4A2D41B7B9B3400EC1D68 /* libsqlite3.dylib */; };
 		A9D894201BD00EED00314475 /* Alamofire.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A9F5077D1BC7B8DE00275C6C /* Alamofire.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		A9F3807B1C199E38009251AB /* GenericBrowserHistory.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9F3807A1C199E38009251AB /* GenericBrowserHistory.swift */; };
@@ -131,7 +136,6 @@
 		A92411EE1C69FB3F00DD6449 /* CalendarEvent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CalendarEvent.swift; sourceTree = "<group>"; };
 		A92411F01C69FD8F00DD6449 /* Person.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Person.swift; sourceTree = "<group>"; };
 		A92411F21C69FDCB00DD6449 /* SwiftyJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftyJSON.swift; sourceTree = "<group>"; };
-		A92574541BCF8F98004866B4 /* Utils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
 		A92574581BCF8FF9004866B4 /* XCGLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCGLogger.swift; sourceTree = "<group>"; };
 		A925745A1BCF901D004866B4 /* JustUsedConstants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JustUsedConstants.swift; sourceTree = "<group>"; };
 		A925745C1BCF9047004866B4 /* JustUsed-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "JustUsed-Bridging-Header.h"; sourceTree = "<group>"; };
@@ -160,6 +164,12 @@
 		A9438DE61B7A3F0400F1A54B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A9438DE71B7A3F0400F1A54B /* JustUsedTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JustUsedTests.swift; sourceTree = "<group>"; };
 		A9647CDA1C03853D00485837 /* ChromeHistoryFetcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChromeHistoryFetcher.swift; sourceTree = "<group>"; };
+		A9BD83B71C6B505C00D62A61 /* PDFDocument+getText.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "PDFDocument+getText.swift"; sourceTree = "<group>"; };
+		A9BD83B91C6B508600D62A61 /* NSURL+getMime.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSURL+getMime.swift"; sourceTree = "<group>"; };
+		A9BD83BB1C6B50BA00D62A61 /* NSDate+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSDate+Extensions.swift"; sourceTree = "<group>"; };
+		A9BD83BD1C6B50F900D62A61 /* String+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Extensions.swift"; sourceTree = "<group>"; };
+		A9BD83BF1C6B512600D62A61 /* CLGeoCoder+getDescription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CLGeoCoder+getDescription.swift"; sourceTree = "<group>"; };
+		A9BD83C11C6B516100D62A61 /* EKCalendar+getCompositeName.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "EKCalendar+getCompositeName.swift"; sourceTree = "<group>"; };
 		A9D4A2D41B7B9B3400EC1D68 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
 		A9F3807A1C199E38009251AB /* GenericBrowserHistory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GenericBrowserHistory.swift; sourceTree = "<group>"; };
 		A9F507721BC7B8DE00275C6C /* Alamofire.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Alamofire.xcodeproj; path = Alamofire/Alamofire.xcodeproj; sourceTree = "<group>"; };
@@ -227,7 +237,6 @@
 			isa = PBXGroup;
 			children = (
 				A925745C1BCF9047004866B4 /* JustUsed-Bridging-Header.h */,
-				A92574541BCF8F98004866B4 /* Utils.swift */,
 				A925745A1BCF901D004866B4 /* JustUsedConstants.swift */,
 			);
 			name = Utils;
@@ -274,6 +283,7 @@
 		A9438DD11B7A3F0400F1A54B /* JustUsed */ = {
 			isa = PBXGroup;
 			children = (
+				A9BD83B01C6B500000D62A61 /* Extensions */,
 				A92574531BCF8F69004866B4 /* Utils */,
 				A92574521BCF8EC3004866B4 /* Libraries */,
 				A925744C1BCF8EAA004866B4 /* Model */,
@@ -310,6 +320,19 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		A9BD83B01C6B500000D62A61 /* Extensions */ = {
+			isa = PBXGroup;
+			children = (
+				A9BD83B71C6B505C00D62A61 /* PDFDocument+getText.swift */,
+				A9BD83B91C6B508600D62A61 /* NSURL+getMime.swift */,
+				A9BD83BB1C6B50BA00D62A61 /* NSDate+Extensions.swift */,
+				A9BD83BD1C6B50F900D62A61 /* String+Extensions.swift */,
+				A9BD83BF1C6B512600D62A61 /* CLGeoCoder+getDescription.swift */,
+				A9BD83C11C6B516100D62A61 /* EKCalendar+getCompositeName.swift */,
+			);
+			path = Extensions;
+			sourceTree = "<group>";
+		};
 		A9F5076C1BC7B6F000275C6C /* DiMe Data */ = {
 			isa = PBXGroup;
 			children = (
@@ -514,9 +537,11 @@
 			buildActionMask = 2147483647;
 			files = (
 				A92574621BCF906A004866B4 /* AppDelegate.swift in Sources */,
+				A9BD83BE1C6B50F900D62A61 /* String+Extensions.swift in Sources */,
 				A92574631BCF906A004866B4 /* AppSingleton.swift in Sources */,
 				A9F507921BC7BF5900275C6C /* DocumentInformationElement.swift in Sources */,
 				A92411F31C69FDCB00DD6449 /* SwiftyJSON.swift in Sources */,
+				A9BD83BC1C6B50BA00D62A61 /* NSDate+Extensions.swift in Sources */,
 				A92574761BCF9190004866B4 /* FMDatabaseAdditions.m in Sources */,
 				A9F507881BC7BA4B00275C6C /* DiMePreferencesViewController.swift in Sources */,
 				A9F507901BC7BF5900275C6C /* DesktopEvent.swift in Sources */,
@@ -532,12 +557,15 @@
 				A92574591BCF8FF9004866B4 /* XCGLogger.swift in Sources */,
 				A91406731C036D5500C3C2E0 /* FirefoxHistoryFetcher.swift in Sources */,
 				A92574641BCF906A004866B4 /* LocationSingleton.swift in Sources */,
+				A9BD83BA1C6B508600D62A61 /* NSURL+getMime.swift in Sources */,
 				A9F782071BCFCCE900516E55 /* Location.swift in Sources */,
 				A9F507931BC7BF5900275C6C /* Event.swift in Sources */,
+				A9BD83C01C6B512600D62A61 /* CLGeoCoder+getDescription.swift in Sources */,
 				A92574791BCF9190004866B4 /* FMResultSet.m in Sources */,
 				A92574771BCF9190004866B4 /* FMDatabasePool.m in Sources */,
-				A92574551BCF8F98004866B4 /* Utils.swift in Sources */,
+				A9BD83B81C6B505C00D62A61 /* PDFDocument+getText.swift in Sources */,
 				A92C0AD31BE40EF000F93915 /* RecentDocumentsTracker.swift in Sources */,
+				A9BD83C21C6B516100D62A61 /* EKCalendar+getCompositeName.swift in Sources */,
 				A9F507911BC7BF5900275C6C /* DiMeData.swift in Sources */,
 				A925745B1BCF901D004866B4 /* JustUsedConstants.swift in Sources */,
 				A9647CDB1C03853D00485837 /* ChromeHistoryFetcher.swift in Sources */,
@@ -674,7 +702,7 @@
 				INFOPLIST_FILE = JustUsed/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_BUNDLE_IDENTIFIER = fi.hiit.JustUsed;
+				PRODUCT_BUNDLE_IDENTIFIER = fi.aalto.org.JustUsed;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "JustUsed/Utils/JustUsed-Bridging-Header.h";
@@ -692,7 +720,7 @@
 				INFOPLIST_FILE = JustUsed/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_BUNDLE_IDENTIFIER = fi.hiit.JustUsed;
+				PRODUCT_BUNDLE_IDENTIFIER = fi.aalto.org.JustUsed;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "JustUsed/Utils/JustUsed-Bridging-Header.h";
diff --git a/JustUsed/Base.lproj/Main.storyboard b/JustUsed/Base.lproj/Main.storyboard
index c2ea5a2..d245ab4 100644
--- a/JustUsed/Base.lproj/Main.storyboard
+++ b/JustUsed/Base.lproj/Main.storyboard
@@ -759,7 +759,7 @@
                                 <constraints>
                                     <constraint firstAttribute="width" constant="477" id="9XZ-K4-zob"/>
                                 </constraints>
-                                <scroller key="horizontalScroller" verticalHuggingPriority="750" doubleValue="0.00089126559714795004" horizontal="YES" id="w6A-F4-dVc">
+                                <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="w6A-F4-dVc">
                                     <rect key="frame" x="1" y="323" width="475" height="16"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
@@ -1135,7 +1135,7 @@
                                         <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="muE-TE-h1g">
                                             <rect key="frame" x="146" y="10" width="278" height="135"/>
                                             <clipView key="contentView" id="hua-x6-cD7">
-                                                <rect key="frame" x="1" y="23" width="276" height="111"/>
+                                                <rect key="frame" x="1" y="0.0" width="276" height="134"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" headerView="5Cy-x5-Ex6" id="bLV-eX-WdG">
@@ -1157,7 +1157,7 @@
                                                                 </buttonCell>
                                                                 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                             </tableColumn>
-                                                            <tableColumn identifier="calExclTableName" width="204" minWidth="40" maxWidth="1000" id="FSd-ek-T3g">
+                                                            <tableColumn identifier="calExclTableName" editable="NO" width="204" minWidth="40" maxWidth="1000" id="FSd-ek-T3g">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Calendar name">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -1177,13 +1177,12 @@
                                             </clipView>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="135" id="8gT-q8-lnO"/>
-                                                <constraint firstAttribute="width" constant="278" id="wJu-ZY-z2z"/>
                                             </constraints>
                                             <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="iEQ-wV-jPw">
                                                 <rect key="frame" x="1" y="118" width="276" height="16"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                             </scroller>
-                                            <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="MX6-gA-1le">
+                                            <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="MX6-gA-1le">
                                                 <rect key="frame" x="261" y="23" width="16" height="0.0"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                             </scroller>
@@ -1201,14 +1200,32 @@
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
+                                            <connections>
+                                                <action selector="calendarDataMine:" target="g6d-pz-jYa" id="Zvt-9a-0mp"/>
+                                            </connections>
                                         </button>
+                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZF8-1g-OYZ">
+                                            <rect key="frame" x="18" y="37" width="122" height="81"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="81" id="UYD-bD-00f"/>
+                                                <constraint firstAttribute="width" constant="118" id="awh-oU-S9g"/>
+                                            </constraints>
+                                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Selected calendars will not be used neither in background nor data mine" id="nsy-W0-8EI">
+                                                <font key="font" metaFont="smallSystem"/>
+                                                <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
                                     </subviews>
                                     <constraints>
                                         <constraint firstItem="bLV-eX-WdG" firstAttribute="leading" secondItem="L6W-mq-zUe" secondAttribute="trailing" constant="9" id="EjU-68-UX3"/>
+                                        <constraint firstItem="ZF8-1g-OYZ" firstAttribute="centerX" secondItem="hbc-Bu-PjL" secondAttribute="centerX" id="JqE-4e-9yt"/>
                                         <constraint firstItem="hbc-Bu-PjL" firstAttribute="top" secondItem="muE-TE-h1g" secondAttribute="top" id="KUp-m7-2Vo"/>
                                         <constraint firstItem="hbc-Bu-PjL" firstAttribute="top" secondItem="DZ0-WD-80y" secondAttribute="top" constant="8" id="Nl9-oR-D22"/>
                                         <constraint firstItem="muE-TE-h1g" firstAttribute="leading" secondItem="hbc-Bu-PjL" secondAttribute="trailing" constant="8" id="TPx-3c-IQB"/>
+                                        <constraint firstItem="hbc-Bu-PjL" firstAttribute="leading" secondItem="DZ0-WD-80y" secondAttribute="leading" constant="20" id="boB-ox-bgb"/>
                                         <constraint firstAttribute="trailing" secondItem="muE-TE-h1g" secondAttribute="trailing" constant="20" id="ft1-LP-AX4"/>
+                                        <constraint firstItem="ZF8-1g-OYZ" firstAttribute="centerY" secondItem="muE-TE-h1g" secondAttribute="centerY" id="lNf-TE-qJu"/>
                                         <constraint firstItem="muE-TE-h1g" firstAttribute="top" secondItem="DZ0-WD-80y" secondAttribute="top" constant="8" id="rsm-bV-Hhh"/>
                                         <constraint firstAttribute="bottom" secondItem="L6W-mq-zUe" secondAttribute="bottom" constant="10" id="txX-1h-d1V"/>
                                     </constraints>
@@ -1439,6 +1456,7 @@
                             <constraint firstAttribute="trailing" secondItem="icH-Jz-0QZ" secondAttribute="trailing" constant="20" id="uj8-Xc-tcw"/>
                             <constraint firstItem="icH-Jz-0QZ" firstAttribute="top" secondItem="PRl-yO-RbZ" secondAttribute="top" constant="20" id="yF2-zA-Gbc"/>
                             <constraint firstItem="JI2-4r-x6L" firstAttribute="top" secondItem="KpP-w5-qmb" secondAttribute="bottom" constant="27" id="yUf-Dm-TjD"/>
+                            <constraint firstAttribute="trailing" secondItem="ihZ-QQ-J41" secondAttribute="trailing" constant="20" id="zFV-yz-7fq"/>
                         </constraints>
                     </view>
                     <connections>
diff --git a/JustUsed/DiMe Data/CalendarEvent.swift b/JustUsed/DiMe Data/CalendarEvent.swift
index 9d88e12..c474d14 100644
--- a/JustUsed/DiMe Data/CalendarEvent.swift	
+++ b/JustUsed/DiMe Data/CalendarEvent.swift	
@@ -59,7 +59,7 @@ class CalendarEvent: Event {
         
         self.id = event.eventIdentifier
         self.name = event.title
-        self.calendar = event.calendar.title
+        self.calendar = event.calendar.compositeName
         self.notes = event.notes
         if #available(OSX 10.11, *) {
             if let structLoc = event.structuredLocation, clloc = structLoc.geoLocation {
diff --git a/JustUsed/DiMe Data/HistoryManager.swift b/JustUsed/DiMe Data/HistoryManager.swift
index fd5783f..0038810 100644
--- a/JustUsed/DiMe Data/HistoryManager.swift	
+++ b/JustUsed/DiMe Data/HistoryManager.swift	
@@ -148,6 +148,12 @@ class HistoryManager: NSObject {
                         if jres["error"] != nil {
                             AppSingleton.log.error("DiMe reported error:\n\(jres["error"].stringValue)")
                         } else {
+                            // TODO: remove this debugging check
+                            let dimeResp = JSON(response.result.value!)
+                            let duration = dimeResp["duration"].doubleValue
+                            if duration == 0 {
+                                AppSingleton.log.debug("Event has 0 returned duration:\n\(dimeResp)")
+                            }
                             success()
                         }
                     }
diff --git a/JustUsed/Extensions/CLGeoCoder+getDescription.swift b/JustUsed/Extensions/CLGeoCoder+getDescription.swift
new file mode 100644
index 0000000..f5cf9e8
--- /dev/null
+++ b/JustUsed/Extensions/CLGeoCoder+getDescription.swift
@@ -0,0 +1,62 @@
+// Copyright (c) 2015 Aalto University
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE./
+
+import Foundation
+import CoreLocation
+
+extension CLGeocoder {
+    
+    /// Asynchronously creates a Location object by using a CLLocation and
+    /// reversing its location. Calls the given block with a Location that includes description.
+    func getDescription(fromLoc inLoc: CLLocation, block: (describedLocation: Location) -> Void) {
+        self.reverseGeocodeLocation(inLoc) {
+            placemarkA, error in
+            
+            var outLoc = Location(fromCLLocation: inLoc)
+            if let error = error {
+                outLoc.descriptionLine = "** Error reversing: \(error.description)"
+            } else {
+                let placemark = placemarkA![0]
+                var builtString = ""
+                if let country = placemark.country {
+                    builtString += "Country: \(country)"
+                }
+                if let locality = placemark.locality {
+                    builtString += ", Locality: \(locality)"
+                }
+                if let subLoc = placemark.subLocality {
+                    builtString += ", Neighborhood: \(subLoc)"
+                }
+                if let street = placemark.thoroughfare {
+                    builtString += ", Street: \(street)"
+                }
+                
+                outLoc.descriptionLine = builtString
+            }
+            
+            block(describedLocation: outLoc)
+            
+        }
+    }
+    
+}
\ No newline at end of file
diff --git a/JustUsed/Extensions/EKCalendar+getCompositeName.swift b/JustUsed/Extensions/EKCalendar+getCompositeName.swift
new file mode 100644
index 0000000..044abf5
--- /dev/null
+++ b/JustUsed/Extensions/EKCalendar+getCompositeName.swift
@@ -0,0 +1,36 @@
+//
+// Copyright (c) 2015 Aalto University
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+import Foundation
+import EventKit
+
+extension EKCalendar {
+    
+    /// Returns the composite name for the calendar.
+    /// Composite name is defined as account.title, e.g. "iCloud.work"
+    public var compositeName: String { get {
+        return self.source.title + "." + self.title
+        } }
+    
+}
\ No newline at end of file
diff --git a/JustUsed/Extensions/NSDate+Extensions.swift b/JustUsed/Extensions/NSDate+Extensions.swift
new file mode 100644
index 0000000..2e92614
--- /dev/null
+++ b/JustUsed/Extensions/NSDate+Extensions.swift
@@ -0,0 +1,75 @@
+//
+// Copyright (c) 2015 Aalto University
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+extension NSDate {
+    
+    /// Number of ms since 1/1/1970.
+    var unixTime_ms: Int { get {
+        return Int(round(self.timeIntervalSince1970 * 1000))
+        }
+    }
+    
+    /// Creates a date from a unix time in microsec
+    convenience init(fromUnixTime_μs μs: Int) {
+        self.init(timeIntervalSince1970: Double(μs) / 1000000)
+    }
+    
+    /// Number of microsec since 1/1/1970.
+    var unixTime_μs: Int { get {
+        return Int(round(self.timeIntervalSince1970 * 1000000))
+        }
+    }
+    
+    /// Creates a date from a ldap timestamp.
+    convenience init(fromLdapTime lt: Int) {
+        let unixtime_s = Double(lt)/1000000-11644473600
+        self.init(timeIntervalSince1970: unixtime_s)
+    }
+    
+    /// Returns the corresponding date as a LDAP timestamp.
+    var ldapTime: Int { get {
+        return Int(round(1000000 * (11644473600 + self.timeIntervalSince1970)))
+        }
+    }
+    
+    /// Returns the current time in a short format, e.g. 16:30.45
+    /// Use this to pass dates to DiMe
+    static func shortTime() -> String {
+        let currentDate = NSDate()
+        let dsf = NSDateFormatter()
+        dsf.dateFormat = "HH:mm.ss"
+        return dsf.stringFromDate(currentDate)
+    }
+    
+    /// Returns an NSDate that representing this date plus the given offset.
+    /// e.g. NSDate().yearOffset(2) represents two years from now.
+    func yearOffset(year: Int) -> NSDate {
+        let calendar = NSCalendar(identifier: NSCalendarIdentifierGregorian)!
+        let addComponents = NSDateComponents()
+        addComponents.year = year
+        return calendar.dateByAddingComponents(addComponents, toDate: self, options: .MatchStrictly)!
+    }
+    
+}
+
diff --git a/JustUsed/Extensions/NSURL+getMime.swift b/JustUsed/Extensions/NSURL+getMime.swift
new file mode 100644
index 0000000..1e19aa7
--- /dev/null
+++ b/JustUsed/Extensions/NSURL+getMime.swift
@@ -0,0 +1,52 @@
+//
+// Copyright (c) 2015 Aalto University
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+import Foundation
+
+extension NSURL {
+    
+    /// Get mime type
+    func getMime() -> String? {
+        var mime: String?
+        let UTI = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, self.pathExtension!, nil)
+        let MIMEType = UTTypeCopyPreferredTagWithClass(UTI!.takeRetainedValue(), kUTTagClassMIMEType)
+        var isDir = ObjCBool(false)
+        if let mimet = MIMEType {
+            mime = mimet.takeRetainedValue() as String
+        } else if NSFileManager.defaultManager().fileExistsAtPath(self.path!, isDirectory: &isDir) {
+            if isDir {
+                mime = "application/x-directory"
+            } else {
+                // if the file exists but it's not a directory and has no known mime type
+                var foundEncoding: UInt = 0
+                if let _ = try? NSString(contentsOfURL: self, usedEncoding: &foundEncoding) {
+                    mime = "text/plain"
+                } else {
+                    mime = "application/octet-stream"
+                }
+            }
+        }
+        return mime
+    }
+}
\ No newline at end of file
diff --git a/JustUsed/Extensions/PDFDocument+getText.swift b/JustUsed/Extensions/PDFDocument+getText.swift
new file mode 100644
index 0000000..15badf5
--- /dev/null
+++ b/JustUsed/Extensions/PDFDocument+getText.swift
@@ -0,0 +1,45 @@
+//
+// Copyright (c) 2015 Aalto University
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+import Foundation
+import Quartz
+
+extension PDFDocument {
+    
+    /// Returns a trimmed plain text of the data contained in the document, nil not preset
+    func getText() -> String? {
+        
+        var trimmedText = string()
+        trimmedText = trimmedText.stringByReplacingOccurrencesOfString("\u{fffc}", withString: "")
+        trimmedText = trimmedText.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceCharacterSet()) // get trimmed version of all text
+        trimmedText = trimmedText.stringByTrimmingCharactersInSet(NSCharacterSet.newlineCharacterSet()) // trim newlines
+        trimmedText = trimmedText.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceCharacterSet()) // trim again
+        if trimmedText.characters.count > 5 {  // we assume the document does contain useful text if there are more than 5 characters remaining
+            return trimmedText
+        } else {
+            return nil
+        }
+    }
+    
+}
diff --git a/JustUsed/Extensions/String+Extensions.swift b/JustUsed/Extensions/String+Extensions.swift
new file mode 100644
index 0000000..ee7f874
--- /dev/null
+++ b/JustUsed/Extensions/String+Extensions.swift
@@ -0,0 +1,85 @@
+//
+// Copyright (c) 2015 Aalto University
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+import Foundation
+
+extension String {
+    
+    /// Returns SHA1 digest for this string
+    func sha1() -> String {
+        let data = self.dataUsingEncoding(NSUTF8StringEncoding)!
+        var digest = [UInt8](count:Int(CC_SHA1_DIGEST_LENGTH), repeatedValue: 0)
+        CC_SHA1(data.bytes, CC_LONG(data.length), &digest)
+        let hexBytes = digest.map { String(format: "%02hhx", $0) }
+        return hexBytes.joinWithSeparator("")
+    }
+    
+    /// Trims whitespace and newlines using foundation
+    func trimmed() -> String {
+        let nss: NSString = self
+        return nss.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet())
+    }
+    
+    /// Checks if this string contains the given character
+    func containsChar(theChar: Character) -> Bool {
+        for c in self.characters {
+            if c == theChar {
+                return true
+            }
+        }
+        return false
+    }
+    
+    /// Splits the string, trimming whitespaces, between the given characters (note: slow for very long strings)
+    func split(theChar: Character) -> [String]? {
+        var outVal = [String]()
+        var remainingString = self
+        while remainingString.containsChar(theChar) {
+            var outString = ""
+            var nextChar = remainingString.removeAtIndex(remainingString.startIndex)
+            while nextChar != theChar {
+                outString.append(nextChar)
+                nextChar = remainingString.removeAtIndex(remainingString.startIndex)
+            }
+            if !outString.trimmed().isEmpty {
+                outVal.append(outString.trimmed())
+            }
+        }
+        if !remainingString.trimmed().isEmpty {
+            outVal.append(remainingString.trimmed())
+        }
+        if outVal.count > 0 {
+            return outVal
+        } else {
+            return nil
+        }
+    }
+    
+    /// Skips the first x characters
+    func skipPrefix(nOfChars: Int) -> String {
+        return self.substringFromIndex(self.startIndex.advancedBy(nOfChars))
+    }
+    
+}
+
diff --git a/JustUsed/Info.plist b/JustUsed/Info.plist
index 50085bc..4162542 100644
--- a/JustUsed/Info.plist
+++ b/JustUsed/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.3</string>
+	<string>1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/JustUsed/Model/AppDelegate.swift b/JustUsed/Model/AppDelegate.swift
index 52f7adf..538fcda 100644
--- a/JustUsed/Model/AppDelegate.swift
+++ b/JustUsed/Model/AppDelegate.swift
@@ -60,6 +60,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         defaultPrefs[JustUsedConstants.prefDiMeServerUserName] = "Test1"
         defaultPrefs[JustUsedConstants.prefDiMeServerPassword] = "123456"
         let defaultExcludeDomains = ["localhost", "talkgadget.google.com"]
+        let defaultExcludeCalendars: [String] = []
+        defaultPrefs[JustUsedConstants.prefExcludeCalendars] = defaultExcludeCalendars
         defaultPrefs[JustUsedConstants.prefExcludeDomains] = defaultExcludeDomains
         defaultPrefs[JustUsedConstants.prefSendPlainTexts] = 1
         defaultPrefs[JustUsedConstants.prefSendSafariHistory] = 0
diff --git a/JustUsed/Model/CalendarTracker.swift b/JustUsed/Model/CalendarTracker.swift
index cb89784..4ae4480 100644
--- a/JustUsed/Model/CalendarTracker.swift
+++ b/JustUsed/Model/CalendarTracker.swift
@@ -37,32 +37,29 @@ protocol CalendarHistoryDelegate: class {
     func sendCalendarEvent(newEvent: CalendarEvent, successBlock: Void -> Void)
 }
 
-/// Calendar manager monitors the calendar and sends events found within kBackLook seconds to DiMe.
-/// It checks every kInterval, or every time the calendar is updated.
+/// Tracks calendars event this way: it checks for events that are stored in the calendar
+/// ±24 hours from now. Sends all of them, if not in the calendar exclusion list, to dime, updating
+/// old events. Repeats this procedure every hour, or every time the calendar is modified externally.
+/// Also does a check 90 seconds from initialisation.
 public class CalendarTracker {
     
     /// How often we look for events
-    public static let kInterval: NSTimeInterval = 9 * 60  // min * 60 sec
-    
-    /// How often we look for events already stored in dime (current implementation does not overwrite events which are already present)
-    public static let kDiMeFetchInterval: NSTimeInterval = CalendarTracker.kInterval / 2
+    public static let kInterval: NSTimeInterval = 60 * 60  // one hour
     
     /// When looking for events in the past, cover this time interval
-    public static let kBackLook: NSTimeInterval = CalendarTracker.kBackLook * 2
+    public static let kLookBack: NSTimeInterval = 24 * 60 * 60  // 24 hours back
+    
+    /// When looking for events in the future, cover this time interval
+    public static let kLookAhead: NSTimeInterval = 24 * 60 * 60  // 24 hours ahead
     
     private let store = EKEventStore()
     
     /// If the user granted access to the calendar, this becomes true
     private(set) var hasAccess: Bool = false
     
-    /// All events currently in dime
-    private var dimeEvents = [CalendarEvent]()
-    
     /// Where are new events fetched from or sent
     var calendarDelegate: CalendarHistoryDelegate
     
-    static var sharedInstance: CalendarTracker?
-    
     /// Creates a new calendar tracker, which uses the given object to fetch / update
     /// calendar events.
     init(calendarDelegate: CalendarHistoryDelegate) {
@@ -73,34 +70,32 @@ public class CalendarTracker {
                 self.hasAccess = true
                 
                 // check calendar when an event is modified
-                NSNotificationCenter.defaultCenter().addObserver(self, selector: "getCurrentEvents:", name: EKEventStoreChangedNotification, object: self.store)
+                NSNotificationCenter.defaultCenter().addObserver(self, selector: "submitCurrentEvents:", name: EKEventStoreChangedNotification, object: self.store)
                 // check calendar regularly
-                NSTimer.scheduledTimerWithTimeInterval(CalendarTracker.kInterval, target: self, selector: "getCurrentEvents:", userInfo: nil, repeats: true)
-                // repeatedly fetch all events from dime to avoid sending too many
-                NSTimer.scheduledTimerWithTimeInterval(CalendarTracker.kDiMeFetchInterval, target: self, selector: "getDiMeEvents:", userInfo: nil, repeats: true)
-                // fetch the current events in 5 seconds, to allow dime to come online
+                NSTimer.scheduledTimerWithTimeInterval(CalendarTracker.kInterval, target: self, selector: "submitCurrentEvents:", userInfo: nil, repeats: true)
+                // fetch the current events in 90 seconds, to allow dime to come online and the user to set preferences
                 let callTime = dispatch_time(DISPATCH_TIME_NOW,
-                                     Int64(5 * Double(NSEC_PER_SEC)))
+                                     Int64(90 * Double(NSEC_PER_SEC)))
                 dispatch_after(callTime, dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0)) {
-                    self.getCurrentEvents(nil)
+                    self.submitCurrentEvents(nil)
                 }
             }
             if let err = error {
                 AppSingleton.log.error("Error while asking permission to access calendars:\n\(err)")
             }
         }
-        CalendarTracker.sharedInstance = self
     }
     
-    // MARK: - Accessors
+    // MARK: - External functions
     
     /// Returns an array containing all calendars residing on the user's device.
     /// Nil if we don't have permission to access them.
+    /// Calendar names are in the format account.title (e.g. iCloud.work)
     func calendarNames() -> [String]? {
         if hasAccess {
             var retVal = [String]()
             for cal in store.calendarsForEntityType(.Event) {
-                retVal.append(cal.title)
+                retVal.append("\(cal.source.title).\(cal.title)")
             }
             return retVal
         } else {
@@ -108,33 +103,95 @@ public class CalendarTracker {
         }
     }
     
-    // MARK: - Private
+    /// Sets the exclude value for a given calendar. Returns an updated exclude list (only
+    /// (calendars which actually exist can be excluded). Updates NSUserDefaults.
+    func setExcludeValue(exclude exclude: Bool, calendar: String) -> [String] {
+        var currentExcludes = NSUserDefaults.standardUserDefaults().valueForKey(JustUsedConstants.prefExcludeCalendars) as! [String]
+        let _calendars = calendarNames()
+        guard let calendars = _calendars else {
+            return []
+        }
+        
+        // Exclude / include only if not duplicate
+        if exclude {
+            if !currentExcludes.contains(calendar) {
+                currentExcludes.append(calendar)
+            }
+        } else {
+            if currentExcludes.contains(calendar) {
+                let i = currentExcludes.indexOf(calendar)!
+                currentExcludes.removeAtIndex(i)
+            }
+        }
+        
+        // Create new list of things that actually exist and are excluded
+        var actualExcludes = [String]()
+        for excl in currentExcludes {
+            if calendars.contains(excl) && !actualExcludes.contains(excl) {
+                actualExcludes.append(excl)
+            }
+        }
+        
+        NSUserDefaults.standardUserDefaults().setValue(actualExcludes, forKey: JustUsedConstants.prefExcludeCalendars)
+        NSUserDefaults.standardUserDefaults().synchronize()
+        
+        return actualExcludes
+    }
+    
+    /// Returns a dictionary, one entry per calendar, where the value is whether the
+    /// calendar is excluded
+    /// Returns nil if there are no valid calendars
+    func getExcludeCalendars() -> [String: Bool]? {
+        let currentExcludes = NSUserDefaults.standardUserDefaults().valueForKey(JustUsedConstants.prefExcludeCalendars) as! [String]
+        let _calendars = calendarNames()
+        guard let calendars = _calendars else {
+            return nil
+        }
+        var retVal = [String: Bool]()
+        for cal in calendars {
+            retVal[cal] = currentExcludes.contains(cal)
+        }
+        
+        return retVal
+    }
     
-    /// Get events which just-passed. Current event is defined as the latest event that started from kBackLook seconds ago until now, in all calendars.
-    /// - parameter hitObject: Whatever is calling this (notification or timer)
-    @objc private func getCurrentEvents(hitObject: AnyObject?) {
-        let sinceTime: NSTimeInterval = CalendarTracker.kBackLook
+    /// Submits calendar events to dime.
+    /// - parameter dataMine: if true, looks for all possible events two years before and after now.
+    func submitEvents(dataMine dataMine: Bool = false) {
+        guard let excludeCalendars = getExcludeCalendars() else {
+            return
+        }
         
-        let allCalendars = store.calendarsForEntityType(.Event)
-        let predicate = store.predicateForEventsWithStartDate(NSDate().dateByAddingTimeInterval(-sinceTime), endDate: NSDate(), calendars: allCalendars)
+        let sinceDate: NSDate
+        let thenDate: NSDate
+        
+        if dataMine {
+            sinceDate = NSDate().yearOffset(-2)
+            thenDate = NSDate().yearOffset(2)
+        } else {
+            let sinceTime: NSTimeInterval = CalendarTracker.kLookBack
+            let thenTime: NSTimeInterval = CalendarTracker.kLookAhead
+            sinceDate = NSDate().dateByAddingTimeInterval(-sinceTime)
+            thenDate = NSDate().dateByAddingTimeInterval(+thenTime)
+        }
+        
+        var fetchCalendars = store.calendarsForEntityType(.Event)
+        fetchCalendars = fetchCalendars.filter({excludeCalendars[$0.compositeName] == false})
+        let predicate = store.predicateForEventsWithStartDate(sinceDate, endDate: thenDate, calendars: fetchCalendars)
         let allEvents = store.eventsMatchingPredicate(predicate)
         for event in allEvents {
             let calEvent = CalendarEvent(fromEKEvent: event)
-            if !dimeEvents.contains(calEvent) {
                 calendarDelegate.sendCalendarEvent(calEvent) {
-                    // if successful, this block is called. Add given event to list.
-                    self.dimeEvents.append(calEvent)
-                }
             }
         }
     }
     
-    /// Get events found in dime
-    @objc private func getDiMeEvents(timer: NSTimer?) {
-        calendarDelegate.fetchCalendarEvents() {
-            events in
-            self.dimeEvents = events
-        }
+    // MARK: - Timer / notification callbacks
+    
+    /// Submits events which just-passed. Current event is defined as the latest event that started from kLookBack until kLookAhead.
+    /// - parameter hitObject: Whatever is calling this (notification or timer)
+    @objc private func submitCurrentEvents(hitObject: AnyObject?) {
+        submitEvents()
     }
     
 }
\ No newline at end of file
diff --git a/JustUsed/UI/DiMePreferencesViewController.swift b/JustUsed/UI/DiMePreferencesViewController.swift
index e5bac6d..df7783c 100644
--- a/JustUsed/UI/DiMePreferencesViewController.swift
+++ b/JustUsed/UI/DiMePreferencesViewController.swift
@@ -85,18 +85,51 @@ class DiMePreferencesViewController: NSViewController {
             newDomainField.stringValue = ""
         }
     }
+    
+    @IBAction func calendarDataMine(sender: NSButton) {
+        let myAl = NSAlert()
+        myAl.messageText = "Attention: this will fetch ALL events, ± 2 years from now (unless they belong to an excluded calendar). Are you sure?"
+        myAl.addButtonWithTitle("Yes")
+        myAl.addButtonWithTitle("No")
+        myAl.beginSheetModalForWindow(self.view.window!) {
+            response in
+            
+            if response == NSAlertFirstButtonReturn {
+                dispatch_async(dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0)) {
+                    let appDel = NSApplication.sharedApplication().delegate! as! AppDelegate
+                    appDel.calendarTracker.submitEvents(dataMine: true)
+                }
+            }
+            
+        }
+    }
+    
 }
 
 class CalendarExcludeDelegate: NSObject, NSTableViewDataSource, NSTableViewDelegate {
+    let calendarTracker: CalendarTracker = {
+        let appDel = NSApplication.sharedApplication().delegate! as! AppDelegate
+        return appDel.calendarTracker
+    }()
+    
     @objc func numberOfRowsInTableView(tableView: NSTableView) -> Int {
-        return CalendarTracker.sharedInstance!.calendarNames()!.count
+        return calendarTracker.calendarNames()!.count
     }
     
     @objc func tableView(tableView: NSTableView, objectValueForTableColumn tableColumn: NSTableColumn?, row: Int) -> AnyObject? {
         if tableColumn!.identifier == "calExclTableCheck" {
-            return true
+            let cal = calendarTracker.calendarNames()![row]
+            return calendarTracker.getExcludeCalendars()![cal]
         } else {
-            return CalendarTracker.sharedInstance!.calendarNames()![row]
+            return calendarTracker.calendarNames()![row]
+        }
+    }
+    
+    @objc func tableView(tableView: NSTableView, setObjectValue object: AnyObject?, forTableColumn tableColumn: NSTableColumn?, row: Int) {
+        if tableColumn!.identifier == "calExclTableCheck" {
+            let exclude = object! as! Bool
+            calendarTracker.setExcludeValue(exclude: exclude, calendar: calendarTracker.calendarNames()![row])
+            tableView.reloadData()
         }
     }
 }
diff --git a/JustUsed/Utils/JustUsedConstants.swift b/JustUsed/Utils/JustUsedConstants.swift
index fa984b0..5c92dd6 100644
--- a/JustUsed/Utils/JustUsedConstants.swift
+++ b/JustUsed/Utils/JustUsedConstants.swift
@@ -61,6 +61,9 @@ class JustUsedConstants {
     /// Wheter we send Safari history events to DiMe
     static let prefSendSafariHistory = "dime.preferences.sendSafariHistory"
     
+    /// String list of calendars we want to exclude from monitoring
+    static let prefExcludeCalendars = "dime.preferences.excludeCalendars"
+    
     // MARK: - Notifications
     
     /// String notifying that something changed in the dime connection.
diff --git a/JustUsed/Utils/Utils.swift b/JustUsed/Utils/Utils.swift
deleted file mode 100644
index 57aafec..0000000
--- a/JustUsed/Utils/Utils.swift
+++ /dev/null
@@ -1,216 +0,0 @@
-//
-// Copyright (c) 2015 Aalto University
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-// Contains various functions and utilities not otherwise classified
-
-import Foundation
-import Cocoa
-import Quartz
-import CoreLocation
-
-// MARK: - Extensions to standard types
-
-extension PDFDocument {
-    
-    /// Returns a trimmed plain text of the data contained in the document, nil not preset
-    func getText() -> String? {
-        
-        var trimmedText = string()
-        trimmedText = trimmedText.stringByReplacingOccurrencesOfString("\u{fffc}", withString: "")
-        trimmedText = trimmedText.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceCharacterSet()) // get trimmed version of all text
-        trimmedText = trimmedText.stringByTrimmingCharactersInSet(NSCharacterSet.newlineCharacterSet()) // trim newlines
-        trimmedText = trimmedText.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceCharacterSet()) // trim again
-        if trimmedText.characters.count > 5 {  // we assume the document does contain useful text if there are more than 5 characters remaining
-            return trimmedText
-        } else {
-            return nil
-        }
-    }
-    
-}
-
-extension NSURL {
-    
-    /// Get mime type
-    func getMime() -> String? {
-        var mime: String?
-        let UTI = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, self.pathExtension!, nil)
-        let MIMEType = UTTypeCopyPreferredTagWithClass(UTI!.takeRetainedValue(), kUTTagClassMIMEType)
-        var isDir = ObjCBool(false)
-        if let mimet = MIMEType {
-            mime = mimet.takeRetainedValue() as String
-        } else if NSFileManager.defaultManager().fileExistsAtPath(self.path!, isDirectory: &isDir) {
-            if isDir {
-                mime = "application/x-directory"
-            } else {
-                // if the file exists but it's not a directory and has no known mime type
-                var foundEncoding: UInt = 0
-                if let _ = try? NSString(contentsOfURL: self, usedEncoding: &foundEncoding) {
-                    mime = "text/plain"
-                } else {
-                    mime = "application/octet-stream"
-                }
-            }
-        }
-        return mime
-    }
-}
-
-extension NSDate {
-    
-    /// Number of ms since 1/1/1970.
-    var unixTime_ms: Int { get {
-        return Int(round(self.timeIntervalSince1970 * 1000))
-        }
-    }
-    
-    /// Creates a date from a unix time in microsec
-    convenience init(fromUnixTime_μs μs: Int) {
-        self.init(timeIntervalSince1970: Double(μs) / 1000000)
-    }
-    
-    /// Number of microsec since 1/1/1970.
-    var unixTime_μs: Int { get {
-        return Int(round(self.timeIntervalSince1970 * 1000000))
-        }
-    }
-    
-    /// Creates a date from a ldap timestamp.
-    convenience init(fromLdapTime lt: Int) {
-        let unixtime_s = Double(lt)/1000000-11644473600
-        self.init(timeIntervalSince1970: unixtime_s)
-    }
-    
-    /// Returns the corresponding date as a LDAP timestamp.
-    var ldapTime: Int { get {
-        return Int(round(1000000 * (11644473600 + self.timeIntervalSince1970)))
-        }
-    }
-    
-    /// Returns the current time in a short format, e.g. 16:30.45
-    /// Use this to pass dates to DiMe
-    static func shortTime() -> String {
-        let currentDate = NSDate()
-        let dsf = NSDateFormatter()
-        dsf.dateFormat = "HH:mm.ss"
-        return dsf.stringFromDate(currentDate)
-    }
-
-}
-
-extension String {
-    
-    /// Returns SHA1 digest for this string
-    func sha1() -> String {
-        let data = self.dataUsingEncoding(NSUTF8StringEncoding)!
-        var digest = [UInt8](count:Int(CC_SHA1_DIGEST_LENGTH), repeatedValue: 0)
-        CC_SHA1(data.bytes, CC_LONG(data.length), &digest)
-        let hexBytes = digest.map { String(format: "%02hhx", $0) }
-        return hexBytes.joinWithSeparator("")
-    }
-    
-    /// Trims whitespace and newlines using foundation
-    func trimmed() -> String {
-        let nss: NSString = self
-        return nss.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet())
-    }
-    
-    /// Checks if this string contains the given character
-    func containsChar(theChar: Character) -> Bool {
-        for c in self.characters {
-            if c == theChar {
-                return true
-            }
-        }
-        return false
-    }
-    
-    /// Splits the string, trimming whitespaces, between the given characters (note: slow for very long strings)
-    func split(theChar: Character) -> [String]? {
-        var outVal = [String]()
-        var remainingString = self
-        while remainingString.containsChar(theChar) {
-            var outString = ""
-            var nextChar = remainingString.removeAtIndex(remainingString.startIndex)
-            while nextChar != theChar {
-                outString.append(nextChar)
-                nextChar = remainingString.removeAtIndex(remainingString.startIndex)
-            }
-            if !outString.trimmed().isEmpty {
-                outVal.append(outString.trimmed())
-            }
-        }
-        if !remainingString.trimmed().isEmpty {
-            outVal.append(remainingString.trimmed())
-        }
-        if outVal.count > 0 {
-            return outVal
-        } else {
-            return nil
-        }
-    }
-    
-    /// Skips the first x characters
-    func skipPrefix(nOfChars: Int) -> String {
-        return self.substringFromIndex(self.startIndex.advancedBy(nOfChars))
-    }
-    
-}
-
-extension CLGeocoder {
-    
-    /// Asynchronously creates a Location object by using a CLLocation and
-    /// reversing its location. Calls the given block with a Location that includes description.
-    func getDescription(fromLoc inLoc: CLLocation, block: (describedLocation: Location) -> Void) {
-        self.reverseGeocodeLocation(inLoc) {
-            placemarkA, error in
-            
-            var outLoc = Location(fromCLLocation: inLoc)
-            if let error = error {
-                outLoc.descriptionLine = "** Error reversing: \(error.description)"
-            } else {
-                let placemark = placemarkA![0]
-                var builtString = ""
-                if let country = placemark.country {
-                    builtString += "Country: \(country)"
-                }
-                if let locality = placemark.locality {
-                    builtString += ", Locality: \(locality)"
-                }
-                if let subLoc = placemark.subLocality {
-                    builtString += ", Neighborhood: \(subLoc)"
-                }
-                if let street = placemark.thoroughfare {
-                    builtString += ", Street: \(street)"
-                }
-                
-                outLoc.descriptionLine = builtString
-            }
-            
-            block(describedLocation: outLoc)
-            
-        }
-    }
-    
-}
\ No newline at end of file