diff --git a/.gitignore b/.gitignore
index 56923c8..e9fa327 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /node_modules/
 /coverage-report/
+/.idea
\ No newline at end of file
diff --git a/Classes/Loader.php b/Classes/Loader.php
index 2a53cd9..bb75876 100644
--- a/Classes/Loader.php
+++ b/Classes/Loader.php
@@ -5,19 +5,6 @@
 class Loader
 {
 
-	/**
-	 * Returns whether the current request should be tracked or not
-	 *
-	 * @since 1.2
-	 * @return boolean
-	 *
-	 */
-	function should_track_visit()
-	{
-		return (!is_user_logged_in() || get_option('track_logged_in'));
-	}
-
-
 	/**
 	 * Returns if the cookie is present
 	 *
@@ -29,13 +16,36 @@ function render_script()
 	{
 		ob_start();
 		?>
+		<script>
 		function hasWKGoogleAnalyticsCookie() {
 		return (new RegExp('wp_wk_ga_untrack_' + document.location.hostname)).test(document.cookie);
 		}
+		</script>
 		<?php
 		return ob_get_clean();
 	}
 
+	/** 
+	* Outputs a js function that allows a cached page to check if the user should be tracked
+	*/
+	public function output_should_track_js_function(){
+
+
+		?>
+		<script>
+		function shouldTrack(){
+			var trackLoggedIn = <?php echo (get_option('track_logged_in') ? get_option('track_logged_in') : 'false'); ?>;
+			var loggedIn = document.cookie.indexOf("wk-ga-logged-in") !== -1;
+			if(!loggedIn){
+				return true;
+			} else if( trackLoggedIn ) {
+				return true;
+			}
+			return false;
+		}
+		</script>
+		<?php
+	}
 
 	/**
 	 * Outputs the Google Tag Manager script tag if necessary
@@ -46,11 +56,13 @@ function hasWKGoogleAnalyticsCookie() {
 	function google_tag_manager_script()
 	{
 		ob_start();
-		if ($this->should_track_visit() && get_option('ga_use_tag_manager')) {
+		if (get_option('ga_use_tag_manager')) {
 			$TAG_MANAGER_ID = get_option('ga_tag_manager_id');
 
+			$this->output_should_track_js_function();
 			?>
-			if (!hasWKGoogleAnalyticsCookie()) {
+			<script>
+			if (!hasWKGoogleAnalyticsCookie() && shouldTrack()) {
 			//Google Tag Manager
 			(function (w, d, s, l, i) {
 			w[l] = w[l] || [];
@@ -66,6 +78,7 @@ function google_tag_manager_script()
 			f.parentNode.insertBefore(j, f);
 			})(window, document, 'script', 'dataLayer', '<?php echo $TAG_MANAGER_ID; ?>');
 			}
+			</script>
 			<?php
 		}
 		return ob_get_clean();
@@ -81,7 +94,7 @@ function google_tag_manager_script()
 	function google_tag_manager_noscript()
 	{
 		ob_start();
-		if ($this->should_track_visit() && get_option('ga_use_tag_manager')) {
+		if (get_option('ga_use_tag_manager')) {
 			$TAG_MANAGER_ID = get_option('ga_tag_manager_id');
 			?>
 			<noscript>
@@ -105,12 +118,13 @@ function google_tag_manager_noscript()
 	function google_analytics_script()
 	{
 		ob_start();
-		if ($this->should_track_visit() && !get_option('ga_use_tag_manager')) {
+		if (!get_option('ga_use_tag_manager')) {
 			$GA_TRACKING_CODE = get_option('ga_tracking_code');
 			$ANONYMIZE_IP = (get_option('ga_anonymize_ip') !== false) ? (boolean)get_option('ga_anonymize_ip') : true;
+			$this->output_should_track_js_function(); 
 			?>
-
-			if (!hasWKGoogleAnalyticsCookie()) {
+			<script>
+			if (!hasWKGoogleAnalyticsCookie() && shouldTrack()) {
 			//Google Analytics
 			(function (i, s, o, g, r, a, m) {
 			i['GoogleAnalyticsObject'] = r;
@@ -135,7 +149,7 @@ function google_analytics_script()
 
 			ga('send', 'pageview');
 			}
-
+			</script>
 			<?php
 		}
 		return ob_get_clean();
@@ -147,20 +161,13 @@ function google_analytics_script()
 	function register_ga_scripts()
 	{
 		//cookie function
-		wp_register_script('wk-cookie-check', '');
-		wp_enqueue_script('wk-cookie-check');
-		wp_add_inline_script('wk-cookie-check', $this->render_script());
+		echo $this->render_script();
 
 		//Google Analytics script in <head>
-		wp_register_script('wk-tag-manager-script', '');
-		wp_enqueue_script('wk-tag-manager-script');
-		wp_add_inline_script('wk-tag-manager-script', $this->google_tag_manager_script());
+		echo $this->google_tag_manager_script();
 
 		//Google Analytics script in <head>
-		wp_register_script('wk-analytics-script', '');
-		wp_enqueue_script('wk-analytics-script');
-		wp_add_inline_script('wk-analytics-script', $this->google_analytics_script());
-
+		echo $this->google_analytics_script();
 	}
 
 	/**
@@ -202,4 +209,13 @@ function load_admin_styles($hook)
 
 	}
 
+	/**
+	 * Set a logged in cookie that is available to cached pages
+	 * Do not use this cookie for security checks!
+	 *  
+	*/ 
+	function set_logged_in_cookie(){
+		setcookie('wk-ga-logged-in', is_user_logged_in(), time() + 31556926, '/');
+	}
+
 }
