diff --git a/assets/js/woocommerce-cart-error-dom.js b/assets/js/woocommerce-cart-error-dom.js
deleted file mode 100644
index b343b43..0000000
--- a/assets/js/woocommerce-cart-error-dom.js
+++ /dev/null
@@ -1,19 +0,0 @@
-(function($){
-	$(document).ready(function(e){
-		var error_array = new Array();
-		$('body').on('DOMNodeInserted', '.woocommerce-error', function () {
-			$('.woocommerce-error').find('li').each(function(index,element){
-				error_array[index] = $(element).text();
-			});
-			$.ajax({
-				type : 		"post",
-				url : 		'/wp-admin/admin-ajax.php?action=record_woocommerce_errors',
-				dataType: 	'json',            	
-				data: JSON.stringify(error_array),
-				success: function(response) {
-				
-				},
-			}); 				
-		});
-	});
-}(jQuery));
\ No newline at end of file
diff --git a/class-settings.php b/class-settings.php
new file mode 100644
index 0000000..e020774
--- /dev/null
+++ b/class-settings.php
@@ -0,0 +1,83 @@
+<?php
+class wp_slack_woocommerce_settings extends wp_slack_woocommerce
+{
+	public function init()
+	{
+		add_filter('woocommerce_settings_tabs_array', array($this, 'woo_new_section_tabs'), 50);
+		add_action('woocommerce_settings_tabs_settings_slack_woocommerce', array($this, 'settings_tab'));
+		add_action('woocommerce_update_options_settings_slack_woocommerce', array($this, 'update_settings'));
+	}
+
+	public static function get_settings()
+	{
+		$settings = array(
+			'section_title' => array(
+				'name' => __('Slack Notifications', 'wp-slack-woocommerce'),
+				'type' => 'title',
+				'desc' => '',
+				'id' => 'wc_settings_tab_slack_woocommerce_title'
+			),
+			'notifications_enable' => array(
+				'name' => __('Enable Notifications', 'wp-slack-woocommerce'),
+				'type' => 'checkbox',
+				'desc' => __('Enable Slack Notifications using the settings below', 'wp-slack-woocommerce'),
+				'id' => 'wc_settings_tab_slack_woocommerce_enable_notifications'
+			),
+
+			'title' => array(
+				'name' => __('Slack Token', 'wp-slack-woocommerce'),
+				'type' => 'text',
+				'desc' => __('', 'wp-slack-woocommerce'),
+				'id' => 'wc_settings_tab_slack_token'
+			),
+			'channel' => array(
+				'name' => __('Slack Channel', 'wp-slack-woocommerce'),
+				'type' => 'text',
+				'desc' => __('', 'wp-slack-woocommerce'),
+				'id' => 'wc_settings_tab_slack_woocommerce_channel'
+			),
+			'icon-confirm' => array(
+				'name' => __('Confirmed Icon', 'wp-slack-woocommerce'),
+				'type' => 'text',
+				'desc' => __('', 'wp-slack-woocommerce'),
+				'id' => 'wc_settings_tab_slack_woocommerce_slack_icon_completed'
+			),
+			'icon-cancel' => array(
+				'name' => __('Cancelled Icon', 'wp-slack-woocommerce'),
+				'type' => 'text',
+				'desc' => __('', 'wp-slack-woocommerce'),
+				'id' => 'wc_settings_tab_slack_woocommerce_slack_icon_cancelled'
+			),
+			'icon-fail' => array(
+				'name' => __('Failed Icon', 'wp-slack-woocommerce'),
+				'type' => 'text',
+				'desc' => __('', 'wp-slack-woocommerce'),
+				'id' => 'wc_settings_tab_slack_woocommerce_slack_icon_failed'
+			),
+			'test_slack' => array(
+				'name' => __('', 'wp-slack-woocommerce'),
+				'type' => 'title',
+				'desc' => '<a href="#" id="test_slack">Test slack</a>',
+				'id' => 'wc_settings_tab_slack_test_slack'
+			),
+			'section_end' => array(
+				'type' => 'sectionend',
+				'id' => 'wc_settings_tab_slack_woocommerce_end'
+			)
+		);
+		return apply_filters('wc_settings_tab_slack_woocommerce', $settings);
+	}
+	public function woo_new_section_tabs($sections)
+	{
+		$sections['settings_slack_woocommerce'] = __('Slack Notifications', 'wp-slack-woocommerce');
+		return $sections;
+	}
+	public function update_settings()
+	{
+		woocommerce_update_options($this->get_settings());
+	}
+	public function settings_tab()
+	{
+		woocommerce_admin_fields($this->get_settings());
+	}
+}
\ No newline at end of file
diff --git a/class-testmode.php b/class-testmode.php
new file mode 100644
index 0000000..b356068
--- /dev/null
+++ b/class-testmode.php
@@ -0,0 +1,161 @@
+<?php
+class wp_slack_woocommerce_testmode extends wp_slack_woocommerce
+{
+	public function init()
+	{
+		$plugin_path = 'woocommerce-click-pledge-gateway/gateway-clickandpledge.php';
+		if (
+			(is_plugin_active($plugin_path) || is_plugin_inactive($plugin_path))
+			&& file_exists(ABSPATH . '/wp-content/plugins/' . $plugin_path)
+		) {
+			add_action('deactivate_' . $plugin_path, array($this, 'clickandpledge_deactivate'));
+			add_action('activate_' . $plugin_path, array($this, 'clickandpledge_activate'));
+		}
+
+		$plugin_path = 'woocommerce-gateway-firstdata/woocommerce-gateway-first-data.php';
+		if (
+			(is_plugin_active($plugin_path) || is_plugin_inactive($plugin_path))
+			&& file_exists(ABSPATH . '/wp-content/plugins/' . $plugin_path)
+		) {
+			add_action('deactivate_' . $plugin_path, array($this, 'payeezy_deactivate'));
+			add_action('activate_' . $plugin_path, array($this, 'payeezy_activate'));
+		}
+
+		add_action('woocommerce_update_options', array($this, 'testmode_check'), 10, 1);
+		add_action('testmode_check', array($this, 'testmode_check'));
+	}
+
+	/**
+	 * Checks the test mode status of Payeezy and Click and Pledge gateways.
+	 *
+	 * This function checks if the specified WooCommerce gateways (Payeezy and Click and Pledge) 
+	 * are active or inactive and whether their respective plugin files exist. If the conditions 
+	 * are met, it calls respective functions to check the test mode status of these gateways.
+	 */
+	public function testmode_check()
+	{
+		$plugin_path = 'woocommerce-gateway-firstdata/woocommerce-gateway-first-data.php';
+		if (
+			(is_plugin_active($plugin_path) || is_plugin_inactive($plugin_path))
+			&& file_exists(ABSPATH . '/wp-content/plugins/' . $plugin_path)
+		) {
+			$this->payeezy_testmode_check();
+		}
+
+		$plugin_path = 'woocommerce-click-pledge-gateway/gateway-clickandpledge.php';
+		if (
+			(is_plugin_active($plugin_path) || is_plugin_inactive($plugin_path))
+			&& file_exists(ABSPATH . '/wp-content/plugins/' . $plugin_path)
+		) {
+			$this->clickandpledge_testmode_check();
+		}
+	}
+
+	public function payeezy_activate()
+	{
+		$message = " Production website's Production website's Payeezy Gateway is active!";
+		$icon = ":heavy_check_mark:";
+		$channel = get_option('wc_settings_tab_slack_woocommerce_channel');
+		$this->slack_message($message, "Payeezy Gateway Plugin Active", $channel, $icon);
+	}
+	public function payeezy_deactivate()
+	{
+		$message = "WARNING: Production website's Production website's Payeezy Gateway is in not active!";
+		$icon = ":warning:";
+		$channel = get_option('wc_settings_tab_slack_woocommerce_channel');
+		$this->slack_message($message, "Payeezy Gateway Plugin Inactive", $channel, $icon);
+	}
+	public function payeezy_testmode_check()
+	{
+		// Don't check for WPEngine yet, need to test first
+		$settings = get_option('woocommerce_first_data_payeezy_gateway_credit_card_settings');
+		if ($settings['environment'] == 'demo' && get_option('woocommerce_pe_testmode') != 'true') {
+			update_option('woocommerce_pe_testmode', 'true');
+			$message = "WARNING: Production website's Payeezy Gateway Environment is set to Demo";
+			$icon = ":warning:";
+			$channel = get_option('wc_settings_tab_slack_woocommerce_channel');
+			$this->slack_message($message, "Payeezy Gateway Environment set to Demo", $channel, $icon);
+		} else if ($settings['environment'] == 'production') {
+			if (get_option('woocommerce_pe_testmode') == 'true') {
+				$message = "Production website's Payeezy Gateway Environment is set to Production";
+				$icon = ":heavy_check_mark:";
+				$channel = get_option('wc_settings_tab_slack_woocommerce_channel');
+				$this->slack_message($message, "Payeezy Environment set to Production", $channel, $icon);
+			}
+			update_option('woocommerce_pe_testmode', 'false');
+		}
+
+		if ($settings['enabled'] == 'no' && get_option('woocommerce_pe_enabled') != 'false') {
+			update_option('woocommerce_pe_enabled', 'false');
+			$message = "WARNING: Production website's Payeezy Gateway is not enabled";
+			$icon = ":warning:";
+			$channel = get_option('wc_settings_tab_slack_woocommerce_channel');
+			$this->slack_message($message, "Payeezy disabled", $channel, $icon);
+		} else if ($settings['enabled'] == 'yes') {
+			if (get_option('woocommerce_pe_enabled') == 'false') {
+				$message = "Production website's Payeezy Gateway is enabled";
+				$icon = ":heavy_check_mark:";
+				$channel = get_option('wc_settings_tab_slack_woocommerce_channel');
+				$this->slack_message($message, "Payeezy Gateway enabled", $channel, $icon);
+			}
+			update_option('woocommerce_pe_enabled', 'true');
+		}
+	}
+	public function clickandpledge_activate()
+	{
+		$message = " Production website's Click and Pledge Gateway is active!";
+		$icon = ":heavy_check_mark:";
+		$channel = get_option('wc_settings_tab_slack_woocommerce_channel');
+		$this->slack_message($message, "Click and Pledge Active", $channel, $icon);
+	}
+	public function clickandpledge_deactivate()
+	{
+		$message = "WARNING: Production website's Click and Pledge Gateway is in not active!";
+		$icon = ":warning:";
+		$channel = get_option('wc_settings_tab_slack_woocommerce_channel');
+		$this->slack_message($message, "Click and Pledge Inactive", $channel, $icon);
+	}
+	public function clickandpledge_testmode_check()
+	{
+		if (is_wpe()) {
+			$settings = get_option('woocommerce_clickandpledge_settings');
+			$p_settings = get_option('woocommerce_clickandpledge_paymentsettings');
+
+			if ($p_settings['testmode'] == 'yes') {
+				update_option('woocommerce_cp_testmode', 'true');
+				$message = "WARNING: Production website's Click and Pledge Gateway is in Testmode";
+				$icon = ":warning:";
+				$channel = get_option('wc_settings_tab_slack_woocommerce_channel');
+				$this->slack_message($message, "Click and Pledge in Testmode", $channel, $icon);
+			} else {
+				if (get_option('woocommerce_cp_testmode') == 'true') {
+					$message = "Production website's Click and Pledge Gateway is in Production";
+					$icon = ":heavy_check_mark:";
+					$channel = get_option('wc_settings_tab_slack_woocommerce_channel');
+					$this->slack_message($message, "Click and Pledge in Production", $channel, $icon);
+				}
+				update_option('woocommerce_cp_testmode', 'false');
+			}
+
+			if ($p_settings['enabled'] == 'yes') {
+				if (get_option('woocommerce_cp_enabled') == 'false') {
+					$message = "Production website's Click and Pledge Gateway is enabled";
+					$icon = ":heavy_check_mark:";
+					$channel = get_option('wc_settings_tab_slack_woocommerce_channel');
+					$this->slack_message($message, "Click and Pledge enabled", $channel, $icon);
+				}
+				update_option('woocommerce_cp_enabled', 'true');
+
+			} else {
+				update_option('woocommerce_cp_enabled', 'false');
+				$message = "WARNING: Production website's Click and Pledge Gateway is not enabled";
+				$icon = ":warning:";
+				$channel = get_option('wc_settings_tab_slack_woocommerce_channel');
+				$this->slack_message($message, "Click and Pledge disabled", $channel, $icon);
+			}
+
+		}
+
+	}
+
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..febd5e9
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,10 @@
+{
+    "name": "burningmantech/woocommerce-slack-notifications",
+    "description": "Trigger slack notifications when a WooCommerce order status is updated to canceled or completed.",
+    "type": "wordpress-plugin",
+    "require": {
+        "php": "^7.4 || ^8.0"
+    },
+    "require-dev": {
+    }
+}
diff --git a/woocommerce-slack.php b/woocommerce-slack.php
index aac524c..8e9122c 100644
--- a/woocommerce-slack.php
+++ b/woocommerce-slack.php
@@ -3,512 +3,285 @@
  * Plugin Name: WooCommerce Slack Integration
  * Plugin URI: 
  * Description: This plugin allows you to send notifications to Slack channels whenever payment in WooCommerce is marked as complete.
- * Version: 1.1.0
+ * Version: 2.0.0
  * Author: Trevor Bice
  * Text Domain: slack-woocommerce
  * Domain Path: /languages
  * License: GPL v2 or later
  */
 
+define('WOOCOMMERCE_SLACK_ABS_PATH', ABSPATH . "wp-content/plugins/woocommerce-slack-notifications/");
 
+include(WOOCOMMERCE_SLACK_ABS_PATH . 'class-testmode.php');
+include(WOOCOMMERCE_SLACK_ABS_PATH . 'class-settings.php');
 
-class wp_slack_woocommerce {
-	
+class wp_slack_woocommerce
+{
 	private static $instance = false;
-	private $wpengine;
-	
-
-	public static function instance() {
-		if ( ! self::$instance ) {
+	public static function instance()
+	{
+		if (!self::$instance) {
 			self::$instance = new self;
 			self::$instance->init();
 		}
 		return self::$instance;
 	}
- 	public function init() {		
-		add_action( 'init', 						array( $this, 	'wp_init'), 10, 3 );	
-		add_action( 'admin_init', 					array( $this, 	'wp_admin_init'), 10, 3 );
-	}
-	public function wp_admin_init(){
-		$plugin_path = 'woocommerce-click-pledge-gateway/gateway-clickandpledge.php';
-		if( (is_plugin_active($plugin_path) || is_plugin_inactive($plugin_path))
-			&& file_exists(ABSPATH . '/wp-content/plugins/'.$plugin_path) ) {
-			add_action( 'deactivate_'.$plugin_path, 	array( $this, 'clickandpledge_deactivate')); 
-			add_action( 'activate_'.$plugin_path, 		array( $this, 'clickandpledge_activate')); 
-		}
+	public function init()
+	{
 
-		$plugin_path = 'woocommerce-gateway-firstdata/woocommerce-gateway-first-data.php';
-		if( (is_plugin_active($plugin_path) || is_plugin_inactive($plugin_path))
-			&& file_exists(ABSPATH . '/wp-content/plugins/'.$plugin_path) ) {
-			add_action( 'deactivate_'.$plugin_path, 	array( $this, 'payeezy_deactivate')); 
-			add_action( 'activate_'.$plugin_path, 		array( $this, 'payeezy_activate')); 
-		}
-	}
-	public function wp_init() {
-		/*
-		if ( ! wp_next _scheduled( 'clickandpledge_testmode_check' ) ) {
-			wp_schedule_event( time(), 'hourly', array( $this, 'clickandpledge_testmode_check') );
+		if (class_exists('wp_slack_woocommerce_testmode')) {
+			$wp_slack_woocommerce_testmode = new wp_slack_woocommerce_testmode;
+			$wp_slack_woocommerce_testmode->init();
 		}
 
-		
-		*/	
-		$enabled = get_option( 'wc_settings_tab_slack_woocommerce_enable_notifications' );
-		if( $enabled == 'yes' ){	
-			add_filter( 'woocommerce_payment_complete_order_status', 	array( $this, 'rfvc_update_order_status'), 10, 2 );
-			add_action( 'woocommerce_order_status_completed', 			array( $this, 'mysite_woocommerce_order_status_completed'));
-			add_action( 'woocommerce_order_status_cancelled', 			array( $this, 'mysite_woocommerce_order_status_cancelled'));
-			add_action( 'woocommerce_order_status_failed', 				array( $this, 'mysite_woocommerce_order_status_failed'));
-			add_action( 'transition_post_status',  						array( $this, 'post_status_change'), 10, 3 ); 
-
-			add_action( 'woocommerce_update_options', 							array( $this, 'testmode_check'), 10, 1 );
-			
-			
- 
-		}
-		if( is_admin()) {
-			// Only register the AJAX for admins
-			add_action( 'wp_ajax_test_slack', 									array( $this, 'test_slack' ) ); 
-			add_filter( 'woocommerce_settings_tabs_array', 						array( $this, 'woo_new_section_tabs'), 50);
-			add_action( 'woocommerce_settings_tabs_settings_slack_woocommerce', 	array( $this, 'settings_tab') );
-			add_action( 'woocommerce_update_options_settings_slack_woocommerce', 	array( $this, 'update_settings') );
-			
-			
-			add_action( 'in_admin_footer', 										array( $this, 'enqueue_scripts'));
-		}
-		add_action( 'testmode_check', 											array( $this, 'testmode_check') );
-		add_action( 'wp_enqueue_scripts', 										array( $this, 'dequeue_enqueue'), 70 );
-		add_action( 'wp_ajax_record_woocommerce_errors', 						array( $this, 'ajax_record_woocommerce_errors') );
-		
-	}
-	public function testmode_check() {
-		// Only check for payeezy if it exists
-
-		$plugin_path = 'woocommerce-gateway-firstdata/woocommerce-gateway-first-data.php';
-		if( (is_plugin_active($plugin_path) || is_plugin_inactive($plugin_path))
-			&& file_exists(ABSPATH . '/wp-content/plugins/'.$plugin_path) ) {
-			$this->payeezy_testmode_check();
+		if (class_exists('wp_slack_woocommerce_settings')) {
+			$wp_slack_woocommerce_settings = new wp_slack_woocommerce_settings;
+			$wp_slack_woocommerce_settings->init();
 		}
 
-		$plugin_path = 'woocommerce-click-pledge-gateway/gateway-clickandpledge.php';
-		if( (is_plugin_active($plugin_path) || is_plugin_inactive($plugin_path))
-			&& file_exists(ABSPATH . '/wp-content/plugins/'.$plugin_path) ) {
-			$this->clickandpledge_testmode_check();
-		}
+		add_action('init', array($this, 'wp_init'), 10, 3);
+		// add_action( 'admin_init', array( $this, 'wp_admin_init'), 10, 3 );
 	}
-	public function send_bulk_ga_data($data){
-		$gap_options 	= get_option('gap_options');
-		$site_url 	= parse_url(get_site_url());
-		$i = 0;
-		foreach ( $data as $index=>$message ) {
-			// First build the current property
-			$ga_data[$i]['v']	= 1;
-			$ga_data[$i]['cid'] = 555;
-			$ga_data[$i]['tid']	= $gap_options['gap_id'];
-			$ga_data[$i]['t'] 	= 'event'; 
-			$ga_data[$i]['ec']	= "WooCommerce";
-			$ga_data[$i]['ea']	= "WooCommerce - Cart - Error";
-			$ga_data[$i]['el']	= $message['el'];
-			$ga_data[$i]['dh'] 	= $site_url['host'];
-			$i++;
-			// Then build the global property
-			$ga_data[$i]['v']	= 1;
-			$ga_data[$i]['cid'] = 555;
-			$ga_data[$i]['tid']	= "UA-10418553-59";
-			$ga_data[$i]['t'] 	= 'event'; 
-			$ga_data[$i]['ec']	= "WooCommerce";
-			$ga_data[$i]['ea']	= "WooCommerce - Cart - Error";
-			$ga_data[$i]['el']	= $message['el'];
-			$ga_data[$i]['dh'] 	= $site_url['host'];
-			$i++;
+	public function wp_init()
+	{
+		$enabled = get_option('wc_settings_tab_slack_woocommerce_enable_notifications');
+		if ($enabled == 'yes') {
+			add_filter('woocommerce_payment_complete_order_status', array($this, 'rfvc_update_order_status'), 10, 2);
+			add_action('woocommerce_order_status_completed', array($this, 'mysite_woocommerce_order_status_completed'));
+			add_action('woocommerce_order_status_cancelled', array($this, 'mysite_woocommerce_order_status_cancelled'));
+			add_action('woocommerce_order_status_failed', array($this, 'mysite_woocommerce_order_status_failed'));
 		}
-		$postfields = '';
-		foreach($ga_data as $index=>$val){
-			$postfields .= http_build_query($val)."\r\n";
+		if (is_admin()) {
+			add_action('wp_ajax_test_slack', array($this, 'test_slack'));
+			add_action('in_admin_footer', array($this, 'enqueue_scripts'));
 		}
-		$curl = curl_init();
-		curl_setopt_array($curl, array(
-		  CURLOPT_URL => "https://www.google-analytics.com/batch",
-		  CURLOPT_RETURNTRANSFER => true,
-		  CURLOPT_ENCODING => "",
-		  CURLOPT_MAXREDIRS => 10,
-		  CURLOPT_TIMEOUT => 30,
-		  CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
-		  CURLOPT_CUSTOMREQUEST => "POST",
-		  CURLOPT_POSTFIELDS => $postfields,
-		  CURLOPT_HTTPHEADER => array(
-		    "cache-control: no-cache",
-		    "content-type: text/html"
-		  ),
-		));
-		$response = curl_exec($curl);
-		$err = curl_error($curl);
-		curl_close($curl);
-	
 	}
-	public function send_ga_data($data) {
-		
-		$data['v'] 	= 1;
-		$data['cid'] 	= 555;
-		$site_url = parse_url(get_site_url());
-		$data['dr'] 	= $site_url['host'];
-
-		$content = http_build_query($data);
-		$content = utf8_encode($content);
-		$url = "https://www.google-analytics.com/collect?" . $content;
-	
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_HEADER, 0);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);  
-		$r = curl_exec($ch);
-	
-		$error = curl_error($ch);
-		curl_close($ch);
-
-		if($data['tid']!='UA-10418553-59'){
-			if($data['t']!='event'){
-				$data['tid'] 	= 'UA-10418553-59';
-				$this->form_load_GA_trigger($data);
-			}
-		}
-		
-	}
-	public function ajax_record_woocommerce_errors(){
-		global $current_user;
-		
-		$error_array = json_decode(file_get_contents('php://input'));
-		foreach($error_array as $index=>$error){
-			// Build the errors
-			$data[]['el']	= strip_tags(wp_kses_post( $error ));
-		}
-		// Send to the bulk data transmitter
-		$this->send_bulk_ga_data($data);
-		exit;
-		die();
-	}
-	public function dequeue_enqueue() {
-		if(is_plugin_active('woocommerce-gateway-firstdata/woocommerce-gateway-first-data.php'))  {
-			wp_enqueue_script( 	'woocommerce-slack', 		'/wp-content/plugins/woocommerce-slack/assets/js/woocommerce-cart-error-dom.js', 		array( 'jquery' ), time(), true );
-		}
-	}
-	public function payeezy_activate(){
-		$message 	= " Production website's Production website's Payeezy Gateway is active!";
-		$icon 		= ":heavy_check_mark:";
-		$channel 	= get_option( 'wc_settings_tab_slack_woocommerce_channel' );
-		self::slack_message($message, "Payeezy Gateway Plugin Active", $channel, $icon);
-	}
-	public function payeezy_deactivate(){
-		$message 	= "WARNING: Production website's Production website's Payeezy Gateway is in not active!";
-		$icon 		= ":warning:";
-		$channel 	= get_option( 'wc_settings_tab_slack_woocommerce_channel' );
-		self::slack_message($message, "Payeezy Gateway Plugin Inactive", $channel, $icon);
+
+	public function enqueue_scripts()
+	{
+		?>
+		<script>
+			jQuery(window).ready(function () {
+				jQuery("#test_slack").click(function () {
+					jQuery.ajax({
+						type: "post",
+						url: 'admin-ajax.php',
+						data: {
+							action: "test_slack"
+						},
+						success: function (response) {
+							console.log(response);
+						}
+					});
+				});
+			});
+		</script>
+		<?php
 	}
-	public function payeezy_testmode_check() {
-		// Don't check for WPEngine yet, need to test first
-		
-		$settings = get_option('woocommerce_first_data_payeezy_gateway_credit_card_settings');
-		
-		
-		if($settings['environment']=='demo' && get_option('woocommerce_pe_testmode')!='true'){
-			update_option( 'woocommerce_pe_testmode', 'true');
-			$message 	= "WARNING: Production website's Payeezy Gateway Environment is set to Demo";
-			$icon 	= ":warning:";
-			$channel 	= get_option( 'wc_settings_tab_slack_woocommerce_channel' );
-			$this->slack_message($message, "Payeezy Gateway Environment set to Demo", $channel, $icon);
-		}
-		else if($settings['environment']=='production') {
-			if(get_option('woocommerce_pe_testmode')=='true'){
-				$message 	= "Production website's Payeezy Gateway Environment is set to Production";
-				$icon 	= ":heavy_check_mark:";
-				$channel 	= get_option( 'wc_settings_tab_slack_woocommerce_channel' );
-				$this->slack_message($message, "Payeezy Environment set to Production", $channel, $icon);
-			}
-			update_option( 'woocommerce_pe_testmode', 'false');
-		}
 
-		if($settings['enabled']=='no' && get_option('woocommerce_pe_enabled')!='false'){
-			update_option( 'woocommerce_pe_enabled', 'false');
-			$message 	= "WARNING: Production website's Payeezy Gateway is not enabled";
-			$icon 	= ":warning:";
-			$channel 	= get_option( 'wc_settings_tab_slack_woocommerce_channel' );
-			$this->slack_message($message,  "Payeezy disabled", $channel, $icon);
-		}
-		else if($settings['enabled']=='yes'){
-			if(get_option('woocommerce_pe_enabled')=='false'){
-				$message 	= "Production website's Payeezy Gateway is enabled";
-				$icon 	= ":heavy_check_mark:";
-				$channel 	= get_option( 'wc_settings_tab_slack_woocommerce_channel' );
-				$this->slack_message($message, "Payeezy Gateway enabled", $channel, $icon);
-			}
-			update_option( 'woocommerce_pe_enabled', 'true');
-		}
+	/**
+	 * Retrieves the ID of the most recent WooCommerce order.
+	 *
+	 * @return int|null The ID of the last order or null if no orders are found.
+	 */
+	public function get_last_order_id()
+	{
+		global $wpdb;
 
-		
-	}
-	public function clickandpledge_activate(){
-		$message 	= " Production website's Click and Pledge Gateway is active!";
-		$icon 		= ":heavy_check_mark:";
-		$channel 	= get_option( 'wc_settings_tab_slack_woocommerce_channel' );
-		self::slack_message($message, "Click and Pledge Active", $channel, $icon);
-	}
-	public function clickandpledge_deactivate(){
-		$message 	= "WARNING: Production website's Click and Pledge Gateway is in not active!";
-		$icon 		= ":warning:";
-		$channel 	= get_option( 'wc_settings_tab_slack_woocommerce_channel' );
-		self::slack_message($message, "Click and Pledge Inactive", $channel, $icon);
-	}
-	public function clickandpledge_testmode_check() {
-		if( is_wpe()) {
-			$settings 	= get_option('woocommerce_clickandpledge_settings');
-			$p_settings = get_option('woocommerce_clickandpledge_paymentsettings');
-
-			if($p_settings['testmode']=='yes'){
-				update_option( 'woocommerce_cp_testmode', 'true');
-				$message 	= "WARNING: Production website's Click and Pledge Gateway is in Testmode";
-				$icon 	= ":warning:";
-				$channel 	= get_option( 'wc_settings_tab_slack_woocommerce_channel' );
-				self::slack_message($message, "Click and Pledge in Testmode", $channel, $icon);
-			}
-			else {
-				if(get_option('woocommerce_cp_testmode')=='true'){
-					$message 	= "Production website's Click and Pledge Gateway is in Production";
-					$icon 	= ":heavy_check_mark:";
-					$channel 	= get_option( 'wc_settings_tab_slack_woocommerce_channel' );
-					self::slack_message($message, "Click and Pledge in Production", $channel, $icon);
-				}
-				update_option( 'woocommerce_cp_testmode', 'false');
-			}
-			
-			if($p_settings['enabled']=='yes'){
-				if(get_option('woocommerce_cp_enabled')=='false'){
-					$message 	= "Production website's Click and Pledge Gateway is enabled";
-					$icon 	= ":heavy_check_mark:";
-					$channel 	= get_option( 'wc_settings_tab_slack_woocommerce_channel' );
-					self::slack_message($message, "Click and Pledge enabled", $channel, $icon);
-				}
-				update_option( 'woocommerce_cp_enabled', 'true');
-				
-			}
-			else{
-				update_option( 'woocommerce_cp_enabled', 'false');
-				$message 	= "WARNING: Production website's Click and Pledge Gateway is not enabled";
-				$icon 	= ":warning:";
-				$channel 	= get_option( 'wc_settings_tab_slack_woocommerce_channel' );
-				self::slack_message($message,  "Click and Pledge disabled", $channel, $icon);
-			}
-			
-		}
-		
-	}
-	public static function enqueue_scripts() {
-?>
-<script>
-jQuery(window).ready(function(){
-	jQuery("#test_slack").click(function() {
-		jQuery.ajax({
-				type : 		"post",
-			url : 		'admin-ajax.php',
-			data : {
-				action: 		"test_slack"
-			},
-			success: function(response) {
-				console.log(response);
-			}
-		}); 
-	});
-});
-</script>
-<?php
-	}
-	public function get_last_order_id(){
-	    global $wpdb;
-	    $statuses = array_keys(wc_get_order_statuses());
-	    $statuses = implode( "','", $statuses );
+		// Get all WooCommerce order statuses
+		$orderStatuses = array_keys(wc_get_order_statuses());
+		$formattedStatuses = implode("','", $orderStatuses);
+
+		// Construct the query to find the latest order ID
 		$query = "
-		   SELECT MAX(ID) FROM {$wpdb->prefix}posts
-		   WHERE post_type LIKE 'shop_order'
-		   AND post_status IN ('$statuses')
-	    ";
-	    // Getting last Order ID (max value)
-	    $results = $wpdb->get_col($query);
-	    return reset($results);
+			SELECT MAX(ID) FROM {$wpdb->prefix}posts
+			WHERE post_type = 'shop_order'
+			AND post_status IN ('$formattedStatuses')
+		";
+
+		// Execute the query and get the result
+		$result = $wpdb->get_col($query);
+
+		// Return the first element in the result or null if empty
+		return reset($result);
 	}
-	public static function test_slack() {
-		
-		$order_id = self::get_last_order_id();
-		$order = wc_get_order( $order_id );
-		if($order->status=='processing' || $order->status=='completed'){
-			$icon	= get_option( 'wc_settings_tab_slack_woocommerce_slack_icon_completed' );
-			$status 	= "completed";
+
+
+	/**
+	 * Sends a test message to Slack about the latest WooCommerce order.
+	 *
+	 * This function checks the status of the latest order and sends a test message to Slack
+	 * indicating if the order is completed or cancelled.
+	 */
+	public function test_slack()
+	{
+		// Retrieve the ID of the latest order
+		$latestOrderId = $this->get_last_order_id();
+		$order = wc_get_order($latestOrderId);
+		$orderStatus = $order->get_status();
+
+		// Determine the icon and status for the Slack message
+		if (in_array($orderStatus, ['processing', 'completed'])) {
+			$icon = get_option('wc_settings_tab_slack_woocommerce_slack_icon_completed');
+			$status = "completed";
+		} else {
+			$icon = get_option('wc_settings_tab_slack_woocommerce_slack_icon_cancelled');
+			$status = "cancelled";
 		}
-		else {
-			$icon	= get_option( 'wc_settings_tab_slack_woocommerce_slack_icon_cancelled' );
-			$status 	= "cancelled";
+
+		// Get product details from the order
+		$productDetails = '';
+		$orderItems = $order->get_items();
+		if (count($orderItems) == 1) {
+			foreach ($orderItems as $item) {
+				$productDetails = $item->get_data();
+			}
 		}
-		
-		$order_items = $order->get_items();
-		if( count($order_items)==1){
-			foreach ( $order_items  as $item_id => $item ) {
-				 $product = $item->get_data(); 
-			} 
+
+		// Construct the Slack message
+		$customerName = $order->data['billing']['first_name'] . " " . $order->data['billing']['last_name'];
+		$formattedTotal = number_format($order->data['total'], 2);
+		$message = "";
+		if (isset($productDetails['name'])) {
+			$message = "{$productDetails['name']}\n";
 		}
-		
-		$message = $product['name']." 
-Order *#".$order->ID."* by *".$order->data['billing']['first_name']." ".$order->data['billing']['last_name']."* for *$".number_format($order->data['total'],2)."* has been ".$status;
-		
-		$channel 	= "#".get_option( 'wc_settings_tab_slack_woocommerce_channel' );
-
-	
-		self::slack_message($message, "Order ".ucfirst($order->status). " TEST", $channel, $icon);
-		
-		wp_die();	
-	}
-	public static function update_settings() {
-	    woocommerce_update_options(  self::get_settings() );
-	}
-	public static function settings_tab() {
-		woocommerce_admin_fields( self::get_settings() );
-	}
-	public static function get_settings() {
-	    $settings = array(
-		   'section_title' => array(
-			  'name'     => __( 'Slack Notifications', 'wp-slack-woocommerce' ),
-			  'type'     => 'title',
-			  'desc'     => '',
-			  'id'       => 'wc_settings_tab_slack_woocommerce_title'
-		   ),
-		   'notifications_enable' => array(
-			  'name' => __( 'Enable Notifications', 'wp-slack-woocommerce' ),
-			  'type' => 'checkbox',
-			  'desc' => __( 'Enable Slack Notifications using the settings below', 'wp-slack-woocommerce' ),
-			  'id'   => 'wc_settings_tab_slack_woocommerce_enable_notifications'
-		   ),
-		   
-		   'title' => array(
-			  'name' => __( 'Slack Token', 'wp-slack-woocommerce' ),
-			  'type' => 'text',
-			  'desc' => __( '', 'wp-slack-woocommerce' ),
-			  'id'   => 'wc_settings_tab_slack_token'
-		   ),
-		   'channel' => array(
-			  'name' => __( 'Slack Channel', 'wp-slack-woocommerce' ),
-			  'type' => 'text',
-			  'desc' => __( '', 'wp-slack-woocommerce' ),
-			  'id'   => 'wc_settings_tab_slack_woocommerce_channel'
-		   ),
-		   'icon-confirm' => array(
-			  'name' => __( 'Confirmed Icon', 'wp-slack-woocommerce' ),
-			  'type' => 'text',
-			  'desc' => __( '', 'wp-slack-woocommerce' ),
-			  'id'   => 'wc_settings_tab_slack_woocommerce_slack_icon_completed'
-		   ),
-		   'icon-cancel' => array(
-			  'name' => __( 'Cancelled Icon', 'wp-slack-woocommerce' ),
-			  'type' => 'text',
-			  'desc' => __( '', 'wp-slack-woocommerce' ),
-			  'id'   => 'wc_settings_tab_slack_woocommerce_slack_icon_cancelled'
-		   ),
-			'icon-fail' => array(
-			  'name' => __( 'Failed Icon', 'wp-slack-woocommerce' ),
-			  'type' => 'text',
-			  'desc' => __( '', 'wp-slack-woocommerce' ),
-			  'id'   => 'wc_settings_tab_slack_woocommerce_slack_icon_failed'
-		   ),
-		   'test_slack' => array(
-			  'name'     => __( '', 'wp-slack-woocommerce' ),
-			  'type'     => 'title',
-			  'desc'     => '<a href="#" id="test_slack">Test slack</a>',
-			  'id'       => 'wc_settings_tab_slack_test_slack'
-		   ),
-		   'section_end' => array(
-			   'type' => 'sectionend',
-			   'id' => 'wc_settings_tab_slack_woocommerce_end'
-		   )
-	    );
-	    return apply_filters( 'wc_settings_tab_slack_woocommerce', $settings );
-	}
-	public static function woo_new_section_tabs( $sections ) {
-		$sections['settings_slack_woocommerce'] = __( 'Slack Notifications', 'wp-slack-woocommerce' );
-		return $sections;
+		$message .= "Order *#{$order->ID}* by *{$customerName}* for *{$formattedTotal}* has been {$status}";
+
+		// Retrieve Slack channel setting and send the message
+		$channel = "#" . get_option('wc_settings_tab_slack_woocommerce_channel');
+		$this->slack_message($message, "Order " . ucfirst($orderStatus) . " TEST", $channel, $icon);
+
+		// Terminate execution
+		wp_die();
 	}
-	public function rfvc_update_order_status( $order_status, $order_id ) {
-		$order = new WC_Order( $order_id );
-		if ( 'processing' == $order_status && ( 'on-hold' == $order->status || 'pending' == $order->status || 'failed' == $order->status ) ) {
+
+	/**
+	 * Updates the order status to 'completed' if certain conditions are met.
+	 *
+	 * @param string $current_status The current status of the order.
+	 * @param int $order_id The ID of the WooCommerce order.
+	 * @return string The updated order status.
+	 */
+	public function rfvc_update_order_status($current_status, $order_id)
+	{
+		// Create an instance of the WooCommerce Order
+		$order = new WC_Order($order_id);
+
+		// Define the statuses that allow changing to 'completed'
+		$allowed_statuses = ['on-hold', 'pending', 'failed'];
+
+		// Check if the current status is 'processing' and the order's status is one of the allowed statuses
+		if ($current_status === 'processing' && in_array($order->status, $allowed_statuses)) {
+			// Update status to 'completed'
 			return 'completed';
 		}
-		return $order_status;
+
+		// Return the original status if conditions are not met
+		return $current_status;
 	}
-	public function post_status_change($new_status, $old_status, $post)  {
-		$channel 	= "#".get_option( 'wc_settings_tab_slack_woocommerce_channel' );
-		if ( 'shop_order' === $post->post_type) {
-			
-			if($new_status == "wc-cancelled")  {
-			
-			}
-			else if($new_status == 'wc-processing'){
-				
-			}
-			else if($new_status == 'wc-pending' && $old_status =='new') {
-				$this->slack_message($message, "Marketplace Purchase", $channel);
-			}	
+
+	/**
+	 * Sends a message to a specified Slack channel.
+	 *
+	 * @param string $message The message to be sent to Slack.
+	 * @param string $username The username to be displayed in Slack.
+	 * @param string $channel The channel where the message will be posted.
+	 * @param string $icon Emoji icon to represent the user (default is robot face emoji).
+	 * @return mixed The result of the Slack API call.
+	 */
+	public static function slack_message($message, $username, $channel, $icon = ":robot_face:")
+	{
+		$slackToken = get_option('wc_settings_tab_slack_token');
+		$slackUrl = "https://slack.com/api/chat.postMessage";
+
+		// Prepare the data for POST request
+		$postData = http_build_query([
+			"token" => $slackToken,
+			"channel" => $channel,
+			"text" => $message,
+			"username" => $username,
+			"icon_emoji" => $icon,
+		]);
+
+		// Initialize cURL session
+		$curl = curl_init($slackUrl);
+
+		// Set cURL options
+		curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'POST');
+		curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+
+		// Execute cURL session and close
+		$result = curl_exec($curl);
+		if ($result === false) {
+			$result = 'cURL Error: ' . curl_error($curl);
 		}
-	}
-	public static function slack_message($message, $username, $channel, $icon = ":robot_face:")	{	
-		$token = get_option( 'wc_settings_tab_slack_token' );
-		$ch = curl_init("https://slack.com/api/chat.postMessage");
-		$data = http_build_query(array(
-			"token" 		=> $token,
-			"channel"		=> $channel, //"#mychannel",
-			"text" 		=> $message, //"Hello, Foo-Bar channel message.",
-			"username" 	=> $username,
-			"icon_emoji"	=> $icon,
-		));
-		
-		
-		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-		$result = curl_exec($ch);
-		curl_close($ch);
-	
-		// echo $result;
-	
+		curl_close($curl);
+
 		return $result;
-		
-		
 	}
-	public function mysite_woocommerce_order_status_completed( $order_id ) {
+
+	public function mysite_woocommerce_order_status_completed($order_id)
+	{
 		$this->woocommerce_order_status_report($order_id, 'completed');
 	}
-	public function mysite_woocommerce_order_status_cancelled( $order_id ) {
+	public function mysite_woocommerce_order_status_cancelled($order_id)
+	{
 		$this->woocommerce_order_status_report($order_id, 'cancelled');
 	}
-	public function mysite_woocommerce_order_status_failed( $order_id ) {
+	public function mysite_woocommerce_order_status_failed($order_id)
+	{
 		$this->woocommerce_order_status_report($order_id, 'failed');
 	}
-	public function woocommerce_order_status_report($order_id, $status){
-		$order = wc_get_order( $order_id );
+
+	/**
+	 * Sends a report to Slack about WooCommerce order status.
+	 *
+	 * @param int $order_id The ID of the WooCommerce order.
+	 * @param string $status The new status of the order.
+	 * @return void
+	 */
+	public function woocommerce_order_status_report($order_id, $status)
+	{
+		// Retrieve order and order items
+		$order = wc_get_order($order_id);
 		$order_items = $order->get_items();
-		if( count($order_items)==1){
-			foreach ( $order_items  as $item_id => $item ) {
-				 $product = $item->get_data();
-			} 
-		}
-		
-		$hasbeen = 'has been';
-		if($status=='failed'){
-			$hasbeen = 'has';
+
+		// Initialize product name
+		$product_name = "";
+
+		// Extract product name if only one item in order
+		if (count($order_items) == 1) {
+			foreach ($order_items as $item) {
+				$product_data = $item->get_data();
+				$product_name = preg_replace("# - Other#", "", $product_data['name']);
+			}
 		}
-		$product_name = preg_replace("# - Other#", "",$product['name'] );
-		$message = $product_name."  
-Order  *#".$order->ID."* by *".$order->data['billing']['first_name']." ".$order->data['billing']['last_name']."* for *$".number_format($order->data['total'],2)."* ".$hasbeen." ".$status;
-		$channel 	= "#".get_option( 'wc_settings_tab_slack_woocommerce_channel' );
-		if(get_option( 'wc_settings_tab_slack_woocommerce_slack_icon_'.$status)){
-			$icon	= get_option( 'wc_settings_tab_slack_woocommerce_slack_icon_'.$status);
+
+		// Edge case: if no product is found, return or handle accordingly
+		if (empty($product_name)) {
+			return; // or handle as needed
 		}
-		$this->slack_message($message, "Order ".ucfirst($status), $channel, $icon);
+
+		// Determine the status phrasing
+		$hasbeen = $status == 'failed' ? 'has' : 'has been';
+
+		// Format the order total
+		$formatted_total = number_format($order->data['total'], 2);
+
+		// Construct the message
+		$customer_name = $order->data['billing']['first_name'] . " " . $order->data['billing']['last_name'];
+		$message = "{$product_name}\nOrder *#{$order->ID}* by *{$customer_name}* for *${formatted_total}* {$hasbeen} {$status}";
+
+		// Retrieve Slack channel and icon settings
+		$channel = "#" . get_option('wc_settings_tab_slack_woocommerce_channel');
+		$icon = get_option('wc_settings_tab_slack_woocommerce_slack_icon_' . $status);
+
+		// Send the message to Slack
+		$this->slack_message($message, "Order " . ucfirst($status), $channel, $icon);
 	}
+
 }
 $wp_slack_woocommerce = new wp_slack_woocommerce;
 $wp_slack_woocommerce->init();