diff --git a/.idea/modules/WabbaTrack.iml b/.idea/modules/WabbaTrack.iml
index 54a9028..2c64800 100644
--- a/.idea/modules/WabbaTrack.iml
+++ b/.idea/modules/WabbaTrack.iml
@@ -5,8 +5,8 @@
       <configuration version="2" platform="JVM 1.6" useProjectSettings="false">
         <compilerSettings />
         <compilerArguments>
-          <option name="destination" value="C:\Users\Edipo\Documents\IdeaProjects\WabbaTrack\build\kotlin-classes\main" />
-          <option name="classpath" value="C:\Users\Edipo\Documents\IdeaProjects\WabbaTrack\libs\jnativehook-2.1.0.jar;C:\Users\Edipo\Documents\IdeaProjects\WabbaTrack\libs\luciad-webp-0.6.0.jar;C:\Users\Edipo\Documents\IdeaProjects\WabbaTrack\libs\oshi-core-3.4.2.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.jetbrains.kotlin\kotlin-stdlib\1.1.2-2\2b22828f027e103dcd45f3aa240338bfdb53d16b\kotlin-stdlib-1.1.2-2.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.jetbrains.kotlinx\kotlinx-coroutines-core\0.14\7cf86d32f4c72a42d7d317c763c33b035f08bad7\kotlinx-coroutines-core-0.14.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.jetbrains.kotlinx\kotlinx-coroutines-javafx\0.14\44c45d7f493f7e093271ba70a8f361b175a76acb\kotlinx-coroutines-javafx-0.14.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\no.tornado\tornadofx\1.7.4\2e15ff8ab324588cd87a983c2e2d73d4c1e96d58\tornadofx-1.7.4.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\net.java.dev.jna\jna-platform\4.4.0\f396b0ceb7ababb8b4a5ea25e6742ced81e3d86f\jna-platform-4.4.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.scijava\native-lib-loader\2.1.3\fe9cab77d88001fb11b36c2b82bc10bb2a1f7cc7\native-lib-loader-2.1.3.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.github.tulskiy\jkeymaster\1.2\9f1e8c9341a8a0c51299b961c4f6c7661c822756\jkeymaster-1.2.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.threeten\threetenbp\1.3.3\3ea31c96676ff12ab56be0b1af6fff61d1a4f1f2\threetenbp-1.3.3.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.code.gson\gson\2.8.0\c4ba5371a29ac9b2ad6129b1d39ea38750043eff\gson-2.8.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.apis\google-api-services-oauth2\v2-rev125-1.22.0\986a039ff6cd86eb708680dc74abf36b1b2ba26b\google-api-services-oauth2-v2-rev125-1.22.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.oauth-client\google-oauth-client-jetty\1.22.0\b94c1e7d6c73cb1c15e2e5569cc6fda08cc80099\google-oauth-client-jetty-1.22.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.http-client\google-http-client-jackson2\1.22.0\cc014d64ae11117e159d334c99d9c246d9b36f44\google-http-client-jackson2-1.22.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.mixpanel\mixpanel-java\1.4.4\3ad7fcd915e70d41df5fcacdff457d1cc83036f5\mixpanel-java-1.4.4.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\commons-io\commons-io\2.4\b1b6ea3b7e4aa4f492509a4952029cd8e48019ad\commons-io-2.4.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.jsoup\jsoup\1.10.2\33ee82e324f4b1e40167f3dc5e01234a1c5cab61\jsoup-1.10.2.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.slf4j\slf4j-api\1.7.25\da76ca59f6a57ee3102f8f9bd9cee742973efa8a\slf4j-api-1.7.25.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.jetbrains\annotations\13.0\919f0dfe192fb4e063e7dacadee7f8bb9a2672a9\annotations-13.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.glassfish\javax.json\1.0.4\3178f73569fd7a1e5ffc464e680f7a8cc784b85a\javax.json-1.0.4.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.jetbrains.kotlin\kotlin-stdlib-jre8\1.1.2\cd6d8b7a32971564fab0846009593f3bfabdcac1\kotlin-stdlib-jre8-1.1.2.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.jetbrains.kotlin\kotlin-reflect\1.1.2\b8cc2f486359a56c0c1b1dd125141c19d8db1734\kotlin-reflect-1.1.2.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\net.java.dev.jna\jna\4.4.0\cb208278274bf12ebdb56c61bd7407e6f774d65a\jna-4.4.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.api-client\google-api-client\1.22.0\244350c0c845c583717ade13f5666a452fd0cfa\google-api-client-1.22.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.oauth-client\google-oauth-client-java6\1.22.0\6cbd19cd33d55bcaac2d842a57f5ade9260bed99\google-oauth-client-java6-1.22.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.mortbay.jetty\jetty\6.1.26\2f546e289fddd5b1fab1d4199fbb6e9ef43ee4b0\jetty-6.1.26.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.http-client\google-http-client\1.22.0\d441fc58329c4a4c067acec04ac361627f66ecc8\google-http-client-1.22.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.fasterxml.jackson.core\jackson-core\2.1.3\f6c3aed1cdfa21b5c1737c915186ea93a95a58bd\jackson-core-2.1.3.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.json\json\20090211\c183aa3a2a6250293808bba12262c8920ce5a51c\json-20090211.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.jetbrains.kotlin\kotlin-stdlib-jre7\1.1.2\8fe14858be2d85bb2c8ad1e060f6dafbd45f48f4\kotlin-stdlib-jre7-1.1.2.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.oauth-client\google-oauth-client\1.22.0\1d63f369ac78e4838a3197147012026e791008cb\google-oauth-client-1.22.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.guava\guava-jdk5\17.0\463f8378feba44df7ba7cd9272d01837dad62b36\guava-jdk5-17.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.mortbay.jetty\jetty-util\6.1.26\e5642fe0399814e1687d55a3862aa5a3417226a9\jetty-util-6.1.26.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.mortbay.jetty\servlet-api\2.5-20081211\22bff70037e1e6fa7e6413149489552ee2064702\servlet-api-2.5-20081211.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.code.findbugs\jsr305\1.3.9\40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf\jsr305-1.3.9.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.apache.httpcomponents\httpclient\4.0.1\1d7d28fa738bdbfe4fbd895d9486308999bdf440\httpclient-4.0.1.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.apache.httpcomponents\httpcore\4.0.1\e813b8722c387b22e1adccf7914729db09bcb4a9\httpcore-4.0.1.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\commons-logging\commons-logging\1.1.1\5043bfebc3db072ed80fbd362e7caf00e885d8ae\commons-logging-1.1.1.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\commons-codec\commons-codec\1.3\fd32786786e2adb664d5ecc965da47629dca14ba\commons-codec-1.3.jar" />
+          <option name="destination" value="C:\Users\Edipo\Documents\IdeaProjects\WabbaTrack\build\kotlin-classes\test" />
+          <option name="classpath" value="C:\Users\Edipo\Documents\IdeaProjects\WabbaTrack\build\classes\main;C:\Users\Edipo\Documents\IdeaProjects\WabbaTrack\build\resources\main;C:\Users\Edipo\Documents\IdeaProjects\WabbaTrack\libs\jnativehook-2.1.0.jar;C:\Users\Edipo\Documents\IdeaProjects\WabbaTrack\libs\luciad-webp-0.6.0.jar;C:\Users\Edipo\Documents\IdeaProjects\WabbaTrack\libs\oshi-core-3.4.2.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.jetbrains.kotlin\kotlin-stdlib\1.1.2-4\3f5f1498bdbb9611cb1413f794b3a3a5a6edef34\kotlin-stdlib-1.1.2-4.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.jetbrains.kotlinx\kotlinx-coroutines-core\0.14\7cf86d32f4c72a42d7d317c763c33b035f08bad7\kotlinx-coroutines-core-0.14.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.jetbrains.kotlinx\kotlinx-coroutines-javafx\0.14\44c45d7f493f7e093271ba70a8f361b175a76acb\kotlinx-coroutines-javafx-0.14.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\no.tornado\tornadofx\1.7.4\2e15ff8ab324588cd87a983c2e2d73d4c1e96d58\tornadofx-1.7.4.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\net.java.dev.jna\jna-platform\4.4.0\f396b0ceb7ababb8b4a5ea25e6742ced81e3d86f\jna-platform-4.4.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.scijava\native-lib-loader\2.1.3\fe9cab77d88001fb11b36c2b82bc10bb2a1f7cc7\native-lib-loader-2.1.3.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.github.tulskiy\jkeymaster\1.2\9f1e8c9341a8a0c51299b961c4f6c7661c822756\jkeymaster-1.2.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.threeten\threetenbp\1.3.3\3ea31c96676ff12ab56be0b1af6fff61d1a4f1f2\threetenbp-1.3.3.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.code.gson\gson\2.8.0\c4ba5371a29ac9b2ad6129b1d39ea38750043eff\gson-2.8.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.apis\google-api-services-oauth2\v2-rev125-1.22.0\986a039ff6cd86eb708680dc74abf36b1b2ba26b\google-api-services-oauth2-v2-rev125-1.22.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.oauth-client\google-oauth-client-jetty\1.22.0\b94c1e7d6c73cb1c15e2e5569cc6fda08cc80099\google-oauth-client-jetty-1.22.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.http-client\google-http-client-jackson2\1.22.0\cc014d64ae11117e159d334c99d9c246d9b36f44\google-http-client-jackson2-1.22.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.mixpanel\mixpanel-java\1.4.4\3ad7fcd915e70d41df5fcacdff457d1cc83036f5\mixpanel-java-1.4.4.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\commons-io\commons-io\2.4\b1b6ea3b7e4aa4f492509a4952029cd8e48019ad\commons-io-2.4.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.jsoup\jsoup\1.10.2\33ee82e324f4b1e40167f3dc5e01234a1c5cab61\jsoup-1.10.2.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.slf4j\slf4j-api\1.7.25\da76ca59f6a57ee3102f8f9bd9cee742973efa8a\slf4j-api-1.7.25.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\junit\junit\4.12\2973d150c0dc1fefe998f834810d68f278ea58ec\junit-4.12.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.truth\truth\0.32\e996fb4b41dad04365112786796c945f909cfdf7\truth-0.32.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.jetbrains\annotations\13.0\919f0dfe192fb4e063e7dacadee7f8bb9a2672a9\annotations-13.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.glassfish\javax.json\1.0.4\3178f73569fd7a1e5ffc464e680f7a8cc784b85a\javax.json-1.0.4.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.jetbrains.kotlin\kotlin-stdlib-jre8\1.1.2\cd6d8b7a32971564fab0846009593f3bfabdcac1\kotlin-stdlib-jre8-1.1.2.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.jetbrains.kotlin\kotlin-reflect\1.1.2\b8cc2f486359a56c0c1b1dd125141c19d8db1734\kotlin-reflect-1.1.2.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\net.java.dev.jna\jna\4.4.0\cb208278274bf12ebdb56c61bd7407e6f774d65a\jna-4.4.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.api-client\google-api-client\1.22.0\244350c0c845c583717ade13f5666a452fd0cfa\google-api-client-1.22.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.oauth-client\google-oauth-client-java6\1.22.0\6cbd19cd33d55bcaac2d842a57f5ade9260bed99\google-oauth-client-java6-1.22.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.mortbay.jetty\jetty\6.1.26\2f546e289fddd5b1fab1d4199fbb6e9ef43ee4b0\jetty-6.1.26.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.http-client\google-http-client\1.22.0\d441fc58329c4a4c067acec04ac361627f66ecc8\google-http-client-1.22.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.fasterxml.jackson.core\jackson-core\2.1.3\f6c3aed1cdfa21b5c1737c915186ea93a95a58bd\jackson-core-2.1.3.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.json\json\20090211\c183aa3a2a6250293808bba12262c8920ce5a51c\json-20090211.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.hamcrest\hamcrest-core\1.3\42a25dc3219429f0e5d060061f71acb49bf010a0\hamcrest-core-1.3.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.guava\guava\20.0\89507701249388e1ed5ddcf8c41f4ce1be7831ef\guava-20.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.errorprone\error_prone_annotations\2.0.12\8530d22d4ae8419e799d5a5234e0d2c0dcf15d4b\error_prone_annotations-2.0.12.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.jetbrains.kotlin\kotlin-stdlib-jre7\1.1.2\8fe14858be2d85bb2c8ad1e060f6dafbd45f48f4\kotlin-stdlib-jre7-1.1.2.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.oauth-client\google-oauth-client\1.22.0\1d63f369ac78e4838a3197147012026e791008cb\google-oauth-client-1.22.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.guava\guava-jdk5\17.0\463f8378feba44df7ba7cd9272d01837dad62b36\guava-jdk5-17.0.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.mortbay.jetty\jetty-util\6.1.26\e5642fe0399814e1687d55a3862aa5a3417226a9\jetty-util-6.1.26.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.mortbay.jetty\servlet-api\2.5-20081211\22bff70037e1e6fa7e6413149489552ee2064702\servlet-api-2.5-20081211.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\com.google.code.findbugs\jsr305\1.3.9\40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf\jsr305-1.3.9.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.apache.httpcomponents\httpclient\4.0.1\1d7d28fa738bdbfe4fbd895d9486308999bdf440\httpclient-4.0.1.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\org.apache.httpcomponents\httpcore\4.0.1\e813b8722c387b22e1adccf7914729db09bcb4a9\httpcore-4.0.1.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\commons-logging\commons-logging\1.1.1\5043bfebc3db072ed80fbd362e7caf00e885d8ae\commons-logging-1.1.1.jar;C:\Users\Edipo\.gradle\caches\modules-2\files-2.1\commons-codec\commons-codec\1.3\fd32786786e2adb664d5ecc965da47629dca14ba\commons-codec-1.3.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="WabbaTrack_main" />
@@ -42,16 +42,46 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core:0.14" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.truth:truth:0.32" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.2-2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.errorprone:error_prone_annotations:2.0.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:guava:20.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.2-4" level="project" />
+    <orderEntry type="library" name="Gradle: org.threeten:threetenbp:1.3.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jre7:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jre8:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: no.tornado:tornadofx:1.7.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-javafx:0.14" level="project" />
+    <orderEntry type="library" name="Gradle: net.java.dev.jna:jna-platform:4.4.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.scijava:native-lib-loader:2.1.3" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.tulskiy:jkeymaster:1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.apis:google-api-services-oauth2:v2-rev125-1.22.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.oauth-client:google-oauth-client-jetty:1.22.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.http-client:google-http-client-jackson2:1.22.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.mixpanel:mixpanel-java:1.4.4" level="project" />
+    <orderEntry type="library" name="Gradle: commons-io:commons-io:2.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.10.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.glassfish:javax.json:1.0.4" level="project" />
+    <orderEntry type="library" name="Gradle: net.java.dev.jna:jna:4.4.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.api-client:google-api-client:1.22.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.oauth-client:google-oauth-client-java6:1.22.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.mortbay.jetty:jetty:6.1.26" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.http-client:google-http-client:1.22.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.1.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.json:json:20090211" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.oauth-client:google-oauth-client:1.22.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.guava:guava-jdk5:17.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.mortbay.jetty:jetty-util:6.1.26" level="project" />
+    <orderEntry type="library" name="Gradle: org.mortbay.jetty:servlet-api:2.5-20081211" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.3" level="project" />
     <orderEntry type="module-library">