diff --git a/Classes/Plugin.php b/Classes/Plugin.php
index 4a7cd2b..6c5babb 100644
--- a/Classes/Plugin.php
+++ b/Classes/Plugin.php
@@ -8,6 +8,8 @@ class Plugin
 	public function run()
 	{
 
+
+
 		//i18n
 		add_action('plugins_loaded', array($this, 'load_textdomain'));
 
@@ -26,12 +28,15 @@ public function run()
 		include_once 'Loader.php';
 		$this->loader = new Loader();
 
+		// set logged in cookie after wp is initialized and auth has happened
+		add_action( 'init', array($this->loader,'set_logged_in_cookie'));
+
 		//cookie handling
 		add_action('admin_enqueue_scripts', array($this->loader, 'load_admin_styles'));
 		add_action('wp_enqueue_scripts', array($this->loader, 'register_public_scripts'));
 		add_action('admin_enqueue_scripts', array($this->loader, 'register_public_scripts'));
 
-		add_action('wp_enqueue_scripts', array($this->loader, 'register_ga_scripts'));
+		add_action('wp_head', array($this->loader, 'register_ga_scripts'));
 
 		//Google Tag Manager noscript footer
 		add_action('wp_footer', array($this->loader, 'google_tag_manager_noscript'));
diff --git a/bin/install-wp-tests.sh b/bin/install-wp-tests.sh
deleted file mode 100755
index 73bb4c7..0000000
--- a/bin/install-wp-tests.sh
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/usr/bin/env bash
-
-if [ $# -lt 3 ]; then
-	echo "usage: $0 <db-name> <db-user> <db-pass> [db-host] [wp-version] [skip-database-creation]"
-	exit 1
-fi
-
-DB_NAME=$1
-DB_USER=$2
-DB_PASS=$3
-DB_HOST=${4-localhost}
-WP_VERSION=${5-latest}
-SKIP_DB_CREATE=${6-false}
-
-WP_TESTS_DIR=${WP_TESTS_DIR-/tmp/wordpress-tests-lib}
-WP_CORE_DIR=${WP_CORE_DIR-/tmp/wordpress/}
-
-download() {
-    if [ `which curl` ]; then
-        curl -s "$1" > "$2";
-    elif [ `which wget` ]; then
-        wget -nv -O "$2" "$1"
-    fi
-}
-
-if [[ $WP_VERSION =~ [0-9]+\.[0-9]+(\.[0-9]+)? ]]; then
-	WP_TESTS_TAG="tags/$WP_VERSION"
-elif [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]]; then
-	WP_TESTS_TAG="trunk"
-else
-	# http serves a single offer, whereas https serves multiple. we only want one
-	download http://api.wordpress.org/core/version-check/1.7/ /tmp/wp-latest.json
-	grep '[0-9]+\.[0-9]+(\.[0-9]+)?' /tmp/wp-latest.json
-	LATEST_VERSION=$(grep -o '"version":"[^"]*' /tmp/wp-latest.json | sed 's/"version":"//')
-	if [[ -z "$LATEST_VERSION" ]]; then
-		echo "Latest WordPress version could not be found"
-		exit 1
-	fi
-	WP_TESTS_TAG="tags/$LATEST_VERSION"
-fi
-
-set -ex
-
-install_wp() {
-
-	if [ -d $WP_CORE_DIR ]; then
-		return;
-	fi
-
-	mkdir -p $WP_CORE_DIR
-
-	if [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]]; then
-		mkdir -p /tmp/wordpress-nightly
-		download https://wordpress.org/nightly-builds/wordpress-latest.zip  /tmp/wordpress-nightly/wordpress-nightly.zip
-		unzip -q /tmp/wordpress-nightly/wordpress-nightly.zip -d /tmp/wordpress-nightly/
-		mv /tmp/wordpress-nightly/wordpress/* $WP_CORE_DIR
-	else
-		if [ $WP_VERSION == 'latest' ]; then
-			local ARCHIVE_NAME='latest'
-		else
-			local ARCHIVE_NAME="wordpress-$WP_VERSION"
-		fi
-		download https://wordpress.org/${ARCHIVE_NAME}.tar.gz  /tmp/wordpress.tar.gz
-		tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C $WP_CORE_DIR
-	fi
-
-	download https://raw.github.com/markoheijnen/wp-mysqli/master/db.php $WP_CORE_DIR/wp-content/db.php
-}
-
-install_test_suite() {
-	# portable in-place argument for both GNU sed and Mac OSX sed
-	if [[ $(uname -s) == 'Darwin' ]]; then
-		local ioption='-i .bak'
-	else
-		local ioption='-i'
-	fi
-
-	# set up testing suite if it doesn't yet exist
-	if [ ! -d $WP_TESTS_DIR ]; then
-		# set up testing suite
-		mkdir -p $WP_TESTS_DIR
-		svn co --quiet https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes
-		svn co --quiet https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/data/ $WP_TESTS_DIR/data
-	fi
-
-	if [ ! -f wp-tests-config.php ]; then
-		download https://develop.svn.wordpress.org/${WP_TESTS_TAG}/wp-tests-config-sample.php "$WP_TESTS_DIR"/wp-tests-config.php
-		# remove all forward slashes in the end
-		WP_CORE_DIR=$(echo $WP_CORE_DIR | sed "s:/\+$::")
-		sed $ioption "s:dirname( __FILE__ ) . '/src/':'$WP_CORE_DIR/':" "$WP_TESTS_DIR"/wp-tests-config.php
-		sed $ioption "s/youremptytestdbnamehere/$DB_NAME/" "$WP_TESTS_DIR"/wp-tests-config.php
-		sed $ioption "s/yourusernamehere/$DB_USER/" "$WP_TESTS_DIR"/wp-tests-config.php
-		sed $ioption "s/yourpasswordhere/$DB_PASS/" "$WP_TESTS_DIR"/wp-tests-config.php
-		sed $ioption "s|localhost|${DB_HOST}|" "$WP_TESTS_DIR"/wp-tests-config.php
-	fi
-
-}
-
-install_db() {
-
-	if [ ${SKIP_DB_CREATE} = "true" ]; then
-		return 0
-	fi
-
-	# parse DB_HOST for port or socket references
-	local PARTS=(${DB_HOST//\:/ })
-	local DB_HOSTNAME=${PARTS[0]};
-	local DB_SOCK_OR_PORT=${PARTS[1]};
-	local EXTRA=""
-
-	if ! [ -z $DB_HOSTNAME ] ; then
-		if [ $(echo $DB_SOCK_OR_PORT | grep -e '^[0-9]\{1,\}$') ]; then
-			EXTRA=" --host=$DB_HOSTNAME --port=$DB_SOCK_OR_PORT --protocol=tcp"
-		elif ! [ -z $DB_SOCK_OR_PORT ] ; then
-			EXTRA=" --socket=$DB_SOCK_OR_PORT"
-		elif ! [ -z $DB_HOSTNAME ] ; then
-			EXTRA=" --host=$DB_HOSTNAME --protocol=tcp"
-		fi
-	fi
-
-	# create database
-	mysqladmin create $DB_NAME --user="$DB_USER" --password="$DB_PASS"$EXTRA
-}
-
-install_wp
-install_test_suite
-install_db
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 610bfa4..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-machine:
-  php:
-    version: 5.6.14
-  environment:
-    WP_TESTS_DIR: /tmp/wordpress-tests-lib
-    WP_CORE_DIR: /tmp/wordpress/
-    PATH: $HOME/.composer/vendor/bin:$PATH
-
-dependencies:
-  pre:
-    - sudo apt-get update; sudo apt-get install subversion
-
-test:
-  override:
-    - |
-      rm -rf $WP_TESTS_DIR $WP_CORE_DIR
-      bash bin/install-wp-tests.sh wordpress_test ubuntu '' 127.0.0.1 latest
-      phpunit
-      WP_MULTISITE=1 phpunit
-    - |
-      rm -rf $WP_TESTS_DIR $WP_CORE_DIR
-      bash bin/install-wp-tests.sh wordpress_test ubuntu '' 127.0.0.1 trunk
-      phpunit
-      WP_MULTISITE=1 phpunit
-    - |
-      phpenv global 7.0.17
-      rm -rf $WP_TESTS_DIR $WP_CORE_DIR
-      bash bin/install-wp-tests.sh wordpress_test ubuntu '' 127.0.0.1 latest
-      phpunit
-      WP_MULTISITE=1 phpunit
-    - |
-      phpenv global 7.1.3
-      rm -rf $WP_TESTS_DIR $WP_CORE_DIR
-      bash bin/install-wp-tests.sh wordpress_test ubuntu '' 127.0.0.1 latest
-      phpunit
-      WP_MULTISITE=1 phpunit
-    - |
-      phpenv global 5.4.4
-      rm -rf $WP_TESTS_DIR $WP_CORE_DIR
-      bash bin/install-wp-tests.sh wordpress_test ubuntu '' 127.0.0.1 latest
-      phpunit
-      WP_MULTISITE=1 phpunit
-    - |
-      phpenv global 5.3.25
-      rm -rf $WP_TESTS_DIR $WP_CORE_DIR
-      bash bin/install-wp-tests.sh wordpress_test ubuntu '' 127.0.0.1 latest
-      phpunit --configuration phpunit.xml.dist-php5.3
-      WP_MULTISITE=1 phpunit --configuration phpunit.xml.dist-php5.3
-
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
deleted file mode 100644
index 9ce193a..0000000
--- a/phpunit.xml.dist
+++ /dev/null
@@ -1,30 +0,0 @@
-<phpunit
-	bootstrap="tests/bootstrap.php"
-	backupGlobals="false"
-	colors="true"
-	convertErrorsToExceptions="true"
-	convertNoticesToExceptions="true"
-	convertWarningsToExceptions="true"
-	>
-	<testsuites>
-		<testsuite>
-			<directory prefix="test-" suffix=".php">./tests/</directory>
-		</testsuite>
-	</testsuites>
-	<php>
-		<ini name="display_errors" value="On" />
-		<ini name="display_startup_errors" value="On" />
-	</php>
-	<filter>
-		<whitelist processUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">./Classes</directory>
-			<exclude>
-				<file>./admin/mailchimp-form.php</file>
-			</exclude>
-			<file>./wk-ga.php</file>
-		</whitelist>
-	</filter>
-	<logging>
-		<log type="coverage-html" target="coverage-report" lowUpperBound="20" highLowerBound="40"/>
-	</logging>
-</phpunit>
diff --git a/phpunit.xml.dist-php5.3 b/phpunit.xml.dist-php5.3
deleted file mode 100644
index 450e7ee..0000000
--- a/phpunit.xml.dist-php5.3
+++ /dev/null
@@ -1,30 +0,0 @@
-<phpunit
-	bootstrap="tests/bootstrap.php"
-	backupGlobals="false"
-	colors="true"
-	convertErrorsToExceptions="true"
-	convertNoticesToExceptions="true"
-	convertWarningsToExceptions="true"
-	>
-	<testsuites>
-		<testsuite>
-			<directory prefix="test-" suffix=".php">./tests-php5.3/</directory>
-		</testsuite>
-	</testsuites>
-	<php>
-		<ini name="display_errors" value="On" />
-		<ini name="display_startup_errors" value="On" />
-	</php>
-	<filter>
-		<whitelist processUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">./Classes</directory>
-			<exclude>
-				<file>./admin/mailchimp-form.php</file>
-			</exclude>
-			<file>./wk-ga.php</file>
-		</whitelist>
-	</filter>
-	<logging>
-		<log type="coverage-html" target="coverage-report" lowUpperBound="20" highLowerBound="40"/>
-	</logging>
-</phpunit>
diff --git a/tests-php5.3/bootstrap.php b/tests-php5.3/bootstrap.php
deleted file mode 100644
index 475560c..0000000
--- a/tests-php5.3/bootstrap.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * PHPUnit bootstrap file
- *
- * @package Google_Analytics
- */
-
-$_tests_dir = getenv( 'WP_TESTS_DIR' );
-if ( ! $_tests_dir ) {
-	$_tests_dir = '/tmp/wordpress-tests-lib';
-}
-
-// Give access to tests_add_filter() function.
-require_once $_tests_dir . '/includes/functions.php';
-
-/**
- * Manually load the plugin being tested.
- */
-function _manually_load_plugin() {
-	require dirname( dirname( __FILE__ ) ) . '/wk-ga.php';
-}
-tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
-
-// Start up the WP testing environment.
-require $_tests_dir . '/includes/bootstrap.php';
diff --git a/tests-php5.3/test-factory.php b/tests-php5.3/test-factory.php
deleted file mode 100644
index cf35a24..0000000
--- a/tests-php5.3/test-factory.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Class SampleTest
- *
- * @package Google_Analytics
- */
-
-/**
- * Sample test case.
- */
-class FactoryTest extends WP_UnitTestCase {
-
-	/**
-	 * A single example test.
-	 */
-	function test_creates_only_one_instance() {
-		$one = WebKinder\GoogleAnalytics\PluginFactory::create();
-		$this->assertNull( $one );
-	}
-}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index 475560c..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * PHPUnit bootstrap file
- *
- * @package Google_Analytics
- */
-
-$_tests_dir = getenv( 'WP_TESTS_DIR' );
-if ( ! $_tests_dir ) {
-	$_tests_dir = '/tmp/wordpress-tests-lib';
-}
-
-// Give access to tests_add_filter() function.
-require_once $_tests_dir . '/includes/functions.php';
-
-/**
- * Manually load the plugin being tested.
- */
-function _manually_load_plugin() {
-	require dirname( dirname( __FILE__ ) ) . '/wk-ga.php';
-}
-tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
-
-// Start up the WP testing environment.
-require $_tests_dir . '/includes/bootstrap.php';
diff --git a/tests/test-factory.php b/tests/test-factory.php
deleted file mode 100644
index 18ce349..0000000
--- a/tests/test-factory.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Class SampleTest
- *
- * @package Google_Analytics
- */
-
-/**
- * Sample test case.
- */
-class FactoryTest extends WP_UnitTestCase {
-
-	/**
-	 * A single example test.
-	 */
-	function test_creates_only_one_instance() {
-		$one = WebKinder\GoogleAnalytics\PluginFactory::create();
-		$two = WebKinder\GoogleAnalytics\PluginFactory::create();
-		$this->assertEquals( $one, $two );
-	}
-}
diff --git a/tests/test-loader.php b/tests/test-loader.php
deleted file mode 100644
index f39c7c3..0000000
--- a/tests/test-loader.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Class LoaderTest
- *
- * @package Google_Analytics
- */
-
-/**
- * Loader test case.
- */
-class LoaderTest extends WP_UnitTestCase {
-
-	public function setUp() {
-		$this->plugin = WebKinder\GoogleAnalytics\PluginFactory::create();
-	}
-
-	/**
-	 * A single example test.
-	 */
-	function test_should_track_visit() {
-
-		// Logged out should always be tracked
-		wp_logout();
-
-		update_option('track_logged_in', 1);
-		$this->assertTrue($this->plugin->loader->should_track_visit());
-
-		update_option('track_logged_in', 0);
-		$this->assertTrue($this->plugin->loader->should_track_visit());
-
-		// Logged in should only be tracked when option is set
-		$user_id = $this->factory->user->create();
-		wp_set_current_user( $user_id );
-
-		update_option('track_logged_in', 1);
-		$this->assertTrue($this->plugin->loader->should_track_visit());
-
-		update_option('track_logged_in', 0);
-		$this->assertFalse($this->plugin->loader->should_track_visit());
-	}
-}
diff --git a/tests/test-sample.php b/tests/test-sample.php
deleted file mode 100644
index 64fc272..0000000
--- a/tests/test-sample.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Class SampleTest
- *
- * @package Google_Analytics
- */
-
-/**
- * Sample test case.
- */
-class SampleTest extends WP_UnitTestCase {
-
-	/**
-	 * A single example test.
-	 */
-	function test_sample() {
-		// Replace this with some actual testing code.
-		$this->assertTrue( true );
-	}
-}