-      <library name="Gradle: oshi-core-3.4.2">
+      <library name="Gradle: jnativehook-2.1.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../libs/oshi-core-3.4.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../libs/jnativehook-2.1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -67,48 +97,18 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="Gradle: jnativehook-2.1.0">
+      <library name="Gradle: oshi-core-3.4.2">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../libs/jnativehook-2.1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../libs/oshi-core-3.4.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:1.3.9" level="project" />
-    <orderEntry type="library" name="Gradle: org.mortbay.jetty:servlet-api:2.5-20081211" level="project" />
-    <orderEntry type="library" name="Gradle: org.mortbay.jetty:jetty-util:6.1.26" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.guava:guava-jdk5:17.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.oauth-client:google-oauth-client:1.22.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.json:json:20090211" level="project" />
-    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.1.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.http-client:google-http-client:1.22.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.mortbay.jetty:jetty:6.1.26" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.oauth-client:google-oauth-client-java6:1.22.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.api-client:google-api-client:1.22.0" level="project" />
-    <orderEntry type="library" name="Gradle: net.java.dev.jna:jna:4.4.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.glassfish:javax.json:1.0.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.10.2" level="project" />
-    <orderEntry type="library" name="Gradle: commons-io:commons-io:2.4" level="project" />
-    <orderEntry type="library" name="Gradle: com.mixpanel:mixpanel-java:1.4.4" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.http-client:google-http-client-jackson2:1.22.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.oauth-client:google-oauth-client-jetty:1.22.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.apis:google-api-services-oauth2:v2-rev125-1.22.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.tulskiy:jkeymaster:1.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.scijava:native-lib-loader:2.1.3" level="project" />
-    <orderEntry type="library" name="Gradle: net.java.dev.jna:jna-platform:4.4.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-javafx:0.14" level="project" />
-    <orderEntry type="library" name="Gradle: no.tornado:tornadofx:1.7.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jre8:1.1.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jre7:1.1.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.threeten:threetenbp:1.3.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:guava:20.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.errorprone:error_prone_annotations:2.0.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.truth:truth:0.32" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c53bfde..ad56de4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ group 'com.ediposouza'
 version '0.1'
 
 buildscript {
-    ext.kotlin_version = '1.1.2-2'
+    ext.kotlin_version = '1.1.2-4'
 
     repositories {
         mavenCentral()
diff --git a/pHashCalc/src/resources/Cards/Core/Dual/protectorofthemane.png b/pHashCalc/src/resources/Cards/Core/Dual/protectorofthemane.png
new file mode 100644
index 0000000..ca6f12e
Binary files /dev/null and b/pHashCalc/src/resources/Cards/Core/Dual/protectorofthemane.png differ
diff --git a/src/main/kotlin/com/ediposouza/TESLTracker.kt b/src/main/kotlin/com/ediposouza/TESLTracker.kt
index 334eeb8..587ce84 100644
--- a/src/main/kotlin/com/ediposouza/TESLTracker.kt
+++ b/src/main/kotlin/com/ediposouza/TESLTracker.kt
@@ -64,7 +64,7 @@ class TESLTracker : App(MainStageView::class) {
     companion object {
 
         val APP_NAME = "WabbaTrack"
-        val APP_VERSION = "0.2.2"
+        val APP_VERSION = "0.2.3"
         val DEBUG_FILE_NAME = "WabbaTrack.debug"
         val WABBATRACK_URL = "https://edipo2s.github.io/WabbaTrack/"
 
@@ -163,6 +163,8 @@ class TESLTracker : App(MainStageView::class) {
     private lateinit var trayPopupMenu: PopupMenu
     private lateinit var menuMyDecks: List<Any>
     private lateinit var menuImportedDecks: List<Any>
+    private lateinit var elderScrollDetectionInvalidateJob: Job
+    private var elderScrollDetectionRunning = false
     private val legendsIconStream: InputStream by lazy { TESLTracker::class.java.getResourceAsStream(iconName) }
     private val mainWidget: MainWidget by lazy { MainWidget() }
     private val loggerController by inject<LoggerController>()
@@ -251,7 +253,7 @@ class TESLTracker : App(MainStageView::class) {
             Mixpanel.trackUser()
         }
         launch(CommonPool) {
-            startElderScrollDetection()
+            startGetWindowTitleCheck()
         }
         launch(CommonPool) {
             delay(500)
@@ -615,6 +617,25 @@ class TESLTracker : App(MainStageView::class) {
         }
     }
 
+    suspend private fun startGetWindowTitleCheck() {
+        elderScrollDetectionInvalidateJob = launch(CommonPool) {
+            delay(DELAY_WINDOW_DETECTION * 2)
+            Logger.i("ElderScrollDetection thread stop")
+            elderScrollDetectionRunning = false
+        }
+        while (true) {
+            delay((ELDER_SCROLL_SPS * 1000L).toLong())
+            Logger.i("Checking ElderScrollDetection...")
+            if (!elderScrollDetectionRunning) {
+                Logger.i("Starting ElderScrollDetection thread")
+                elderScrollDetectionRunning = true
+                launch(CommonPool) {
+                    startElderScrollDetection()
+                }
+            }
+        }
+    }
+
     suspend private fun startElderScrollDetection() {
         TESLTrackerData.updateCardDB()
         Logger.d("Using ${referenceConfig.SCREEN_REFERENCE} as reference")
@@ -623,6 +644,8 @@ class TESLTracker : App(MainStageView::class) {
         }
         Logger.i("Waiting Elder scroll legends..")
         while (true) {
+            elderScrollDetectionInvalidateJob.cancel()
+            elderScrollDetectionInvalidateJob.start()
             if (isTESLegendsScreenActive()) {
                 Logger.i("Elder scroll legends detected!")
                 Mixpanel.postEventGameDetected()
diff --git a/src/main/kotlin/com/ediposouza/data/PHashCards.kt b/src/main/kotlin/com/ediposouza/data/PHashCards.kt
index 335c385..30c886f 100644
--- a/src/main/kotlin/com/ediposouza/data/PHashCards.kt
+++ b/src/main/kotlin/com/ediposouza/data/PHashCards.kt
@@ -91,6 +91,7 @@ object DHashCards {
             "0110111100010001111111100000011011101010001100111010101111100111011000111001110011101010011001010001100010011100011100101" to "masterofthieves",
             "1000101010100100000000101100101100011111010101110010010011000011001001101111000001011010000110100001101100100000000010111" to "merricataswala",
             "1011011100100110111111111111010011110110000001001001110000001001000000111100111001100101110111010011100101000000000110100" to "militantchieftain",
+            "0101111000100001000011110100001111010111000111010111000110001001100011001100001111110100101101101111100000110110001110010" to "protectorofthemane",
             "1001110000000110000110111100110110110111010111000101101100110001110001000111010010111101000011110001100010111100010010010" to "queenbarenziah",
             "0011011000001101001011111110000101011001000000001001111110101001001110000001001010001101000101010011010100001010100101110" to "redbramman",
             "0100111000100010110000001110001010101110011000011110100010011000010000011010001000111000101000100001000111111010100010110" to "riftthane",
diff --git a/src/main/kotlin/com/ediposouza/state/GameState.kt b/src/main/kotlin/com/ediposouza/state/GameState.kt
index 26aa9cb..4b4c383 100644
--- a/src/main/kotlin/com/ediposouza/state/GameState.kt
+++ b/src/main/kotlin/com/ediposouza/state/GameState.kt
@@ -78,6 +78,7 @@ object GameState : StateHandler.TESLState {
         playerGoFirst = null
         playerDeckClass = null
         playerRank = null
+        playerRankLegend = null
         opponentDeckClass = null
         opponentRank = null
         lastCardDraw = null
@@ -313,6 +314,9 @@ object GameState : StateHandler.TESLState {
     fun isDeckTrackerVisible() = deckTracker.isVisible
 
     fun showDeckTracker(forceShow: Boolean = false) {
+        if (forceShow) {
+            deckTracker.resetZoom()
+        }
         if (forceShow || (deckCardsSlot.isNotEmpty() && shouldShowDeckTracker)) {
             deckTracker.isVisible = true
         }
diff --git a/src/main/kotlin/com/ediposouza/ui/DeckTrackerWidget.kt b/src/main/kotlin/com/ediposouza/ui/DeckTrackerWidget.kt
index b0e063c..bb7d4d2 100644
--- a/src/main/kotlin/com/ediposouza/ui/DeckTrackerWidget.kt
+++ b/src/main/kotlin/com/ediposouza/ui/DeckTrackerWidget.kt
@@ -44,8 +44,9 @@ import javax.swing.SwingUtilities
  */
 class DeckTrackerWidget : JFrame() {
 
+    private val DEFAULT_ZOOM = 0.9f
     private val deckCardsSlot: ObservableList<CardSlot> = FXCollections.observableArrayList<CardSlot>()
-    private var deckTrackerZoom: Float = 0.8f.takeIf { GameState.matchMode == MatchMode.ARENA } ?: 0.9f
+    private var deckTrackerZoom: Float = 0.8f.takeIf { GameState.matchMode == MatchMode.ARENA } ?: DEFAULT_ZOOM
     private lateinit var deckTrackerSize: Dimension
 
     var deckName: String? = null
@@ -316,6 +317,10 @@ class DeckTrackerWidget : JFrame() {
         }
     }
 
+    fun resetZoom() {
+        deckTrackerZoom = DEFAULT_ZOOM
+    }
+
     private fun updateDeckCover() {
         val frameCoverStream = TESLTracker::class.java.getResourceAsStream("/UI/frameCover.png")
         val deckClass = DeckClass.getClasses(deckCardsSlot.groupBy { it.card.attr }.keys.toList()).firstOrNull()