Update version number to 6.18

Adjustments to how previous months top voters are loaded
Change command from previousmonthsvoters to previousmonthstotals
2026-11-04 09:02:00 -05:00 · 2024-12-16 20:21:37 -06:00 · 2024-12-16 17:34:47 -06:00 · 2024-12-16 16:29:38 -06:00 · 2024-12-14 16:50:05 -06:00 · 2024-12-13 12:43:15 -06:00
72 changed files with 2311 additions and 1183 deletions
@@ -129,6 +129,9 @@ Format:
      # If you want to want to use the feature below where the plugin will
      # automaticly list the sites then set the message in the text above
      AutoInputSites: true
+      
+      # If true only show links on all urls that need to be voted on still
+      OnlyShowSitesToVote: false
      # For each VoteSite
      # make sure to set VoteURL in your VoteSites
      # Requires above to be true
@@ -463,6 +466,9 @@ UseJavascriptPlaceholders: false
 #    'false': 'User does not have enough points'
 CustomPlaceholderReturns: {}

+# Load votingplugin internal expansion
+LoadInteralExpansion: true
+
 ###########################################
 # Login options
 ###########################################
@@ -552,6 +558,8 @@ CreateBackups: true
 AutoDownload: false

 # If false plugin will use offline player UUIDs
+# Keep enabled when mixing uuids (Premium and cracked)
+# More info: https://github.com/BenCodez/VotingPlugin/wiki/Online-Offline-Mode
 OnlineMode: true

 # Disable checking on world change
@@ -574,12 +582,35 @@ OfflineVotesLimit:
  # Limit of votes per votesite
  Amount: 5
  
+# Maxium amount of vote points possible, -1 to disable
+LimitVotePoints: -1
+  
 # Default worlds set for all rewards
 DefaultRewardWorlds: []

 # Default blackedlisted worlds set for all rewards
 DefaultRewardBlackListedWorlds: []

+###########################################
+# Month Date Totals
+# Experimental feature
+###########################################
+
+# Experimental
+# Stores month votes with date formatting
+# MonthTotal-MONTH-YEAR
+# This setting only enables setting totals, not using them
+# Enabling this is pretty safe and harmless with just this setting
+# Essentially will just copy MonthTotal to MonthTotal-MONTH-YEAR
+# Can use command /vote PreviousMonthsVoters after this is enabled
+StoreMonthTotalsWithDate: false
+
+# Experimental
+# This setting uses month votes with date formatting
+# If using this StoreMonthTotalsWithDate must be enabled
+# This setting may be very buggy as it's in early stages
+UseMonthDateTotalsAsPrimaryTotal: false
+
 ###########################################
 # Skull settings
 ###########################################
@@ -587,12 +618,19 @@ DefaultRewardBlackListedWorlds: []
 # Preload skulls to improve performance for vote top
 # when using skulls as the item to display players
 # If false, skulls will be cached as they are used
-# assuming loadskulls is enabled
-PreloadSkulls: false
+PreloadSkulls: true

-# Setting to false disables saving skulls in a cache to improve speeds
-# Will reduce ram usage (very little) if disabled, but slow GUI speeds when using skulls
-LoadSkulls: true
+# Number of miliseconds between skull caching
+# Default about 3 seconds is good for most servers
+# Used to avoid rate limit, increase if needed
+# If rate limit is hit caching will pause for 15 minutes
+SkullLoadDelay: 3000
+
+# Set a skull profile URL
+# This is what gets used to cache skulls
+# Default: https://sessionserver.mojang.com/session/minecraft/profile/
+# Other examples: https://crafthead.net/profile/
+SkullProfileAPIURL: ''

 ###########################################
 # Extra checks on vote
@@ -705,7 +743,7 @@ ExtraBackgroundUpdate: false
 # Click sound when using gui
 # Set to none for no sound
 ClickSound: 
-  Sound: 'UI_BUTTON_CLICK'
+  Sound: 'ui.button.click'
  Volume: 1.0
  Pitch: 1.0

@@ -735,9 +773,20 @@ CloseGUIOnShiftClick: false
 # Purge settings
 ###########################################
 # Remove old player files
-# Happens on startup or /av purge
+# Recommend leaving this disabled
+# When disabled it also disables the commands to manually purge
 PurgeOldData: false

+# Enable auto purging data on startup
+# Do not enable unless you know what you are doing
+# Purges players with vote totals
+# Requires PurgeOldData to be enabled
+PurgeDataOnStartup: false
+
+# Same as above, but checks players have no vote total before purging
+# Requires PurgeOldData to be enabled
+PurgeNoDataOnStartup: false
+
 # Minimum number of days offline in order to purge
 PurgeMin: 90

@@ -287,7 +287,6 @@ CHEST:
    Name: 'VoteSite: %site%'
  VoteGUIName: '&cVoteGUI: &c&l%player%'
  VoteRewardName: 'VoteReward'
-  VoteShopName: 'VoteShop'
  
  BackButton:
    Material: 'BARRIER'
@@ -300,78 +299,8 @@ CHEST:
    EndOfGUI: false
    # If true, this item will become an exit button instead
    Exit: false
-
-  VoteShopBackButton: true
-  VoteShopEnabled: true
-  # Hide items in vote shop which user can not buy
-  VoteShopHideLimitedReached: true
-  # Requires above to be false
-  VoteShopLimitReached: '&aYou reached your limit'
-  VoteShopRequireConfirmation: false
-  VoteShopDisabled: '&cVote shop disabled'
-  # If true, shop gui will reopen, updating all placeholders
-  VoteShopReopenGUIOnPurchase: false
-  # VoteShop extra items for display only
-  #VoteShopExtraItems:
-    #Item:
-      #...
-  Shop:
-    # Identifier
-    # Used in placeholders for formats
-    # Do not have spaces in the identifier
-    # Change the identifier for each shop item
-    Diamond:
-      Identifier_Name: 'Diamond'
-      # Item
-      Material: 'DIAMOND'
-      Amount: 1
-      Name: '&4Buy A Diamond'
-      # You can set skulls of the player using the following
-      # Remove the # to enable
-      #Skull: '%Player%'
-      Lore:
-      - '&c&lCost: &c3 Voting Points'
-      # Number of voting points this cost
-      Cost: 3
-      # Permission required, leave blank for no permission
-      Permission: ''
-      # Hide if player doesn't have permission (only if permission is set)
-      HideOnNoPermission: true
-      # Whether or not to keep GUI open after purchase
-      CloseGUI: true
-      # Require confirmation on purchase, overrides global option above
-      RequireConfirmation: false
-      # Overrides other purchase message
-      #PurchaseMessage: 'Thanks for the purchase'
-      # Limit how many times you can buy this
-      #Limit: 3
-      # Reset limit daily/weekly/monthly
-      #Reset:
-        #Daily: false
-        #Weekly: false
-        #Monthly: false
-      # If true, item is not buyable
-      #NotBuyable: false
-      # Rewards to run if player buys successfully
-      Rewards:
-        # Run command on purchase
-        #Commands:
-        #- 'command here'
-        Items:
-          Diamond:
-            Material: 'DIAMOND'
-            Amount: 1    
-
-  ShopConfirmPurchase:
-    Title: 'Confirm Purchase?'
-    YesItem:
-      Material: EMERALD_BLOCK
-      Amount: 1
-      Name: '&aYes'
-    NoItem:
-      Material: BARRIER
-      Amount: 1
-      Name: '&cNo'
+    
+  # VoteShop settings moved to Shop.yml for 6.17 (To be released)
    
            
 BOOK:
@@ -0,0 +1,77 @@
+VoteShop:
+  Enabled: true
+  Name: 'VoteShop'
+  BackButton: true
+  # Hide items in vote shop which user can not buy
+  HideLimitedReached: true
+  # Requires above to be false
+  LimitReached: '&aYou reached your limit'
+  RequireConfirmation: false
+  Disabled: '&cVote shop disabled'
+  # If true, shop gui will reopen, updating all placeholders
+  ReopenGUIOnPurchase: false
+  
+Shop:
+  # Identifier
+  # Used in placeholders for formats
+  # Do not have spaces in the identifier
+  # Change the identifier for each shop item
+  Diamond:
+    Identifier_Name: 'Diamond'
+    # Item
+    Material: 'DIAMOND'
+    Amount: 1
+    Name: '&4Buy A Diamond'
+    # You can set skulls of the player using the following
+    # Remove the # to enable
+    #Skull: '%Player%'
+    Lore:
+    - '&c&lCost: &c3 Voting Points'
+    # Number of voting points this cost
+    Cost: 3
+    # Permission required, leave blank for no permission
+    Permission: ''
+    # Hide if player doesn't have permission (only if permission is set)
+    HideOnNoPermission: true
+    # Whether or not to keep GUI open after purchase
+    CloseGUI: true
+    # Require confirmation on purchase, overrides global option above
+    RequireConfirmation: false
+    # Overrides other purchase message
+    #PurchaseMessage: 'Thanks for the purchase'
+    # Limit how many times you can buy this
+    #Limit: 3
+    # Reset limit daily/weekly/monthly
+    #Reset:
+      #Daily: false
+      #Weekly: false
+      #Monthly: false
+    # If true, item is not buyable
+    #NotBuyable: false
+    # Rewards to run if player buys successfully
+    Rewards:
+      # Run command on purchase
+      #Commands:
+      #- 'command here'
+      Items:
+        Diamond:
+          Material: 'DIAMOND'
+          Amount: 1    
+            
+# VoteShop extra items for display only
+#ExtraItems:
+  #ItemIdentifier:
+    #...
+      
+ShopConfirmPurchase:
+  Title: 'Confirm Purchase?'
+  YesItem:
+    Material: EMERALD_BLOCK
+    Amount: 1
+    Name: '&aYes'
+  NoItem:
+    Material: BARRIER
+    Amount: 1
+    Name: '&cNo'
+      
+      
@@ -65,7 +65,7 @@ VoteParty:
  # Number of votes required to give rewards
  VotesRequired: 20
  # Increase the amount of votes required on each vote party reached
-  #IncreaseVotesRquired: 10
+  #IncreaseVotesRequired: 10
  # If true, players who did not vote to reach the votes required will 
  # recieve the reward
  # If false, only players who voted get rewards
@@ -97,7 +97,7 @@ VoteParty:
  Broadcast: '&cReached the vote party amount!'
  # Send a broadcast at a certain number of votes left and send a vote reminder
  VoteReminderBroadcast: '%votesrequired% left to go, go vote!'
-  # List of votes required amounts for when to send vote party reminders
+  # Send vote reminder at number of votes to go
  VoteReminderAtVotes: []
  # List of commands to execute, these only execute once.
  # %player% does not work here
@@ -60,6 +60,10 @@ VoteSites:
    # This basiclly disables offline voting if set to true, don't misinterpret this option
    ForceOffline: false
    
+    # Requrie a permission to view site in GUI
+    # If empty or not set anyone can view (default)
+    #PermissionToView: 'Perm.here'
+    
    # VoteSite Material for some GUI's
    # Removing this may result in an error, required on each site
    DisplayItem:
@@ -128,6 +128,9 @@ VoteCacheTime: -1
 # Set to -1 to disable
 MaxAmountOfVotesPerDay: -1

+# Maxium amount of vote points possible, -1 to disable
+LimitVotePoints: -1
+
 VoteParty:
  # If enabled, will trigger vote party reward 
  # in BungeeSettings.yml under BungeeVotePartyReward
@@ -148,8 +151,32 @@ VoteParty:
  
 # Online mode for UUIDS
 # Offline mode setups are not fully tested and are not supported currently
+# If using mixed uuids (premium and cracked players leave this enabled and disable UUIDLookup below)
+# More details here: https://github.com/BenCodez/VotingPlugin/wiki/Online-Offline-Mode
 OnlineMode: true

+# If true plugin will atempt to lookup uuids if none exist
+UUIDLookup: true
+
+###########################################
+# Month Date Totals
+# Experimental feature
+# Settings must match on backend servers
+###########################################
+
+# Experimental
+# Stores month votes with date formatting
+# MonthTotal-MONTH-YEAR
+# This setting only enables setting totals, not using them
+# Enabling this is pretty safe and harmless with just this setting
+StoreMonthTotalsWithDate: false
+
+# Experimental
+# This setting uses month votes with date formatting
+# If using this StoreMonthTotalsWithDate must be enabled
+# This setting may be very buggy as it's in early stages
+UseMonthDateTotalsAsPrimaryTotal: false
+
 ##########################################
 # PLUGINMESSAGING Settings
 ##########################################
@@ -54,9 +54,6 @@ commands:
  voteurl:
    description: Open VoteURL
    aliases: vurl
-  votereward:
-    description: Open VoteReward GUI
-    aliases: vreward
  voteparty:
    description: A command
    aliases: vparty
@@ -1,14 +1,18 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
-	<artifactId>${version.art}</artifactId>
-	<version>6.16</version>
+	<artifactId>votingplugin</artifactId>
+	<version>6.18</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
 		<github.global.server>github</github.global.server>
 		<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
 		<build.number>NOTSET</build.number>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 	</properties>
 	<build>
 		<resources>
@@ -56,16 +60,6 @@
 			</plugins>
 		</pluginManagement>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.4.1</version>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-					<finalName>${project.name}</finalName>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.projectlombok</groupId>
 				<artifactId>lombok-maven-plugin</artifactId>
@@ -88,7 +82,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.5.3</version>
+				<version>3.6.0</version>
 				<configuration>
 					<shadedArtifactAttached>false</shadedArtifactAttached>
 					<minimizeJar>true</minimizeJar>
@@ -101,9 +95,20 @@
 						</filter>
 					</filters>
 					<relocations>
+						<relocation>
+							<pattern>com.tcoded.folialib</pattern>
+							<shadedPattern>
+								${project.groupId}.votingplugin.simpleapi.folialib</shadedPattern>
+						</relocation>
+						<relocation>
+							<pattern>com.bencodez.simpleapi</pattern>
+							<shadedPattern>
+								${project.groupId}.votingplugin.simpleapi</shadedPattern>
+						</relocation>
 						<relocation>
 							<pattern>com.bencodez.advancedcore</pattern>
-							<shadedPattern>${project.groupId}.votingplugin.advancedcore</shadedPattern>
+							<shadedPattern>
+								${project.groupId}.votingplugin.advancedcore</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>net.pl3x.bukkit.chatapi</pattern>
@@ -111,24 +116,30 @@
 						</relocation>
 						<relocation>
 							<pattern>me.mrten.mysqlapi</pattern>
-							<shadedPattern>${project.groupId}.votingplugin.mysqlapi</shadedPattern>
+							<shadedPattern>
+								${project.groupId}.votingplugin.mysqlapi</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>com.zaxxer.HikariCP</pattern>
-							<shadedPattern>${project.groupId}.votingplugin.HikariCP</shadedPattern>
+							<shadedPattern>
+								${project.groupId}.votingplugin.HikariCP</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>com.zaxxer.hikari</pattern>
-							<shadedPattern>${project.groupId}.votingplugin.hikari</shadedPattern>
+							<shadedPattern>
+								${project.groupId}.votingplugin.hikari</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>org.bstats</pattern>
-							<shadedPattern>${project.groupId}.votingplugin.bstats</shadedPattern>
+							<shadedPattern>
+								${project.groupId}.votingplugin.bstats</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>xyz.upperlevel.spigot</pattern>
-							<shadedPattern>${project.groupId}.votingplugin.advancedcore.xyz.upperlevel.spigot</shadedPattern>
+							<shadedPattern>
+								${project.groupId}.votingplugin.advancedcore.xyz.upperlevel.spigot</shadedPattern>
 						</relocation>
+
 					</relocations>
 				</configuration>
 				<executions>
@@ -139,7 +150,8 @@
 						</goals>
 						<configuration>
 							<artifactSet>
-								<!-- Lets exclude google code, because the server already has this 
+								<!-- Lets exclude google code, because the
+								server already has this 
 									code in it (guava, etc) -->
 								<excludes>
 									<exclude>com.google.*:*</exclude>
@@ -160,31 +172,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.3.1</version>
-				<executions>
-					<execution>
-						<id>copy-resources</id>
-						<phase>install</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${user.home}/Documents/Test Server/plugins</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${basedir}/target</directory>
-									<includes>
-										<include>VotingPlugin.jar</include>
-									</includes>
-								</resource>
-							</resources>
-							<overwrite>true</overwrite>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 	<repositories>
@@ -214,26 +201,27 @@
 		</repository>
 		<repository>
 			<id>placeholderapi</id>
-			<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+			<url>
+				https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
 		</repository>
 	</repositories>
 	<dependencies>
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.20.6-R0.1-SNAPSHOT</version>
+			<version>1.21.4-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.32</version>
+			<version>1.18.36</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.md-5</groupId>
 			<artifactId>bungeecord-api</artifactId>
-			<version>1.20-R0.2</version>
+			<version>1.20-R0.3-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -251,91 +239,59 @@
 		<dependency>
 			<groupId>com.velocitypowered</groupId>
 			<artifactId>velocity-api</artifactId>
-			<version>3.1.1</version>
+			<version>3.1.2-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.bstats</groupId>
 			<artifactId>bstats-velocity</artifactId>
-			<version>3.0.2</version>
+			<version>3.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>me.clip</groupId>
 			<artifactId>placeholderapi</artifactId>
-			<version>2.11.5</version>
+			<version>2.11.6</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.bencodez</groupId>
+			<artifactId>advancedcore</artifactId>
+			<version>3.7.12</version>
+			<scope>compile</scope>
+		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
-			<id>normal</id>
+			<id>default</id>
+			<properties>
+				<build.profile.id>default</build.profile.id>
+			</properties>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
-			<properties>
-				<build.profile.id>normal</build.profile.id>
-				<version.art>votingplugin</version.art>
-				<maven.compiler.source>1.8</maven.compiler.source>
-				<maven.compiler.target>1.8</maven.compiler.target>
-			</properties>
-			<dependencies>
-				<dependency>
-					<groupId>com.bencodez</groupId>
-					<artifactId>advancedcore</artifactId>
-					<version>LATEST</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>normal-folia</id>
-			<properties>
-				<build.profile.id>normal</build.profile.id>
-				<version.art>votingplugin-folia</version.art>
-				<maven.compiler.source>17</maven.compiler.source>
-				<maven.compiler.target>17</maven.compiler.target>
-			</properties>
-			<dependencies>
-				<dependency>
-					<groupId>com.bencodez</groupId>
-					<artifactId>advancedcore-folia</artifactId>
-					<version>LATEST</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>prod2</id>
-			<properties>
-				<version.art>votingplugin</version.art>
-				<maven.compiler.source>1.8</maven.compiler.source>
-				<maven.compiler.target>1.8</maven.compiler.target>
-				<build.profile.id>prod2</build.profile.id>
-			</properties>
-			<distributionManagement>
-				<repository>
-					<id>internal.repo</id>
-					<name>Temporary Staging Repository</name>
-					<url>file://${project.build.directory}/mvn-repo</url>
-				</repository>
-			</distributionManagement>
-			<dependencies>
-				<dependency>
-					<groupId>com.bencodez</groupId>
-					<artifactId>advancedcore</artifactId>
-					<version>LATEST</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-jar-plugin</artifactId>
+						<version>3.4.2</version>
+						<configuration>
+							<archive>
+								<manifestEntries>
+									<paperweight-mappings-namespace>mojang</paperweight-mappings-namespace>
+								</manifestEntries>
+							</archive>
+							<finalName>${project.name}</finalName>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
 		</profile>
 		<profile>
 			<id>deploy-snapshot</id>
 			<properties>
-				<version.art>votingplugin</version.art>
-				<maven.compiler.source>1.8</maven.compiler.source>
-				<maven.compiler.target>1.8</maven.compiler.target>
-				<build.profile.id>deploy-snapshot</build.profile.id>
+				<build.profile.id>dev-snapshot</build.profile.id>
 			</properties>
 			<distributionManagement>
 				<snapshotRepository>
@@ -344,23 +300,67 @@
 				</snapshotRepository>
 				<repository>
 					<id>nexus</id>
-					<url>https://nexus.bencodez.com/repository/maven-snapshots/</url>
+					<url>https://nexus.bencodez.com/repository/maven-releases/</url>
 				</repository>
 			</distributionManagement>
-			<dependencies>
-				<dependency>
-					<groupId>com.bencodez</groupId>
-					<artifactId>advancedcore</artifactId>
-					<version>LATEST</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-jar-plugin</artifactId>
+						<version>3.4.2</version>
+						<configuration>
+							<archive>
+								<manifestEntries>
+									<paperweight-mappings-namespace>mojang</paperweight-mappings-namespace>
+								</manifestEntries>
+							</archive>
+							<finalName>
+								${project.name}</finalName>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>com.coderplus.maven.plugins</groupId>
+						<artifactId>copy-rename-maven-plugin</artifactId>
+						<version>1.0.1</version>
+						<executions>
+							<execution>
+								<id>copy-file</id>
+								<phase>install</phase>
+								<goals>
+									<goal>copy</goal>
+								</goals>
+								<configuration>
+									<sourceFile>
+										${project.basedir}/target/${project.name}.jar</sourceFile>
+									<destinationFile>
+										${project.basedir}/target/${project.name}-${build.number}.jar</destinationFile>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>3.11.1</version>
+						<executions>
+							<execution>
+								<id>attach-javadocs</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+								<phase>install</phase>
+								<configuration>
+									<sourcepath>
+										${project.basedir}/target/delombok</sourcepath>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>3.1.1</version>
+						<version>3.1.3</version>
 						<configuration>
 							<skip>true</skip>
 						</configuration>
@@ -368,11 +368,11 @@
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.13</version>
+						<version>1.7.0</version>
 						<executions>
 							<execution>
 								<id>default-deploy</id>
-								<phase>deploy</phase>
+								<phase>install</phase>
 								<goals>
 									<goal>deploy</goal>
 								</goals>
@@ -390,9 +390,6 @@
 		<profile>
 			<id>javadoc</id>
 			<properties>
-				<version.art>votingplugin</version.art>
-				<maven.compiler.source>1.8</maven.compiler.source>
-				<maven.compiler.target>1.8</maven.compiler.target>
 				<build.profile.id>javadoc</build.profile.id>
 			</properties>
 			<distributionManagement>
@@ -402,20 +399,25 @@
 					<url>file://${project.build.directory}/mvn-repo</url>
 				</repository>
 			</distributionManagement>
-			<dependencies>
-				<dependency>
-					<groupId>com.bencodez</groupId>
-					<artifactId>advancedcore</artifactId>
-					<version>LATEST</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-jar-plugin</artifactId>
+						<version>3.4.2</version>
+						<configuration>
+							<archive>
+								<manifestEntries>
+									<paperweight-mappings-namespace>mojang</paperweight-mappings-namespace>
+								</manifestEntries>
+							</archive>
+							<finalName>${project.name}</finalName>
+						</configuration>
+					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.6.3</version>
+						<version>3.11.1</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>
@@ -424,8 +426,79 @@
 								</goals>
 								<phase>deploy</phase>
 								<configuration>
-									<sourcepath>${project.basedir}/target/delombok</sourcepath>
-									<outputDirectory>${project.basedir}/target/apidocs</outputDirectory>
+									<sourcepath>
+										${project.basedir}/target/delombok</sourcepath>
+									<outputDirectory>
+										${project.basedir}/target/apidocs</outputDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>com.coderplus.maven.plugins</groupId>
+						<artifactId>copy-rename-maven-plugin</artifactId>
+						<version>1.0.1</version>
+						<executions>
+							<execution>
+								<id>copy-file</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>copy</goal>
+								</goals>
+								<configuration>
+									<sourceFile>
+										${project.basedir}/target/${project.name}.jar</sourceFile>
+									<destinationFile>
+										${project.basedir}/target/${project.name}-${project.version}.jar</destinationFile>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>dev</id>
+			<properties>
+				<build.profile.id>dev</build.profile.id>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-jar-plugin</artifactId>
+						<version>3.4.2</version>
+						<configuration>
+							<archive>
+								<manifestEntries>
+									<paperweight-mappings-namespace>mojang</paperweight-mappings-namespace>
+								</manifestEntries>
+							</archive>
+							<finalName>${project.name}</finalName>
+						</configuration>
+					</plugin>
+					<plugin>
+						<artifactId>maven-resources-plugin</artifactId>
+						<version>3.3.1</version>
+						<executions>
+							<execution>
+								<id>copy-resources</id>
+								<phase>install</phase>
+								<goals>
+									<goal>copy-resources</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>
+										${user.home}/Documents/Test_Server/plugins</outputDirectory>
+									<resources>
+										<resource>
+											<directory>${basedir}/target</directory>
+											<includes>
+												<include>VotingPlugin.jar</include>
+											</includes>
+										</resource>
+									</resources>
+									<overwrite>true</overwrite>
 								</configuration>
 							</execution>
 						</executions>
@@ -436,20 +509,8 @@
 		<profile>
 			<id>deploy</id>
 			<properties>
-				<version.art>votingplugin</version.art>
-				<maven.compiler.source>1.8</maven.compiler.source>
-				<maven.compiler.target>1.8</maven.compiler.target>
 				<build.profile.id>deploy</build.profile.id>
 			</properties>
-
-			<dependencies>
-				<dependency>
-					<groupId>com.bencodez</groupId>
-					<artifactId>advancedcore</artifactId>
-					<version>LATEST</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
 			<distributionManagement>
 				<snapshotRepository>
 					<id>nexus</id>
@@ -462,10 +523,43 @@
 			</distributionManagement>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-jar-plugin</artifactId>
+						<version>3.4.2</version>
+						<configuration>
+							<archive>
+								<manifestEntries>
+									<paperweight-mappings-namespace>mojang</paperweight-mappings-namespace>
+								</manifestEntries>
+							</archive>
+							<finalName>${project.name}</finalName>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>com.coderplus.maven.plugins</groupId>
+						<artifactId>copy-rename-maven-plugin</artifactId>
+						<version>1.0.1</version>
+						<executions>
+							<execution>
+								<id>copy-file</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>copy</goal>
+								</goals>
+								<configuration>
+									<sourceFile>
+										${project.basedir}/target/${project.name}.jar</sourceFile>
+									<destinationFile>
+										${project.basedir}/target/${project.name}-${project.version}.jar</destinationFile>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.6.3</version>
+						<version>3.11.1</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>
@@ -474,7 +568,8 @@
 								</goals>
 								<phase>deploy</phase>
 								<configuration>
-									<sourcepath>${project.basedir}/target/delombok</sourcepath>
+									<sourcepath>
+										${project.basedir}/target/delombok</sourcepath>
 								</configuration>
 							</execution>
 						</executions>
@@ -482,7 +577,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>3.1.1</version>
+						<version>3.1.3</version>
 						<configuration>
 							<skip>true</skip>
 						</configuration>
@@ -490,7 +585,7 @@
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.13</version>
+						<version>1.7.0</version>
 						<executions>
 							<execution>
 								<id>default-deploy</id>
@@ -506,33 +601,6 @@
 							<skipStaging>true</skipStaging>
 						</configuration>
 					</plugin>
-					<!--<plugin>
-						<groupId>com.github.github</groupId>
-						<artifactId>site-maven-plugin</artifactId>
-						<version>0.12</version>
-						<executions>
-							<execution>
-								<id>javadoc</id>
-								<goals>
-									<goal>site</goal>
-								</goals>
-								<phase>deploy</phase>
-								<configuration>
-									<message>Maven javadoc for ${project.version}</message>
-									<noJekyll>true</noJekyll>
-									<outputDirectory>${project.build.directory}/apidocs
-									</outputDirectory>
-									<branch>refs/heads/gh-pages</branch>
-									<includes>
-										<include>**/*</include>
-									</includes>
-									<repositoryName>VotingPlugin</repositoryName>
-									<repositoryOwner>BenCodez</repositoryOwner>
-									<server>github</server>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>-->
 				</plugins>
 			</build>
 		</profile>
@@ -1,31 +0,0 @@
-package com.Ben12345rocks.VotingPlugin.Objects;
-
-import org.bukkit.entity.Player;
-
-import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.user.VotingPluginUser;
-
-@Deprecated
-public class User {
-	private VotingPluginUser user;
-
-	public User(Player p) {
-		user = VotingPluginMain.plugin.getVotingPluginUserManager().getVotingPluginUser(p);
-	}
-
-	public void addPoints(int points) {
-		user.addPoints(points);
-	}
-
-	public int getPoints() {
-		return user.getPoints();
-	}
-
-	public boolean removePoints(int points) {
-		return user.removePoints(points);
-	}
-
-	public void setPoints(int points) {
-		user.setPoints(points);
-	}
-}
@@ -14,7 +14,6 @@ import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;

-import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.misc.encryption.EncryptionHandler;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
@@ -33,6 +32,7 @@ import com.bencodez.advancedcore.bungeeapi.redis.RedisListener;
 import com.bencodez.advancedcore.bungeeapi.sockets.ClientHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
+import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.bungee.BungeeVersion;
@@ -167,6 +167,8 @@ public class BungeeHandler implements Listener {
 				plugin.debug("Detected time change from bungee: " + type.toString());
 				plugin.getTimeChecker().forceChanged(type, false, true, true);
 				globalDataHandler.setBoolean(plugin.getBungeeSettings().getServer(), type.toString(), false);
+				getGlobalMessageHandler().sendMessage("TimeChangeFinished",
+						"" + plugin.getBungeeSettings().getServer());
 			}
 		}
 		return isProcessing;
@@ -226,6 +228,11 @@ public class BungeeHandler implements Listener {
 							public void debug(String text) {
 								plugin.debug(text);
 							}
+
+							@Override
+							public void info(String text) {
+								plugin.getLogger().info(text);
+							}
 						});
 			} else {
 				globalDataHandler = new GlobalDataHandler(
@@ -251,6 +258,11 @@ public class BungeeHandler implements Listener {
 							public void debug(String text) {
 								plugin.debug(text);
 							}
+
+							@Override
+							public void info(String text) {
+								plugin.getLogger().info(text);
+							}
 						});
 			}
 			globalDataHandler.getGlobalMysql().alterColumnType("IgnoreTime", "VARCHAR(5)");
@@ -285,14 +297,14 @@ public class BungeeHandler implements Listener {
 				} else if (method.equals(BungeeMethod.SOCKETS)) {
 					ArrayList<String> list = new ArrayList<String>();
 					list.add(subChannel);
-					list.addAll(ArrayUtils.getInstance().convert(messageData));
-					sendData(ArrayUtils.getInstance().convert(list));
+					list.addAll(ArrayUtils.convert(messageData));
+					sendData(ArrayUtils.convert(list));
 				} else if (method.equals(BungeeMethod.REDIS)) {
 					ArrayList<String> list = new ArrayList<String>();
 					list.add(subChannel);
-					list.addAll(ArrayUtils.getInstance().convert(messageData));
+					list.addAll(ArrayUtils.convert(messageData));
 					redisHandler.sendMessage(plugin.getBungeeSettings().getRedisPrefix() + "VotingPlugin",
-							ArrayUtils.getInstance().convert(list));
+							ArrayUtils.convert(list));
 				}
 			}
 		};
@@ -604,8 +616,7 @@ public class BungeeHandler implements Listener {

 				@Override
 				protected void onMessage(String channel, String[] message) {
-					plugin.getLogger().info(channel
-							+ ArrayUtils.getInstance().makeStringList(ArrayUtils.getInstance().convert(message)));
+					plugin.getLogger().info(channel + ArrayUtils.makeStringList(ArrayUtils.convert(message)));
 					if (message.length > 0) {
 						ArrayList<String> list = new ArrayList<String>();
 						for (int i = 1; i < message.length; i++) {
@@ -7,6 +7,7 @@ import java.net.URL;
 import java.security.CodeSource;
 import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.YearMonth;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -41,22 +42,25 @@ import com.bencodez.advancedcore.api.inventory.editgui.EditGUIButton;
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueNumber;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.javascript.JavascriptPlaceholderRequest;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.rewards.DirectlyDefinedReward;
 import com.bencodez.advancedcore.api.rewards.Reward;
 import com.bencodez.advancedcore.api.rewards.RewardEditData;
+import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.advancedcore.api.rewards.RewardPlaceholderHandle;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInject;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInjectConfigurationSection;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInjectInt;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInjectValidator;
-import com.bencodez.advancedcore.api.skull.SkullHandler;
-import com.bencodez.advancedcore.api.updater.Updater;
+import com.bencodez.advancedcore.api.rewards.injectedrequirement.RequirementInjectConfigurationSection;
+import com.bencodez.advancedcore.api.user.AdvancedCoreUser;
 import com.bencodez.advancedcore.api.user.userstorage.Column;
-import com.bencodez.advancedcore.api.yml.YMLConfig;
 import com.bencodez.advancedcore.logger.Logger;
-import com.bencodez.advancedcore.nms.NMSManager;
+import com.bencodez.simpleapi.file.YMLConfig;
+import com.bencodez.simpleapi.nms.NMSManager;
+import com.bencodez.simpleapi.skull.SkullCache;
+import com.bencodez.simpleapi.updater.Updater;
 import com.bencodez.votingplugin.broadcast.BroadcastHandler;
 import com.bencodez.votingplugin.commands.CommandLoader;
 import com.bencodez.votingplugin.commands.executers.CommandAdminVote;
@@ -68,6 +72,7 @@ import com.bencodez.votingplugin.config.BungeeSettings;
 import com.bencodez.votingplugin.config.Config;
 import com.bencodez.votingplugin.config.ConfigVoteSites;
 import com.bencodez.votingplugin.config.GUI;
+import com.bencodez.votingplugin.config.ShopFile;
 import com.bencodez.votingplugin.config.SpecialRewardsConfig;
 import com.bencodez.votingplugin.cooldown.CoolDownCheck;
 import com.bencodez.votingplugin.data.ServerData;
@@ -141,9 +146,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	@Getter
 	private GUI gui;

+	@Getter
+	private ShopFile shopFile;
+
 	@Getter
 	private LinkedHashMap<TopVoterPlayer, Integer> lastMonthTopVoter;

+	@Getter
+	@Setter
+	private LinkedHashMap<YearMonth, LinkedHashMap<TopVoterPlayer, Integer>> previousMonthsTopVoters;
+
 	@Getter
 	private MVdWPlaceholders mvdwPlaceholders;

@@ -896,27 +908,27 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					});
 		}

-		for (String identifier : plugin.getGui().getChestShopIdentifiers()) {
-			addDirectlyDefinedRewards(new DirectlyDefinedReward("CHEST.Shop." + identifier + ".Rewards") {
+		for (String identifier : plugin.getShopFile().getShopIdentifiers()) {
+			addDirectlyDefinedRewards(new DirectlyDefinedReward("Shop." + identifier + ".Rewards") {

 				@Override
 				public void createSection(String key) {
-					getGui().createSection(key);
+					getShopFile().createSection(key);
 				}

 				@Override
 				public ConfigurationSection getFileData() {
-					return getGui().getData();
+					return getShopFile().getData();
 				}

 				@Override
 				public void save() {
-					getGui().saveData();
+					getShopFile().saveData();
 				}

 				@Override
 				public void setData(String path, Object value) {
-					getGui().setValue(path, value);
+					getShopFile().setValue(path, value);
 				}
 			});
 		}
@@ -1043,9 +1055,23 @@ public class VotingPluginMain extends AdvancedCorePlugin {

 	@Override
 	public void onPostLoad() {
+		// auto conversion for Shop.yml
+		if (plugin.getShopFile().isJustCreated()) {
+			if (!plugin.getGui().isJustCreated() && !getServerData().isVoteShopConverted()) {
+				plugin.getLogger().warning("Converting VoteShop configuration to Shop.yml from GUI.yml");
+				plugin.getShopFile().convertFromGUIFile();
+			}
+			getServerData().setShopConverted(true);
+		} else if (!getServerData().isVoteShopConverted()) {
+			getServerData().setShopConverted(true);
+		}
+
 		loadVersionFile();
 		getOptions().setServer(bungeeSettings.getServer());

+		// only purges if enabled in config
+		getVotingPluginUserManager().purgeOldPlayersNoData();
+
 		voteTester = new VoteTester(plugin);

 		loadVoteTimer();
@@ -1059,8 +1085,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}

 		if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
-			new VotingPluginExpansion(this).register();
-			getLogger().info("Loading PlaceholderAPI expansion");
+			if (getConfigFile().isLoadInteralExpansion()) {
+				new VotingPluginExpansion(this).register();
+				getLogger().info("Loading PlaceholderAPI expansion");
+			}
 		}

 		registerCommands();
@@ -1088,12 +1116,15 @@ public class VotingPluginMain extends AdvancedCorePlugin {

 		topVoterHandler = new TopVoterHandler(this);
 		lastMonthTopVoter = new LinkedHashMap<TopVoterPlayer, Integer>();
+		previousMonthsTopVoters = new LinkedHashMap<YearMonth, LinkedHashMap<TopVoterPlayer, Integer>>();
 		plugin.getBukkitScheduler().runTaskAsynchronously(plugin, new Runnable() {

 			@Override
 			public void run() {
 				topVoterHandler.loadLastMonth();
 				debug("Loaded last month top voters");
+				
+				topVoterHandler.loadPreviousMonthTopVoters();
 			}
 		});
 		topVoter = new LinkedHashMap<TopVoter, LinkedHashMap<TopVoterPlayer, Integer>>();
@@ -1178,8 +1209,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					ConfigurationSection section, HashMap<String, String> placeholders) {
 				if (section.getBoolean("Enabled")) {
 					user.sendBossBar(
-							StringParser.getInstance().replacePlaceHolder(section.getString("Message", ""),
-									placeholders),
+							PlaceholderUtils.replacePlaceHolder(section.getString("Message", ""), placeholders),
 							section.getString("Color", "BLUE"), section.getString("Style", "SOLID"),
 							(double) getVotingPluginUserManager().getVotingPluginUser(user).getSitesVotedOn()
 									/ plugin.getVoteSites().size(),
@@ -1189,6 +1219,69 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			}
 		});

+		getRewardHandler().addInjectedRequirements(new RequirementInjectConfigurationSection("VoteTotal") {
+
+			@Override
+			public boolean onRequirementsRequested(Reward reward, AdvancedCoreUser acUser, ConfigurationSection section,
+					RewardOptions rewardOptions) {
+				boolean atleast = section.getBoolean("AtleastMode", false);
+				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(acUser);
+
+				for (TopVoter top : TopVoter.values()) {
+					int required = section.getInt(top.toString(), -1);
+					if (required >= 0) {
+						int total = user.getTotal(top);
+						if (atleast) {
+							if (total < required) {
+								debug("Failed requirement " + top.toString() + " " + total + "/" + required);
+								return false;
+							}
+						} else {
+							if (total != required) {
+								debug("Failed requirement " + top.toString() + " " + total + "!=" + required);
+								return false;
+							}
+						}
+					}
+				}
+
+				int milestoneCountRequired = section.getInt("MilestoneCount", -1);
+				if (milestoneCountRequired >= 0) {
+					int milestoneCount = user.getMilestoneCount();
+					if (atleast) {
+						if (milestoneCount < milestoneCountRequired) {
+							debug("Failed requirement milestonecount " + milestoneCount + "/" + milestoneCountRequired);
+							return false;
+						}
+					} else {
+						if (milestoneCount != milestoneCountRequired) {
+							debug("Failed requirement milestonecount " + milestoneCount + "!="
+									+ milestoneCountRequired);
+							return false;
+						}
+					}
+				}
+
+				int pointsRequired = section.getInt("Points", -1);
+				if (pointsRequired >= 0) {
+					int points = user.getPoints();
+					if (atleast) {
+						if (points < pointsRequired) {
+							debug("Failed requirement points " + points + "/" + pointsRequired);
+							return false;
+						}
+					} else {
+						if (points != pointsRequired) {
+							debug("Failed requirement points " + points + "!=" + pointsRequired);
+							return false;
+						}
+					}
+				}
+
+				return true;
+			}
+		});
+
 		for (final TopVoter top : TopVoter.values()) {
 			getRewardHandler().addPlaceholder(new RewardPlaceholderHandle("Total_" + top.toString()) {

@@ -1413,8 +1506,12 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		specialRewardsConfig.reloadData();

 		gui.reloadData();
+		shopFile.reloadData();

 		bungeeSettings.reloadData();
+		updateAdvancedCoreHook();
+
+		reloadAdvancedCore(userStorage);

 		if (bungeeSettings.isUseBungeecoord()) {
 			if (getBungeeHandler() == null) {
@@ -1430,10 +1527,8 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			broadcastHandler.schedule(getConfigFile().getFormatAlternateBroadcastDelay());
 		}

-		updateAdvancedCoreHook();
 		plugin.loadVoteSites();

-		reloadAdvancedCore(userStorage);
 		getOptions().setServer(bungeeSettings.getServer());
 		if (userStorage) {
 			placeholders.load();
@@ -1472,10 +1567,13 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		bungeeSettings = new BungeeSettings(this);
 		bungeeSettings.setup();

+		serverData = new ServerData(this);
+
 		gui = new GUI(this);
 		gui.setup();

-		serverData = new ServerData(this);
+		shopFile = new ShopFile(this);
+		shopFile.setup();

 		checkYMLError();

@@ -1495,6 +1593,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					synchronized (plugin) {
 						if (plugin != null && plugin.isEnabled()) {
 							getUserManager().getDataManager().clearCacheBasic();
+							SkullCache.flushWeek();

 							plugin.debug("Starting background task, current cached users: "
 									+ plugin.getUserManager().getDataManager().getUserDataCache().keySet().size());
@@ -1638,7 +1737,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					Set<TopVoterPlayer> players = topVoter.get(top).keySet();
 					for (TopVoterPlayer p : players) {
 						if (num <= maxToLoad) {
-							SkullHandler.getInstance().loadSkull(p.getPlayerName());
+							getSkullCacheHandler().addToCache(p.getUuid(), p.getPlayerName());
 						}
 						num++;
 					}
@@ -2,7 +2,7 @@ package com.bencodez.votingplugin;

 import java.util.concurrent.Callable;

-import com.bencodez.advancedcore.api.metrics.BStatsMetrics;
+import com.bencodez.simpleapi.metrics.BStatsMetrics;

 public class VotingPluginMetrics {

@@ -10,8 +10,9 @@ import java.util.concurrent.TimeUnit;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;

 public class BroadcastHandler {
@@ -30,8 +31,7 @@ public class BroadcastHandler {
 			for (int i = 0; i < size; i++) {
 				votedPlayers.poll();
 			}
-			String bc = StringParser.getInstance()
-					.colorize(plugin.getConfigFile().getFormatAlternateBroadcastBroadcast());
+			String bc = MessageAPI.colorize(plugin.getConfigFile().getFormatAlternateBroadcastBroadcast());
 			String playersText = "";
 			while (!votedPlayers.isEmpty()) {
 				playersText += votedPlayers.remove();
@@ -42,7 +42,7 @@ public class BroadcastHandler {
 			HashMap<String, String> placeholders = new HashMap<String, String>();
 			placeholders.put("numberofplayers", "" + size);
 			placeholders.put("players", playersText);
-			bc = StringParser.getInstance().replacePlaceHolder(bc, placeholders);
+			bc = PlaceholderUtils.replacePlaceHolder(bc, placeholders);
 			ArrayList<Player> players = new ArrayList<Player>();
 			for (Player p : Bukkit.getOnlinePlayers()) {
 				if (!plugin.getVotingPluginUserManager().getVotingPluginUser(p).getDisableBroadcast()) {
@@ -8,7 +8,7 @@ import lombok.Setter;
 public class BungeeMessageData {

 	// Message string
-	// alltimetotal//monthtotal//weeklytotal//dailytotal//points//milestonecount//votepartycurrent//votepartyrequired
+	// alltimetotal//monthtotal//weeklytotal//dailytotal//points//milestonecount//votepartycurrent//votepartyrequired//datemonthtotal

 	@Getter
 	@Setter
@@ -24,6 +24,9 @@ public class BungeeMessageData {
 	private int monthTotal = 0;
 	@Getter
 	@Setter
+	private int dateMonthTotal = 0;
+	@Getter
+	@Setter
 	private int points = 0;
 	@Getter
 	@Setter
@@ -36,7 +39,7 @@ public class BungeeMessageData {
 	private int votePartyRequired = 0;

 	public BungeeMessageData(int allTimeTotal, int monthTotal, int weeklyTotal, int dailyTotal, int points,
-			int milestoneCount, int votePartyCurrent, int votePartyRequired) {
+			int milestoneCount, int votePartyCurrent, int votePartyRequired, int dateMonthTotal) {
 		this.allTimeTotal = allTimeTotal;
 		this.monthTotal = monthTotal;
 		this.weeklyTotal = weeklyTotal;
@@ -45,6 +48,7 @@ public class BungeeMessageData {
 		this.milestoneCount = milestoneCount;
 		this.votePartyCurrent = votePartyCurrent;
 		this.votePartyRequired = votePartyRequired;
+		this.dateMonthTotal = dateMonthTotal;
 	}

 	public BungeeMessageData(String str) {
@@ -61,6 +65,9 @@ public class BungeeMessageData {
 			votePartyCurrent = Integer.parseInt(data[6]);
 			votePartyRequired = Integer.parseInt(data[7]);
 		}
+		if (data.length >= 9) {
+			dateMonthTotal = Integer.parseInt(data[8]);
+		}
 	}

 	@Override
@@ -57,6 +57,14 @@ public class Config {
 		return getData().getBoolean("Broadcast", false);
 	}

+	public boolean getStoreMonthTotalsWithDate() {
+		return getData().getBoolean("StoreMonthTotalsWithDate", false);
+	}
+
+	public boolean getUseMonthDateTotalsAsPrimaryTotal() {
+		return getData().getBoolean("UseMonthDateTotalsAsPrimaryTotal", false);
+	}
+
 	public String getBedrockPlayerPrefix() {
 		return getData().getString("BedrockPlayerPrefix", ".");
 	}
@@ -64,6 +72,14 @@ public class Config {
 	public boolean getOnlineMode() {
 		return getData().getBoolean("OnlineMode", true);
 	}
+	
+	public boolean getTimeChangeFailSafeBypass() {
+		return getData().getBoolean("TimeChangeFailSafeBypass", false);
+	}
+
+	public boolean getUUIDLookup() {
+		return getData().getBoolean("UUIDLookup", true);
+	}

 	public boolean getGlobalDataEnabled() {
 		return getData().getBoolean("GlobalData.Enabled", false);
@@ -89,6 +105,10 @@ public class Config {
 		return getData().getInt("BungeeServer.Port", 1297);
 	}

+	public int getLimitVotePoints() {
+		return getData().getInt("LimitVotePoints", -1);
+	}
+
 	public boolean getDebug() {
 		return getData().getBoolean("Debug", false);
 	}
@@ -32,15 +32,14 @@ import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;

-import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.encryption.EncryptionHandler;
-import com.bencodez.advancedcore.api.misc.jsonparser.JsonParser;
 import com.bencodez.advancedcore.api.time.TimeType;
 import com.bencodez.advancedcore.api.user.usercache.value.DataValue;
 import com.bencodez.advancedcore.api.user.usercache.value.DataValueBoolean;
 import com.bencodez.advancedcore.api.user.usercache.value.DataValueInt;
 import com.bencodez.advancedcore.api.user.usercache.value.DataValueString;
 import com.bencodez.advancedcore.api.user.userstorage.Column;
+import com.bencodez.advancedcore.api.user.userstorage.DataType;
 import com.bencodez.advancedcore.api.user.userstorage.mysql.api.config.MysqlConfigBungee;
 import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalDataHandlerProxy;
 import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalMySQL;
@@ -51,6 +50,8 @@ import com.bencodez.advancedcore.bungeeapi.sockets.ClientHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
 import com.bencodez.advancedcore.bungeeapi.time.BungeeTimeChecker;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.json.JsonParser;
 import com.bencodez.votingplugin.bungee.global.multiproxy.MultiProxyHandler;
 import com.bencodez.votingplugin.bungee.global.multiproxy.MultiProxyMethod;
 import com.bencodez.votingplugin.bungee.global.multiproxy.MultiProxyServerSocketConfiguration;
@@ -354,6 +355,12 @@ public class VotingPluginBungee extends Plugin implements Listener {
 							public void debug(String text) {
 								debug2(text);
 							}
+
+							@Override
+							public void info(String text) {
+								getLogger().info(text);
+
+							}
 						}, servers) {

 					@Override
@@ -361,7 +368,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 						if (type.equals(TimeType.MONTH)) {
 							getMysql().copyColumnData(TopVoter.Monthly.getColumnName(), "LastMonthTotal");
 						}
-						getMysql().wipeColumnData(TopVoter.of(type).getColumnName());
+						getMysql().wipeColumnData(TopVoter.of(type).getColumnName(), DataType.INTEGER);

 						if (!config.getGlobalDataEnabled()) {
 							return;
@@ -382,6 +389,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 					@Override
 					public void onTimeChangedFailed(String server, TimeType type) {
 						getGlobalDataHandler().setBoolean(server, type.toString(), false);
+						getGlobalDataHandler().setBoolean(server, "FinishedProcessing", true);
+						getGlobalDataHandler().setBoolean(server, "Processing", false);
 					}
 				};
 			} else {
@@ -409,6 +418,12 @@ public class VotingPluginBungee extends Plugin implements Listener {
 					public void debug(String text) {
 						debug2(text);
 					}
+
+					@Override
+					public void info(String text) {
+						getLogger().info(text);
+
+					}
 				}, servers) {

 					@Override
@@ -416,7 +431,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 						if (type.equals(TimeType.MONTH)) {
 							getMysql().copyColumnData(TopVoter.Monthly.getColumnName(), "LastMonthTotal");
 						}
-						getMysql().wipeColumnData(TopVoter.of(type).getColumnName());
+						getMysql().wipeColumnData(TopVoter.of(type).getColumnName(), DataType.INTEGER);

 						if (!config.getGlobalDataEnabled()) {
 							return;
@@ -437,6 +452,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 					@Override
 					public void onTimeChangedFailed(String server, TimeType type) {
 						getGlobalDataHandler().setBoolean(server, type.toString(), false);
+						getGlobalDataHandler().setBoolean(server, "FinishedProcessing", true);
+						getGlobalDataHandler().setBoolean(server, "Processing", false);
 					}
 				};
 			}
@@ -477,6 +494,13 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		getMysql().alterColumnType("LastDailyTotal", "INT DEFAULT '0'");
 		getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");
 		getMysql().alterColumnType("DayVoteStreakLastUpdate", "MEDIUMTEXT");
+		if (config.getStoreMonthTotalsWithDate()) {
+			getMysql().alterColumnType(getMonthTotalsWithDatePath(LocalDateTime.now()), "INT DEFAULT '0'");
+			getMysql().alterColumnType(getMonthTotalsWithDatePath(LocalDateTime.now().plusMonths(1)),
+					"INT DEFAULT '0'");
+			getMysql().alterColumnType(getMonthTotalsWithDatePath(LocalDateTime.now().plusMonths(2)),
+					"INT DEFAULT '0'");
+		}
 	}

 	private String buildNumber = "NOTSET";
@@ -547,11 +571,15 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				num++;
 			}
 		}
+
 		voteCacheFile.save();
 		nonVotedPlayersCache.save();
 		if (mysql != null) {
 			mysql.shutdown();
 		}
+		if (multiProxyHandler != null) {
+			multiProxyHandler.close();
+		}
 		getLogger().info("VotingPlugin disabled");
 		enabled = false;
 	}
@@ -616,6 +644,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 					checkVoteCacheTime();
 				}
 				if (!config.getGlobalDataEnabled()) {
+					getLogger().warning("Global data not enabled, ignoring time change event");
 					return;
 				}
 				for (String s : getAvailableAllServers()) {
@@ -733,6 +762,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 			voteCacheFile = new VoteCache(this);
 			voteCacheFile.load();

+			bungeeTimeChecker.setTimeChangeFailSafeBypass(config.getTimeChangeFailSafeBypass());
 			bungeeTimeChecker.loadTimer();

 			nonVotedPlayersCache = new NonVotedPlayersCache(this);
@@ -872,6 +902,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 							if (message[0].equalsIgnoreCase("statusokay")) {
 								String server = message[1];
 								getLogger().info("Status okay for " + server);
+							} else if (message[0].equalsIgnoreCase("TimeChangeFinished")) {
+
 							} else if (message[0].equalsIgnoreCase("login")) {
 								String player = message[1];
 								String uuid = message[2];
@@ -1141,6 +1173,12 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				@Override
 				public void run() {
 					if (isOnline(p)) {
+						if (getConfig().getGlobalDataEnabled()) {
+							if (getGlobalDataHandler().isTimeChangedHappened()) {
+								getGlobalDataHandler().checkForFinishedTimeChanges();
+							}
+						}
+
 						checkCachedVotes(server);
 						checkOnlineVotes(proxiedPlayer, proxiedPlayer.getUniqueId().toString(), server);
 						multiProxyHandler.login(proxiedPlayer.getUniqueId().toString(), proxiedPlayer.getName());
@@ -1179,6 +1217,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				String server = in.readUTF();
 				getLogger().info("Status okay for " + server);
 				return;
+			} else if (subchannel.equalsIgnoreCase("TimeChangeFinished")) {
+
 			} else if (subchannel.equalsIgnoreCase("login")) {
 				String player = in.readUTF();
 				String uuid = in.readUTF();
@@ -1255,9 +1295,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 	public void sendRedisMessageServer(String server, String channel, String... messageData) {
 		ArrayList<String> list = new ArrayList<String>();
 		list.add(channel);
-		list.addAll(ArrayUtils.getInstance().convert(messageData));
-		redisHandler.sendMessage(getConfig().getRedisPrefix() + "VotingPlugin_" + server,
-				ArrayUtils.getInstance().convert(list));
+		list.addAll(ArrayUtils.convert(messageData));
+		redisHandler.sendMessage(getConfig().getRedisPrefix() + "VotingPlugin_" + server, ArrayUtils.convert(list));
 	}

 	public void sendPluginMessageServer(String server, String channel, String... messageData) {
@@ -1277,7 +1316,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 			e.printStackTrace();
 		}
 		debug("Sending plugin message " + server + " " + channel + " "
-				+ ArrayUtils.getInstance().makeStringList(ArrayUtils.getInstance().convert(messageData)));
+				+ ArrayUtils.makeStringList(ArrayUtils.convert(messageData)));

 	}

@@ -1343,6 +1382,15 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		}
 	}

+	public String getMonthTotalsWithDatePath() {
+		LocalDateTime cTime = bungeeTimeChecker.getTime();
+		return getMonthTotalsWithDatePath(cTime);
+	}
+
+	public String getMonthTotalsWithDatePath(LocalDateTime cTime) {
+		return "MonthTotal-" + cTime.getMonth().toString() + "-" + cTime.getYear();
+	}
+
 	public synchronized void vote(String player, String service, boolean realVote, boolean timeQueue, long queueTime,
 			BungeeMessageData text, String uuid) {
 		try {
@@ -1350,10 +1398,10 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				getLogger().info("No name from vote on " + service);
 				return;
 			}
-
-			if (timeQueue) {
-				if (getConfig().getGlobalDataEnabled()) {
-					if (getGlobalDataHandler().isTimeChangedHappened()) {
+			if (getConfig().getGlobalDataEnabled()) {
+				if (getGlobalDataHandler().isTimeChangedHappened()) {
+					getGlobalDataHandler().checkForFinishedTimeChanges();
+					if (timeQueue && getGlobalDataHandler().isTimeChangedHappened()) {
 						timeChangeQueue.add(new VoteTimeQueue(player, service,
 								LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
 						getLogger().info("Cachcing vote from " + player + "/" + service
@@ -1373,22 +1421,27 @@ public class VotingPluginBungee extends Plugin implements Listener {
 					return;
 				}
 				if (config.getAllowUnJoined()) {
-					debug("Fetching UUID online, since allowunjoined is enabled");
-					UUID u = null;
-					try {
-						if (config.getOnlineMode()) {
-							u = fetchUUID(player);
+					if (config.getUUIDLookup()) {
+						debug("Fetching UUID online, since allowunjoined is enabled");
+						UUID u = null;
+						try {
+							if (config.getOnlineMode()) {
+								u = fetchUUID(player);
+							}
+						} catch (Exception e) {
+							if (getConfig().getDebug()) {
+								e.printStackTrace();
+							}
 						}
-					} catch (Exception e) {
-						if (getConfig().getDebug()) {
-							e.printStackTrace();
+						if (u == null) {
+							debug("Failed to get uuid for " + player);
+							return;
 						}
-					}
-					if (u == null) {
-						debug("Failed to get uuid for " + player);
+						uuid = u.toString();
+					} else {
+						getLogger().info("Failed to get uuid for " + player);
 						return;
 					}
-					uuid = u.toString();
 				} else {
 					getLogger().info("Ignoring vote from " + player + " since player hasn't joined before");
 					return;
@@ -1415,6 +1468,14 @@ public class VotingPluginBungee extends Plugin implements Listener {

 					int allTimeTotal = getValue(data, "AllTimeTotal", 1);
 					int monthTotal = getValue(data, "MonthTotal", 1);
+					int dateMonthTotal = -1;
+					if (config.getStoreMonthTotalsWithDate()) {
+						if (config.getUseMonthDateTotalsAsPrimaryTotal()) {
+							dateMonthTotal = getValue(data, getMonthTotalsWithDatePath(), 1);
+						} else {
+							dateMonthTotal = monthTotal;
+						}
+					}
 					int weeklyTotal = getValue(data, "WeeklyTotal", 1);
 					int dailyTotal = getValue(data, "DailyTotal", 1);
 					int points = getValue(data, "Points", getConfig().getPointsOnVote());
@@ -1428,11 +1489,20 @@ public class VotingPluginBungee extends Plugin implements Listener {
 							monthTotal = days * maxVotes;
 						}
 					}
+
+					if (getConfig().getLimitVotePoints() > 0) {
+						if (points > getConfig().getLimitVotePoints()) {
+							points = getConfig().getLimitVotePoints();
+						}
+					}
 					text = new BungeeMessageData(allTimeTotal, monthTotal, weeklyTotal, dailyTotal, points,
-							milestoneCount, votePartyVotes, currentVotePartyVotesRequired);
+							milestoneCount, votePartyVotes, currentVotePartyVotesRequired, dateMonthTotal);
 					ArrayList<Column> update = new ArrayList<Column>();
 					update.add(new Column("AllTimeTotal", new DataValueInt(allTimeTotal)));
 					update.add(new Column("MonthTotal", new DataValueInt(monthTotal)));
+					if (config.getStoreMonthTotalsWithDate()) {
+						update.add(new Column(getMonthTotalsWithDatePath(), new DataValueInt(dateMonthTotal)));
+					}
 					update.add(new Column("WeeklyTotal", new DataValueInt(weeklyTotal)));
 					update.add(new Column("DailyTotal", new DataValueInt(dailyTotal)));
 					update.add(new Column("Points", new DataValueInt(points)));
@@ -1440,7 +1510,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 					debug("Setting totals " + text.toString());
 					mysql.update(uuid, update);
 				} else {
-					text = new BungeeMessageData(0, 0, 0, 0, 0, 0, votePartyVotes, currentVotePartyVotesRequired);
+					text = new BungeeMessageData(0, 0, 0, 0, 0, 0, votePartyVotes, currentVotePartyVotesRequired, 0);
 				}
 			}

@@ -7,7 +7,7 @@ import java.util.List;

 import org.checkerframework.checker.nullness.qual.NonNull;

-import com.bencodez.advancedcore.bungeeapi.velocity.VelocityYMLFile;
+import com.bencodez.simpleapi.file.velocity.VelocityYMLFile;

 import ninja.leaping.configurate.ConfigurationNode;

@@ -37,6 +37,22 @@ public class Config extends VelocityYMLFile {
 		return getBoolean(getNode("OnlineMode"), true);
 	}

+	public boolean getTimeChangeFailSafeBypass() {
+		return getBoolean(getNode("TimeChangeFailSafeBypass"), false);
+	}
+
+	public boolean getStoreMonthTotalsWithDate() {
+		return getBoolean(getNode("StoreMonthTotalsWithDate"), false);
+	}
+
+	public boolean getUseMonthDateTotalsAsPrimaryTotal() {
+		return getBoolean(getNode("UseMonthDateTotalsAsPrimaryTotal"), false);
+	}
+
+	public boolean getUUIDLookup() {
+		return getBoolean(getNode("UUIDLookup"), true);
+	}
+
 	public boolean getGlobalDataEnabled() {
 		return getBoolean(getNode("GlobalData", "Enabled"), false);
 	}
@@ -61,6 +77,10 @@ public class Config extends VelocityYMLFile {
 		return getInt(getNode("Redis", "Port"), 6379);
 	}

+	public int getLimitVotePoints() {
+		return getInt(getNode("LimitVotePoints"), -1);
+	}
+
 	public String getRedisUsername() {
 		return getString(getNode("Redis", "Username"), "");
 	}
@@ -2,7 +2,7 @@ package com.bencodez.votingplugin.bungee.velocity;

 import java.io.File;

-import com.bencodez.advancedcore.bungeeapi.velocity.VelocityJSONFile;
+import com.bencodez.simpleapi.file.velocity.VelocityJSONFile;
 import com.velocitypowered.api.proxy.Player;

 public class NonVotedPlayersCache extends VelocityJSONFile {
@@ -3,7 +3,7 @@ package com.bencodez.votingplugin.bungee.velocity;
 import java.io.File;
 import java.util.Collection;

-import com.bencodez.advancedcore.bungeeapi.velocity.VelocityJSONFile;
+import com.bencodez.simpleapi.file.velocity.VelocityJSONFile;
 import com.bencodez.votingplugin.bungee.OfflineBungeeVote;
 import com.bencodez.votingplugin.timequeue.VoteTimeQueue;

@@ -40,32 +40,29 @@ public class VoteCache extends VelocityJSONFile {
 	}

 	public void addVote(String server, int num, OfflineBungeeVote voteData) {
-		String[] path = new String[] { "VoteCache", server, "" + num };

-		getNode(path, "Name").setValue(voteData.getPlayerName());
-		getNode(path, "Service").setValue(voteData.getService());
-		getNode(path, "UUID").setValue(voteData.getUuid());
-		getNode(path, "Time").setValue(voteData.getTime());
-		getNode(path, "Real").setValue(voteData.isRealVote());
-		getNode(path, "Text").setValue(voteData.getText());
+		getNode("VoteCache", server, "" + num, "Name").setValue(voteData.getPlayerName());
+		getNode("VoteCache", server, "" + num, "Service").setValue(voteData.getService());
+		getNode("VoteCache", server, "" + num, "UUID").setValue(voteData.getUuid());
+		getNode("VoteCache", server, "" + num, "Time").setValue(voteData.getTime());
+		getNode("VoteCache", server, "" + num, "Real").setValue(voteData.isRealVote());
+		getNode("VoteCache", server, "" + num, "Text").setValue(voteData.getText());
 	}

 	public void addTimedVote(int num, VoteTimeQueue voteTimedQueue) {
-		String[] path = new String[] { "TimedVoteCache", "" + num };
-		getNode(path, "Name").setValue(voteTimedQueue.getName());
-		getNode(path, "Service").setValue(voteTimedQueue.getService());
-		getNode(path, "Time").setValue(voteTimedQueue.getTime());
+		getNode("TimedVoteCache", "" + num, "Name").setValue(voteTimedQueue.getName());
+		getNode("TimedVoteCache", "" + num, "Service").setValue(voteTimedQueue.getService());
+		getNode("TimedVoteCache", "" + num, "Time").setValue(voteTimedQueue.getTime());
 	}

 	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
-		String[] path = new String[] { "OnlineCache", player, "" + num };

-		getNode(path, "Name").setValue(voteData.getPlayerName());
-		getNode(path, "Service").setValue(voteData.getService());
-		getNode(path, "UUID").setValue(voteData.getUuid());
-		getNode(path, "Time").setValue(voteData.getTime());
-		getNode(path, "Real").setValue(voteData.isRealVote());
-		getNode(path, "Text").setValue(voteData.getText());
+		getNode("OnlineCache", player, "" + num, "Name").setValue(voteData.getPlayerName());
+		getNode("OnlineCache", player, "" + num, "Service").setValue(voteData.getService());
+		getNode("OnlineCache", player, "" + num, "UUID").setValue(voteData.getUuid());
+		getNode("OnlineCache", player, "" + num, "Time").setValue(voteData.getTime());
+		getNode("OnlineCache", player, "" + num, "Real").setValue(voteData.isRealVote());
+		getNode("OnlineCache", player, "" + num, "Text").setValue(voteData.getText());
 	}

 	public void clearData() {
@@ -99,7 +96,7 @@ public class VoteCache extends VelocityJSONFile {
 	}

 	public Collection<String> getServerVotes(String server) {
-		return getKeys(getNode("OnlineCache", server));
+		return getKeys(getNode("VoteCache", server));
 	}

 	public ConfigurationNode getServerVotes(String server, String num) {
@@ -42,15 +42,14 @@ import org.bstats.charts.SimplePie;
 import org.bstats.velocity.Metrics;
 import org.slf4j.Logger;

-import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.encryption.EncryptionHandler;
-import com.bencodez.advancedcore.api.misc.jsonparser.JsonParser;
 import com.bencodez.advancedcore.api.time.TimeType;
 import com.bencodez.advancedcore.api.user.usercache.value.DataValue;
 import com.bencodez.advancedcore.api.user.usercache.value.DataValueBoolean;
 import com.bencodez.advancedcore.api.user.usercache.value.DataValueInt;
 import com.bencodez.advancedcore.api.user.usercache.value.DataValueString;
 import com.bencodez.advancedcore.api.user.userstorage.Column;
+import com.bencodez.advancedcore.api.user.userstorage.DataType;
 import com.bencodez.advancedcore.api.user.userstorage.mysql.api.config.MysqlConfigVelocity;
 import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalDataHandlerProxy;
 import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalMySQL;
@@ -61,7 +60,9 @@ import com.bencodez.advancedcore.bungeeapi.sockets.ClientHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
 import com.bencodez.advancedcore.bungeeapi.time.BungeeTimeChecker;
-import com.bencodez.advancedcore.bungeeapi.velocity.VelocityYMLFile;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.file.velocity.VelocityYMLFile;
+import com.bencodez.simpleapi.json.JsonParser;
 import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.bungee.BungeeVersion;
@@ -363,6 +364,11 @@ public class VotingPluginVelocity {
 							public void debug(String text) {
 								debug2(text);
 							}
+
+							@Override
+							public void info(String text) {
+								logger.info(text);
+							}
 						}, servers) {

 					@Override
@@ -370,7 +376,7 @@ public class VotingPluginVelocity {
 						if (type.equals(TimeType.MONTH)) {
 							getMysql().copyColumnData(TopVoter.Monthly.getColumnName(), "LastMonthTotal");
 						}
-						getMysql().wipeColumnData(TopVoter.of(type).getColumnName());
+						getMysql().wipeColumnData(TopVoter.of(type).getColumnName(), DataType.INTEGER);

 						for (RegisteredServer s : getAvailableAllServers()) {
 							getGlobalDataHandler().setBoolean(s.getServerInfo().getName(), "ForceUpdate", true);
@@ -387,6 +393,8 @@ public class VotingPluginVelocity {
 					@Override
 					public void onTimeChangedFailed(String server, TimeType type) {
 						getGlobalDataHandler().setBoolean(server, type.toString(), false);
+						getGlobalDataHandler().setBoolean(server, "FinishedProcessing", true);
+						getGlobalDataHandler().setBoolean(server, "Processing", false);
 					}
 				};
 			} else {
@@ -414,6 +422,11 @@ public class VotingPluginVelocity {
 							public void debug(String text) {
 								debug2(text);
 							}
+
+							@Override
+							public void info(String text) {
+								logger.info(text);
+							}
 						}, servers) {

 					@Override
@@ -421,7 +434,7 @@ public class VotingPluginVelocity {
 						if (type.equals(TimeType.MONTH)) {
 							getMysql().copyColumnData(TopVoter.Monthly.getColumnName(), "LastMonthTotal");
 						}
-						getMysql().wipeColumnData(TopVoter.of(type).getColumnName());
+						getMysql().wipeColumnData(TopVoter.of(type).getColumnName(), DataType.INTEGER);

 						for (RegisteredServer s : getAvailableAllServers()) {
 							getGlobalDataHandler().setBoolean(s.getServerInfo().getName(), "ForceUpdate", true);
@@ -439,6 +452,8 @@ public class VotingPluginVelocity {
 					@Override
 					public void onTimeChangedFailed(String server, TimeType type) {
 						getGlobalDataHandler().setBoolean(server, type.toString(), false);
+						getGlobalDataHandler().setBoolean(server, "FinishedProcessing", true);
+						getGlobalDataHandler().setBoolean(server, "Processing", false);
 					}

 				};
@@ -479,6 +494,13 @@ public class VotingPluginVelocity {
 		getMysql().alterColumnType("LastDailyTotal", "INT DEFAULT '0'");
 		getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");
 		getMysql().alterColumnType("DayVoteStreakLastUpdate", "MEDIUMTEXT");
+		if (config.getStoreMonthTotalsWithDate()) {
+			getMysql().alterColumnType(getMonthTotalsWithDatePath(LocalDateTime.now()), "INT DEFAULT '0'");
+			getMysql().alterColumnType(getMonthTotalsWithDatePath(LocalDateTime.now().plusMonths(1)),
+					"INT DEFAULT '0'");
+			getMysql().alterColumnType(getMonthTotalsWithDatePath(LocalDateTime.now().plusMonths(2)),
+					"INT DEFAULT '0'");
+		}
 	}

 	@Subscribe
@@ -497,9 +519,20 @@ public class VotingPluginVelocity {
 					String server = in.readUTF();
 					logger.info("Status okay for " + server);
 					return;
+				} else if (subchannel.equalsIgnoreCase("TimeChangeFinished")) {
+
 				} else if (subchannel.equalsIgnoreCase("login")) {
+
 					String player = in.readUTF();
-					debug("Login: " + player);
+					String uuid = in.readUTF();
+					String serverName = "";
+					if (size > 2) {
+						serverName = in.readUTF();
+					}
+					debug("Login: " + player + "/" + uuid + " " + serverName);
+					if (nonVotedPlayersCache != null) {
+						nonVotedPlayersCache.addPlayerCheck(uuid, player);
+					}
 					if (server.getPlayer(player).isPresent()
 							&& (getGlobalDataHandler() == null || !getGlobalDataHandler().isTimeChangedHappened())) {
 						Player p = server.getPlayer(player).get();
@@ -510,6 +543,14 @@ public class VotingPluginVelocity {

 								@Override
 								public void run() {
+									if (getConfig().getGlobalDataEnabled()) {
+										if (getGlobalDataHandler().isTimeChangedHappened()) {
+											getGlobalDataHandler().checkForFinishedTimeChanges();
+										}
+									}
+
+									debug("Checking offline votes for " + p.getUsername() + "/"
+											+ p.getUniqueId().toString());
 									checkCachedVotes(server);
 									checkOnlineVotes(p1, p.getUniqueId().toString(), server);
 									getMultiProxyHandler().login(p1.getUniqueId().toString(), p1.getUsername());
@@ -593,6 +634,11 @@ public class VotingPluginVelocity {
 		if (mysql != null) {
 			mysql.shutDown();
 		}
+		if (multiProxyHandler != null) {
+			multiProxyHandler.close();
+		}
+		timer.shutdownNow();
+		bungeeTimeChecker.getTimer().shutdownNow();
 		enabled = false;
 		logger.info("VotingPlugin disabled");
 	}
@@ -653,6 +699,7 @@ public class VotingPluginVelocity {
 					checkVoteCacheTime();
 				}
 				if (!config.getGlobalDataEnabled()) {
+					getLogger().warn("Global data not enabled, ignoring time change event");
 					return;
 				}
 				for (RegisteredServer s : getAvailableAllServers()) {
@@ -689,6 +736,7 @@ public class VotingPluginVelocity {
 					}

 				}
+				globalDataHandler.onTimeChange(type);
 			}

 			@Override
@@ -813,6 +861,7 @@ public class VotingPluginVelocity {
 				voteCacheFile.save();
 			}

+			bungeeTimeChecker.setTimeChangeFailSafeBypass(config.getTimeChangeFailSafeBypass());
 			bungeeTimeChecker.loadTimer();

 			try {
@@ -837,9 +886,11 @@ public class VotingPluginVelocity {
 							vote.add(new OfflineBungeeVote(data.getNode("Name").getString(),
 									data.getNode("UUID").getString(), data.getNode("Service").getString(),
 									data.getNode("Time").getLong(), data.getNode("Real").getBoolean(),
-									data.getNode("TEXT").getString()));
+									data.getNode("Text").getString()));
+						}
+						if (server.getServer(serverToCheck).isPresent()) {
+							cachedVotes.put(server.getServer(serverToCheck).get(), vote);
 						}
-						cachedVotes.put(server.getServer(serverToCheck).get(), vote);
 					}
 				} catch (Exception e) {
 					e.printStackTrace();
@@ -853,7 +904,7 @@ public class VotingPluginVelocity {
 							vote.add(new OfflineBungeeVote(data.getNode("Name").getString(),
 									data.getNode("UUID").getString(), data.getNode("Service").getString(),
 									data.getNode("Time").getLong(), data.getNode("Real").getBoolean(),
-									data.getNode("TEXT").getString()));
+									data.getNode("Text").getString()));
 						}
 						cachedOnlineVotes.put(player, vote);
 					}
@@ -947,6 +998,8 @@ public class VotingPluginVelocity {
 							if (message[0].equalsIgnoreCase("statusokay")) {
 								String server = message[1];
 								getLogger().info("Status okay for " + server);
+							} else if (message[0].equalsIgnoreCase("TimeChangeFinished")) {
+
 							} else if (message[0].equalsIgnoreCase("login")) {
 								String player = message[1];
 								String uuid = message[2];
@@ -968,6 +1021,12 @@ public class VotingPluginVelocity {

 											@Override
 											public void run() {
+												if (getConfig().getGlobalDataEnabled()) {
+													if (getGlobalDataHandler().isTimeChangedHappened()) {
+														getGlobalDataHandler().checkForFinishedTimeChanges();
+													}
+												}
+
 												checkCachedVotes(server);
 												checkOnlineVotes(p1, p.getUniqueId().toString(), server);
 												getMultiProxyHandler().login(p1.getUniqueId().toString(),
@@ -1304,9 +1363,9 @@ public class VotingPluginVelocity {
 	public void sendRedisMessageServer(RegisteredServer s, String channel, String... messageData) {
 		ArrayList<String> list = new ArrayList<String>();
 		list.add(channel);
-		list.addAll(ArrayUtils.getInstance().convert(messageData));
+		list.addAll(ArrayUtils.convert(messageData));
 		redisHandler.sendMessage(getConfig().getRedisPrefix() + "VotingPlugin_" + s.getServerInfo().getName(),
-				ArrayUtils.getInstance().convert(list));
+				ArrayUtils.convert(list));
 	}

 	public void sendPluginMessageServer(RegisteredServer s, String channel, String... messageData) {
@@ -1326,7 +1385,7 @@ public class VotingPluginVelocity {
 			e.printStackTrace();
 		}
 		debug("Sending plugin message " + s.getServerInfo().getName() + " " + channel + " "
-				+ ArrayUtils.getInstance().makeStringList(ArrayUtils.getInstance().convert(messageData)));
+				+ ArrayUtils.makeStringList(ArrayUtils.convert(messageData)));

 	}

@@ -1402,6 +1461,15 @@ public class VotingPluginVelocity {
 		}
 	}

+	public String getMonthTotalsWithDatePath() {
+		LocalDateTime cTime = bungeeTimeChecker.getTime();
+		return getMonthTotalsWithDatePath(cTime);
+	}
+
+	public String getMonthTotalsWithDatePath(LocalDateTime cTime) {
+		return "MonthTotal-" + cTime.getMonth().toString() + "-" + cTime.getYear();
+	}
+
 	public synchronized void vote(String player, String service, boolean realVote, boolean timeQueue, long queuedTime,
 			BungeeMessageData text, String uuid) {
 		try {
@@ -1409,10 +1477,10 @@ public class VotingPluginVelocity {
 				logger.info("No name from vote on " + service);
 				return;
 			}
-
-			if (timeQueue) {
-				if (getConfig().getGlobalDataEnabled()) {
-					if (getGlobalDataHandler().isTimeChangedHappened()) {
+			if (getConfig().getGlobalDataEnabled()) {
+				if (getGlobalDataHandler().isTimeChangedHappened()) {
+					getGlobalDataHandler().checkForFinishedTimeChanges();
+					if (timeQueue && getGlobalDataHandler().isTimeChangedHappened()) {
 						timeChangeQueue.add(new VoteTimeQueue(player, service,
 								LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
 						getLogger().info("Cachcing vote from " + player + "/" + service
@@ -1428,26 +1496,31 @@ public class VotingPluginVelocity {

 			if (uuid.isEmpty()) {
 				if (config.getAllowUnJoined()) {
-					if (player.startsWith(config.getBedrockPlayerPrefix())) {
-						logger.info("Ignoring vote since unable to get UUID of bedrock player");
+					if (config.getUUIDLookup()) {
+						if (player.startsWith(config.getBedrockPlayerPrefix())) {
+							logger.info("Ignoring vote since unable to get UUID of bedrock player");
+							return;
+						}
+						debug("Fetching UUID online, since allowunjoined is enabled");
+						UUID u = null;
+						try {
+							if (config.getOnlineMode()) {
+								u = fetchUUID(player);
+							}
+						} catch (Exception e) {
+							if (getConfig().getDebug()) {
+								e.printStackTrace();
+							}
+						}
+						if (u == null) {
+							debug("Failed to get uuid for " + player);
+							return;
+						}
+						uuid = u.toString();
+					} else {
+						logger.info("Failed to get uuid for " + player);
 						return;
 					}
-					debug("Fetching UUID online, since allowunjoined is enabled");
-					UUID u = null;
-					try {
-						if (config.getOnlineMode()) {
-							u = fetchUUID(player);
-						}
-					} catch (Exception e) {
-						if (getConfig().getDebug()) {
-							e.printStackTrace();
-						}
-					}
-					if (u == null) {
-						debug("Failed to get uuid for " + player);
-						return;
-					}
-					uuid = u.toString();
 				} else {
 					logger.info("Ignoring vote from " + player + " since player hasn't joined before");
 					return;
@@ -1473,6 +1546,14 @@ public class VotingPluginVelocity {

 					int allTimeTotal = getValue(data, "AllTimeTotal", 1);
 					int monthTotal = getValue(data, "MonthTotal", 1);
+					int dateMonthTotal = -1;
+					if (config.getStoreMonthTotalsWithDate()) {
+						if (config.getUseMonthDateTotalsAsPrimaryTotal()) {
+							dateMonthTotal = getValue(data, getMonthTotalsWithDatePath(), 1);
+						} else {
+							dateMonthTotal = monthTotal;
+						}
+					}
 					int weeklyTotal = getValue(data, "WeeklyTotal", 1);
 					int dailyTotal = getValue(data, "DailyTotal", 1);
 					int points = getValue(data, "Points", getConfig().getPointsOnVote());
@@ -1486,11 +1567,19 @@ public class VotingPluginVelocity {
 							monthTotal = days * maxVotes;
 						}
 					}
+					if (getConfig().getLimitVotePoints() > 0) {
+						if (points > getConfig().getLimitVotePoints()) {
+							points = getConfig().getLimitVotePoints();
+						}
+					}
 					text = new BungeeMessageData(allTimeTotal, monthTotal, weeklyTotal, dailyTotal, points,
-							milestoneCount, votePartyVotes, currentVotePartyVotesRequired);
+							milestoneCount, votePartyVotes, currentVotePartyVotesRequired, dateMonthTotal);
 					ArrayList<Column> update = new ArrayList<Column>();
 					update.add(new Column("AllTimeTotal", new DataValueInt(allTimeTotal)));
 					update.add(new Column("MonthTotal", new DataValueInt(monthTotal)));
+					if (config.getStoreMonthTotalsWithDate()) {
+						update.add(new Column(getMonthTotalsWithDatePath(), new DataValueInt(dateMonthTotal)));
+					}
 					update.add(new Column("WeeklyTotal", new DataValueInt(weeklyTotal)));
 					update.add(new Column("DailyTotal", new DataValueInt(dailyTotal)));
 					update.add(new Column("Points", new DataValueInt(points)));
@@ -1498,7 +1587,7 @@ public class VotingPluginVelocity {
 					debug("Setting totals " + text.toString());
 					mysql.update(uuid, update);
 				} else {
-					text = new BungeeMessageData(0, 0, 0, 0, 0, 0, votePartyVotes, currentVotePartyVotesRequired);
+					text = new BungeeMessageData(0, 0, 0, 0, 0, 0, votePartyVotes, currentVotePartyVotesRequired, 0);
 				}
 			}

@@ -1,9 +1,7 @@
 package com.bencodez.votingplugin.commands;

-import java.io.IOException;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map.Entry;
@@ -22,21 +20,16 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.permissions.Permission;

-import com.bencodez.advancedcore.DebugLevel;
 import com.bencodez.advancedcore.api.command.CommandHandler;
 import com.bencodez.advancedcore.api.command.PlayerCommandHandler;
-import com.bencodez.advancedcore.api.command.TabCompleteHandle;
-import com.bencodez.advancedcore.api.command.TabCompleteHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.inventory.BInventory;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
-import com.bencodez.advancedcore.api.misc.PlayerUtils;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
+import com.bencodez.advancedcore.api.misc.PlayerManager;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
-import com.bencodez.advancedcore.api.updater.Updater;
 import com.bencodez.advancedcore.api.user.UserStorage;
 import com.bencodez.advancedcore.api.user.userstorage.Column;
 import com.bencodez.advancedcore.api.user.userstorage.DataType;
@@ -44,8 +37,13 @@ import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.listeners.BooleanListener;
 import com.bencodez.advancedcore.api.valuerequest.listeners.StringListener;
 import com.bencodez.advancedcore.api.yml.editor.ConfigEditor;
-import com.bencodez.advancedcore.api.yml.updater.ConfigUpdater;
 import com.bencodez.advancedcore.command.gui.UserGUI;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.command.TabCompleteHandle;
+import com.bencodez.simpleapi.command.TabCompleteHandler;
+import com.bencodez.simpleapi.debug.DebugLevel;
+import com.bencodez.simpleapi.messages.MessageAPI;
+import com.bencodez.simpleapi.updater.Updater;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.commands.executers.CommandAliases;
 import com.bencodez.votingplugin.commands.gui.AdminGUI;
@@ -68,6 +66,7 @@ import com.bencodez.votingplugin.commands.gui.player.VoteStreak;
 import com.bencodez.votingplugin.commands.gui.player.VoteToday;
 import com.bencodez.votingplugin.commands.gui.player.VoteTopVoter;
 import com.bencodez.votingplugin.commands.gui.player.VoteTopVoterLastMonth;
+import com.bencodez.votingplugin.commands.gui.player.VoteTopVoterPreviousMonths;
 import com.bencodez.votingplugin.commands.gui.player.VoteTotal;
 import com.bencodez.votingplugin.commands.gui.player.VoteURL;
 import com.bencodez.votingplugin.commands.gui.player.VoteURLVoteSite;
@@ -102,27 +101,27 @@ public class CommandLoader {
 	}

 	public void processSlotClick(Player player, VotingPluginUser user, String slot) {
-		if (StringParser.getInstance().startsWithIgnoreCase(slot, "url")) {
+		if (MessageAPI.startsWithIgnoreCase(slot, "url")) {
 			new VoteURL(plugin, player, user, true).open();
-		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "next")) {
+		} else if (MessageAPI.startsWithIgnoreCase(slot, "next")) {
 			new VoteNext(plugin, player, user).open(GUIMethod.CHEST);
-		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "last")) {
+		} else if (MessageAPI.startsWithIgnoreCase(slot, "last")) {
 			new VoteLast(plugin, player, user).open(GUIMethod.CHEST);
-		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "total")) {
+		} else if (MessageAPI.startsWithIgnoreCase(slot, "total")) {
 			new VoteTotal(plugin, player, user).open(GUIMethod.CHEST);
-		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "top")) {
+		} else if (MessageAPI.startsWithIgnoreCase(slot, "top")) {
 			new VoteTopVoter(plugin, player, user, TopVoter.getDefault(), 1).open(GUIMethod.CHEST);
-		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "today")) {
+		} else if (MessageAPI.startsWithIgnoreCase(slot, "today")) {
 			new VoteToday(plugin, player, user, 1).open(GUIMethod.CHEST);
-		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "help")) {
+		} else if (MessageAPI.startsWithIgnoreCase(slot, "help")) {
 			player.performCommand("vote help");
-		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "shop")) {
+		} else if (MessageAPI.startsWithIgnoreCase(slot, "shop")) {
 			new VoteShop(plugin, player, user).open(GUIMethod.CHEST);
-		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "lastmonth")) {
+		} else if (MessageAPI.startsWithIgnoreCase(slot, "lastmonth")) {
 			new VoteTopVoterLastMonth(plugin, player, user).open(GUIMethod.CHEST);
-		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "best")) {
+		} else if (MessageAPI.startsWithIgnoreCase(slot, "best")) {
 			new VoteBest(plugin, player, user).open(GUIMethod.CHEST);
-		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "streak")) {
+		} else if (MessageAPI.startsWithIgnoreCase(slot, "streak")) {
 			new VoteStreak(plugin, player, user).open(GUIMethod.CHEST);
 		}
 	}
@@ -292,16 +291,14 @@ public class CommandLoader {
 					public void executeSinglePlayer(CommandSender sender, String[] args) {
 						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 						user.setPoints(Integer.parseInt(args[3]));
-						sender.sendMessage(
-								StringParser.getInstance().colorize("&cSet " + args[1] + " points to " + args[3]));
+						sender.sendMessage(MessageAPI.colorize("&cSet " + args[1] + " points to " + args[3]));
 					}

 					@Override
 					public void executeAll(CommandSender sender, String[] args) {
 						int num = Integer.parseInt(args[3]);

-						sender.sendMessage(
-								StringParser.getInstance().colorize("&cSetting all players points to " + args[3]));
+						sender.sendMessage(MessageAPI.colorize("&cSetting all players points to " + args[3]));
 						for (String uuidStr : plugin.getUserManager().getAllUUIDs()) {
 							UUID uuid = UUID.fromString(uuidStr);
 							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid);
@@ -310,8 +307,7 @@ public class CommandLoader {
 							plugin.getSpecialRewards().checkMilestone(user, null,
 									plugin.getBungeeSettings().isUseBungeecoord());
 						}
-						sender.sendMessage(
-								StringParser.getInstance().colorize("&cDone setting all players points to " + args[3]));
+						sender.sendMessage(MessageAPI.colorize("&cDone setting all players points to " + args[3]));
 					}
 				});

@@ -329,6 +325,43 @@ public class CommandLoader {
 					}
 				});

+		plugin.getAdminVoteCommand().add(new CommandHandler(plugin, new String[] { "PauseRewards" },
+				"VotingPlugin.Commands.AdminVote.PauseRewards|" + adminPerm, "Pause rewards globally") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				if (!plugin.getOptions().isPauseRewards()) {
+					plugin.getOptions().setPauseRewards(true);
+					sendMessage(sender,
+							"&cRewards paused, note server restart will reset pause, resume with /av resumerewards");
+				} else {
+					sendMessage(sender, "&cRewards already paused, use /av resumerewards to resume");
+				}
+
+			}
+		});
+
+		plugin.getAdminVoteCommand().add(new CommandHandler(plugin, new String[] { "ResumeRewards" },
+				"VotingPlugin.Commands.AdminVote.ResumeRewards|" + adminPerm, "Resume rewards globally") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				if (plugin.getOptions().isPauseRewards()) {
+					plugin.getOptions().setPauseRewards(false);
+					for (Player p : Bukkit.getOnlinePlayers()) {
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
+						user.offVote();
+						user.checkOfflineRewards();
+					}
+					plugin.setUpdate(true);
+					sendMessage(sender, "&aRewards resumed");
+				} else {
+					sendMessage(sender, "&aRewards already resumed");
+				}
+
+			}
+		});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(plugin, new String[] { "ResetMilestoneCount" },
 				"VotingPlugin.Commands.AdminVote.ResetMilestoneCount|" + adminPerm, "Resets milestone count to 0") {

@@ -445,8 +478,8 @@ public class CommandLoader {
 							user.cache();
 							int newTotal = 0;
 							newTotal = user.addPoints(Integer.parseInt(args[3]));
-							sender.sendMessage(StringParser.getInstance().colorize("&cGave " + args[1] + " " + args[3]
-									+ " points" + ", " + args[1] + " now has " + newTotal + " points"));
+							sender.sendMessage(MessageAPI.colorize("&cGave " + args[1] + " " + args[3] + " points"
+									+ ", " + args[1] + " now has " + newTotal + " points"));
 						}
 					}

@@ -454,8 +487,8 @@ public class CommandLoader {
 					public void executeAll(CommandSender sender, String[] args) {
 						int num = Integer.parseInt(args[3]);

-						sender.sendMessage(StringParser.getInstance()
-								.colorize("&cGiving " + "all players" + " " + args[3] + " points"));
+						sender.sendMessage(
+								MessageAPI.colorize("&cGiving " + "all players" + " " + args[3] + " points"));
 						for (String uuidStr : plugin.getUserManager().getAllUUIDs()) {
 							UUID uuid = UUID.fromString(uuidStr);
 							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid);
@@ -464,8 +497,7 @@ public class CommandLoader {
 							plugin.getSpecialRewards().checkMilestone(user, null,
 									plugin.getBungeeSettings().isUseBungeecoord());
 						}
-						sender.sendMessage(StringParser.getInstance()
-								.colorize("&cGave " + "all players" + " " + args[3] + " points"));
+						sender.sendMessage(MessageAPI.colorize("&cGave " + "all players" + " " + args[3] + " points"));
 					}
 				});

@@ -478,8 +510,8 @@ public class CommandLoader {
 						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 						user.cache();
 						user.removePoints(Integer.parseInt(args[3]));
-						sender.sendMessage(StringParser.getInstance().colorize("&cRemoved " + args[3] + " points from "
-								+ args[1] + ", " + args[1] + " now has " + user.getPoints() + " points"));
+						sender.sendMessage(MessageAPI.colorize("&cRemoved " + args[3] + " points from " + args[1] + ", "
+								+ args[1] + " now has " + user.getPoints() + " points"));
 					}
 				});

@@ -666,8 +698,8 @@ public class CommandLoader {

 						@Override
 						public void execute(CommandSender sender, String[] args) {
-							sendMessage(sender, ArrayUtils.getInstance()
-									.convert(new AdminVotePerms(plugin, sender, 0).listPermsDev(sender)));
+							sendMessage(sender,
+									ArrayUtils.convert(new AdminVotePerms(plugin, sender, 0).listPermsDev(sender)));
 						}
 					});
 		}
@@ -692,6 +724,7 @@ public class CommandLoader {
 							+ "Detected that server hasn't received any votes from votifier, please check votifier connection");
 				}
 				if (!plugin.getConfigFile().isDisableUpdateChecking()
+						&& !plugin.getDescription().getVersion().endsWith("SNAPSHOT") && plugin.getUpdater() != null
 						&& plugin.getUpdater().getResult().equals(Updater.UpdateResult.UPDATE_AVAILABLE)) {
 					sendMessage(sender,
 							"&3Plugin has update available! https://www.spigotmc.org/resources/votingplugin.15358/");
@@ -719,6 +752,7 @@ public class CommandLoader {
 							+ "Detected that server hasn't received any votes from votifier, please check votifier connection");
 				}
 				if (!plugin.getConfigFile().isDisableUpdateChecking()
+						&& !plugin.getDescription().getVersion().endsWith("SNAPSHOT") && plugin.getUpdater() != null
 						&& plugin.getUpdater().getResult().equals(Updater.UpdateResult.UPDATE_AVAILABLE)) {
 					sendMessage(sender,
 							"&3Plugin has update available! https://www.spigotmc.org/resources/votingplugin.15358/");
@@ -759,7 +793,7 @@ public class CommandLoader {
 					sendMessage(sender, "AdvancedCore Jenkins build number: " + plugin.getAdvancedCoreBuildNumber());
 				}
 				if (!plugin.getBuildNumber().equals("NOTSET")) {
-					sendMessage(sender, "Using votingplugin jenkins build: " + plugin.getBuildNumber());
+					sendMessage(sender, "Using VotingPlugin jenkins build: " + plugin.getBuildNumber());
 				}
 			}
 		});
@@ -802,7 +836,7 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				sender.sendMessage(ChatColor.GREEN + "UUID of player " + ChatColor.DARK_GREEN + args[1]
-						+ ChatColor.GREEN + " is: " + PlayerUtils.getInstance().getUUID(args[1]));
+						+ ChatColor.GREEN + " is: " + PlayerManager.getInstance().getUUID(args[1]));

 			}
 		});
@@ -815,7 +849,7 @@ public class CommandLoader {
 				try {
 					sender.sendMessage(ChatColor.GREEN + "PlayerName of player " + ChatColor.DARK_GREEN + args[1]
 							+ ChatColor.GREEN + " is: "
-							+ PlayerUtils.getInstance().getPlayerName(
+							+ PlayerManager.getInstance().getPlayerName(
 									plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(args[1])),
 									args[1]));
 				} catch (IllegalArgumentException e) {
@@ -831,35 +865,57 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				if (sender instanceof Player) {
-					sender.sendMessage(
-							StringParser.getInstance().colorize("&cThis command can not be done from ingame"));
+					sender.sendMessage(MessageAPI.colorize("&cThis command can not be done from ingame"));
 					return;
 				}
-
 				for (TopVoter top : TopVoter.values()) {
 					plugin.getUserManager().removeAllKeyValues(top.getColumnName(), DataType.INTEGER);
 				}
 				plugin.getUserManager().getDataManager().clearCache();
 				plugin.setUpdate(true);
-				sender.sendMessage(StringParser.getInstance().colorize("&cCleared totals for everyone"));
+				sender.sendMessage(MessageAPI.colorize("&cCleared totals for everyone"));
 			}
 		});

+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(plugin, new String[] { "ResetTotal", "(TopVoter)" },
+						"VotingPlugin.Commands.AdminVote.ResetTotal.All|" + adminPerm,
+						"Reset specific totals for all players (DAY/WEEK/MONTH)") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						if (sender instanceof Player) {
+							sender.sendMessage(MessageAPI.colorize("&cThis command can not be done from ingame"));
+							return;
+						}
+
+						TopVoter top = TopVoter.getTopVoter(args[1]);
+						if (top.equals(TopVoter.AllTime)) {
+							sendMessage(sender, "&cCan't reset all time total or invalid argument: " + args[1]);
+							return;
+						}
+						plugin.getUserManager().removeAllKeyValues(top.getColumnName(), DataType.INTEGER);
+
+						plugin.getUserManager().getDataManager().clearCache();
+						plugin.setUpdate(true);
+						sender.sendMessage(MessageAPI.colorize("&cCleared totals of " + top.getColumnName()));
+					}
+				});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(plugin, new String[] { "ClearOfflineVoteRewards" },
 				"VotingPlugin.Commands.AdminVote.ClearOfflineVoteRewards|" + adminPerm, "Reset offline votes/rewards") {

 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				if (sender instanceof Player) {
-					sender.sendMessage(
-							StringParser.getInstance().colorize("&cThis command can not be done from ingame"));
+					sender.sendMessage(MessageAPI.colorize("&cThis command can not be done from ingame"));
 					return;
 				}
 				plugin.getUserManager().removeAllKeyValues("OfflineVotes", DataType.STRING);
 				plugin.getUserManager().removeAllKeyValues(plugin.getUserManager().getOfflineRewardsPath(),
 						DataType.STRING);
 				plugin.getUserManager().getDataManager().clearCache();
-				sender.sendMessage(StringParser.getInstance().colorize("&cCleared offline votes/rewards"));
+				sender.sendMessage(MessageAPI.colorize("&cCleared offline votes/rewards"));
 			}
 		});

@@ -871,8 +927,8 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						plugin.getVotingPluginUserManager().getVotingPluginUser(args[1])
 								.setDayVoteStreak(Integer.parseInt(args[4]));
-						sender.sendMessage(StringParser.getInstance()
-								.colorize("&cSet votestreak day for '" + args[1] + "' to " + args[4]));
+						sender.sendMessage(
+								MessageAPI.colorize("&cSet votestreak day for '" + args[1] + "' to " + args[4]));
 					}
 				});

@@ -884,8 +940,7 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				plugin.getVotingPluginUserManager().getVotingPluginUser(args[1])
 						.setWeekVoteStreak(Integer.parseInt(args[4]));
-				sender.sendMessage(StringParser.getInstance()
-						.colorize("&cSet votestreak week for '" + args[1] + "' to " + args[4]));
+				sender.sendMessage(MessageAPI.colorize("&cSet votestreak week for '" + args[1] + "' to " + args[4]));
 			}
 		});

@@ -897,8 +952,7 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				plugin.getVotingPluginUserManager().getVotingPluginUser(args[1])
 						.setMonthVoteStreak(Integer.parseInt(args[4]));
-				sender.sendMessage(StringParser.getInstance()
-						.colorize("&cSet votestreak month for '" + args[1] + "' to " + args[4]));
+				sender.sendMessage(MessageAPI.colorize("&cSet votestreak month for '" + args[1] + "' to " + args[4]));
 			}
 		});

@@ -913,7 +967,7 @@ public class CommandLoader {
 						public void execute(CommandSender sender, String[] args) {
 							plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]).setTotal(top,
 									Integer.parseInt(args[4]));
-							sender.sendMessage(StringParser.getInstance().colorize(
+							sender.sendMessage(MessageAPI.colorize(
 									"&cSet " + top.toString() + " total for '" + args[1] + "' to " + args[4]));
 						}
 					});
@@ -928,8 +982,8 @@ public class CommandLoader {
 						public void execute(CommandSender sender, String[] args) {
 							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 							user.setTotal(top, user.getTotal(top) + Integer.parseInt(args[4]));
-							sender.sendMessage(StringParser.getInstance()
-									.colorize("&cAdded " + top.toString() + " total for " + args[1]));
+							sender.sendMessage(
+									MessageAPI.colorize("&cAdded " + top.toString() + " total for " + args[1]));
 						}
 					});
 		}
@@ -941,7 +995,7 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 				user.clearTotals();
-				sender.sendMessage(StringParser.getInstance().colorize("&cCleared totals for '" + args[1] + "'"));
+				sender.sendMessage(MessageAPI.colorize("&cCleared totals for '" + args[1] + "'"));
 			}
 		});

@@ -955,8 +1009,7 @@ public class CommandLoader {
 						user.resetLastVoted();
 						plugin.getCoolDownCheck().check(user);
 						plugin.getCoolDownCheck().checkPerSite(user);
-						sender.sendMessage(
-								StringParser.getInstance().colorize("&cVoted sites reset for '" + args[1] + "'"));
+						sender.sendMessage(MessageAPI.colorize("&cVoted sites reset for '" + args[1] + "'"));
 					}
 				});

@@ -970,8 +1023,8 @@ public class CommandLoader {
 						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 						user.resetLastVoted(plugin.getVoteSite(args[3], false));
 						plugin.getCoolDownCheck().checkPerSite(user);
-						sender.sendMessage(StringParser.getInstance()
-								.colorize("&cVoted site reset for '" + args[1] + "'" + " on " + args[3]));
+						sender.sendMessage(
+								MessageAPI.colorize("&cVoted site reset for '" + args[1] + "'" + " on " + args[3]));
 					}
 				});

@@ -986,16 +1039,14 @@ public class CommandLoader {
 						user.setMilestoneCount(user.getMilestoneCount() + Integer.parseInt(args[3]));
 						plugin.getSpecialRewards().checkMilestone(user, null,
 								plugin.getBungeeSettings().isUseBungeecoord());
-						sender.sendMessage(
-								StringParser.getInstance().colorize("&cAdded milestonecount for " + args[1]));
+						sender.sendMessage(MessageAPI.colorize("&cAdded milestonecount for " + args[1]));
 					}

 					@Override
 					public void executeAll(CommandSender sender, String[] args) {
 						int toAdd = Integer.parseInt(args[3]);

-						sender.sendMessage(
-								StringParser.getInstance().colorize("&cAdding milestonecount for all players..."));
+						sender.sendMessage(MessageAPI.colorize("&cAdding milestonecount for all players..."));
 						for (String uuidStr : plugin.getUserManager().getAllUUIDs()) {
 							UUID uuid = UUID.fromString(uuidStr);
 							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid);
@@ -1004,8 +1055,7 @@ public class CommandLoader {
 							plugin.getSpecialRewards().checkMilestone(user, null,
 									plugin.getBungeeSettings().isUseBungeecoord());
 						}
-						sender.sendMessage(StringParser.getInstance()
-								.colorize("&cFinished adding milestonecount for all players"));
+						sender.sendMessage(MessageAPI.colorize("&cFinished adding milestonecount for all players"));
 					}
 				});

@@ -1017,8 +1067,8 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 						user.setMilestoneCount(Integer.parseInt(args[3]));
-						sender.sendMessage(StringParser.getInstance()
-								.colorize("&cSet milestonecount for " + args[1] + " to " + args[3]));
+						sender.sendMessage(
+								MessageAPI.colorize("&cSet milestonecount for " + args[1] + " to " + args[3]));
 					}
 				});

@@ -1031,8 +1081,7 @@ public class CommandLoader {
 					public void executeSinglePlayer(CommandSender sender, String[] args) {
 						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 						user.setHasGottenMilestone(new HashMap<String, Boolean>());
-						sender.sendMessage(
-								StringParser.getInstance().colorize("&cClearing gotten milestones for " + args[1]));
+						sender.sendMessage(MessageAPI.colorize("&cClearing gotten milestones for " + args[1]));
 					}

 					@Override
@@ -1041,14 +1090,13 @@ public class CommandLoader {
 						if (plugin.getBungeeSettings().isPerServerMilestones()) {
 							path = plugin.getBungeeSettings().getServerNameStorage() + "_" + "GottenMilestones";
 						}
-						sender.sendMessage(
-								StringParser.getInstance().colorize("&cClearing gotten milestones for all players..."));
+						sender.sendMessage(MessageAPI.colorize("&cClearing gotten milestones for all players..."));
 						plugin.getUserManager().removeAllKeyValues(path, DataType.STRING);
 						for (Player p : Bukkit.getOnlinePlayers()) {
 							plugin.getUserManager().getDataManager().cacheUser(p.getUniqueId());
 						}
-						sender.sendMessage(StringParser.getInstance()
-								.colorize("&cFinished clearing gotten milestones for all players"));
+						sender.sendMessage(
+								MessageAPI.colorize("&cFinished clearing gotten milestones for all players"));
 					}
 				});

@@ -1066,7 +1114,8 @@ public class CommandLoader {
 							PlayerVoteEvent voteEvent = new PlayerVoteEvent(site, args[1], site.getServiceSite(),
 									false);
 							if (voteEvent.getVoteSite() != null) {
-								if (!voteEvent.getVoteSite().isVaidServiceSite()) {
+								if (!voteEvent.getVoteSite().isVaidServiceSite()
+										&& !plugin.getConfigFile().isDisableNoServiceSiteMessage()) {
 									sendMessage(sender,
 											"&cPossible issue with service site, has the server gotten the vote from "
 													+ voteEvent.getServiceSite() + "?");
@@ -1092,11 +1141,14 @@ public class CommandLoader {
 				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[2], true), args[1], args[2],
 						false);
 				if (voteEvent.getVoteSite() != null) {
-					if (!voteEvent.getVoteSite().isVaidServiceSite()) {
+					if (!voteEvent.getVoteSite().isVaidServiceSite()
+							&& !plugin.getConfigFile().isDisableNoServiceSiteMessage()) {
 						sendMessage(sender, "&cPossible issue with service site, has the server gotten the vote from "
 								+ voteEvent.getServiceSite() + "?");
 					}
-					sendMessage(sender, "&cTriggering vote...");
+					if (!plugin.getConfigFile().isDisableNoServiceSiteMessage() && !isPlayer(sender)) {
+						sendMessage(sender, "&cTriggering vote...");
+					}

 					plugin.getVoteTimer().submit(new Runnable() {

@@ -1123,9 +1175,12 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[2], true), args[1],
 								args[2], false);
-						sendMessage(sender, "&cTriggering vote...");
+						if (!plugin.getConfigFile().isDisableNoServiceSiteMessage() && !isPlayer(sender)) {
+							sendMessage(sender, "&cTriggering vote...");
+						}
 						if (voteEvent.getVoteSite() != null) {
-							if (!voteEvent.getVoteSite().isVaidServiceSite()) {
+							if (!voteEvent.getVoteSite().isVaidServiceSite()
+									&& !plugin.getConfigFile().isDisableNoServiceSiteMessage()) {
 								sendMessage(sender,
 										"&cPossible issue with service site, has the server gotten the vote from "
 												+ voteEvent.getServiceSite() + "?");
@@ -1175,7 +1230,8 @@ public class CommandLoader {
 							PlayerVoteEvent voteEvent = new PlayerVoteEvent(site, args[1], site.getServiceSite(),
 									false);
 							if (voteEvent.getVoteSite() != null) {
-								if (!voteEvent.getVoteSite().isVaidServiceSite()) {
+								if (!voteEvent.getVoteSite().isVaidServiceSite()
+										&& !plugin.getConfigFile().isDisableNoServiceSiteMessage()) {
 									sendMessage(sender,
 											"&cPossible issue with service site, has the server gotten the vote from "
 													+ voteEvent.getServiceSite() + "?");
@@ -1199,9 +1255,12 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[3], true), args[1],
 								args[3], false);
-						sendMessage(sender, "&cTriggering vote...");
+						if (!plugin.getConfigFile().isDisableNoServiceSiteMessage() && !isPlayer(sender)) {
+							sendMessage(sender, "&cTriggering vote...");
+						}
 						if (voteEvent.getVoteSite() != null) {
-							if (!voteEvent.getVoteSite().isVaidServiceSite()) {
+							if (!voteEvent.getVoteSite().isVaidServiceSite()
+									&& !plugin.getConfigFile().isDisableNoServiceSiteMessage()) {
 								sendMessage(sender,
 										"&cPossible issue with service site, has the server gotten the vote from "
 												+ voteEvent.getServiceSite() + "?");
@@ -1234,10 +1293,10 @@ public class CommandLoader {

 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				sender.sendMessage(StringParser.getInstance().colorize("&cCreating VoteSite..." + args[1]));
+				sender.sendMessage(MessageAPI.colorize("&cCreating VoteSite..." + args[1]));

 				plugin.getConfigVoteSites().generateVoteSite(args[1]);
-				sender.sendMessage(StringParser.getInstance().colorize("&cCreated VoteSite: &c&l" + args[1]));
+				sender.sendMessage(MessageAPI.colorize("&cCreated VoteSite: &c&l" + args[1]));

 			}
 		});
@@ -1249,7 +1308,7 @@ public class CommandLoader {

 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VotingPluginMain.plugin.getOptions().setDebug(DebugLevel.INFO);
+						plugin.getOptions().setDebug(DebugLevel.INFO);
 					}
 				});

@@ -1260,25 +1319,7 @@ public class CommandLoader {

 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VotingPluginMain.plugin.getOptions().setDebug(DebugLevel.EXTRA);
-					}
-				});
-
-		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(plugin, new String[] { "Config", "Update" },
-						"VotingPlugin.Commands.AdminVote.Config.Edit|" + adminPerm,
-						"Force update Config.yml with new options") {
-
-					@Override
-					public void execute(CommandSender sender, String[] args) {
-						try {
-							ConfigUpdater.update(plugin, "Config.yml", plugin.getConfigFile().getdFile(), Arrays
-									.asList("VoteReminding", "MySQL", "CustomCommands", "CustomPlaceholderReturns"));
-							plugin.getConfigFile().reloadData();
-						} catch (IOException e) {
-							e.printStackTrace();
-						}
-						sendMessage(sender, "&aUpdated config");
+						plugin.getOptions().setDebug(DebugLevel.EXTRA);
 					}
 				});

@@ -1291,7 +1332,7 @@ public class CommandLoader {
 						String voteSite = plugin.getVoteSiteName(true, args[1]);
 						String serviceSite = args[3];
 						plugin.getConfigVoteSites().setServiceSite(voteSite, serviceSite);
-						sender.sendMessage(StringParser.getInstance()
+						sender.sendMessage(MessageAPI
 								.colorize("&cSet ServiceSite to &c&l" + serviceSite + "&c on &c&l" + voteSite));
 					}
 				});
@@ -1314,8 +1355,7 @@ public class CommandLoader {
 								}
 							}
 						}, 5, TimeUnit.SECONDS);
-						sender.sendMessage(
-								StringParser.getInstance().colorize("&cForce checking on vote cooldown rewards"));
+						sender.sendMessage(MessageAPI.colorize("&cForce checking on vote cooldown rewards"));
 					}
 				});

@@ -1328,8 +1368,8 @@ public class CommandLoader {
 						String voteSite = plugin.getVoteSiteName(true, args[1]);
 						String url = args[3];
 						plugin.getConfigVoteSites().setVoteURL(voteSite, url);
-						sender.sendMessage(StringParser.getInstance()
-								.colorize("&cSet VoteURL to &c&l" + url + "&c on &c&l" + voteSite));
+						sender.sendMessage(
+								MessageAPI.colorize("&cSet VoteURL to &c&l" + url + "&c on &c&l" + voteSite));
 					}
 				});

@@ -1342,8 +1382,8 @@ public class CommandLoader {
 						String voteSite = plugin.getVoteSiteName(true, args[1]);
 						int value = Integer.parseInt(args[3]);
 						plugin.getConfigVoteSites().setPriority(voteSite, value);
-						sender.sendMessage(StringParser.getInstance()
-								.colorize("&cSet priortiy to &c&l" + value + "&c on &c&l" + voteSite));
+						sender.sendMessage(
+								MessageAPI.colorize("&cSet priortiy to &c&l" + value + "&c on &c&l" + voteSite));

 					}
 				});
@@ -1357,8 +1397,8 @@ public class CommandLoader {
 						String voteSite = plugin.getVoteSiteName(true, args[1]);
 						int delay = Integer.parseInt(args[3]);
 						plugin.getConfigVoteSites().setVoteDelay(voteSite, delay);
-						sender.sendMessage(StringParser.getInstance()
-								.colorize("&cSet VoteDelay to &c&l" + delay + "&c on &c&l" + voteSite));
+						sender.sendMessage(
+								MessageAPI.colorize("&cSet VoteDelay to &c&l" + delay + "&c on &c&l" + voteSite));

 					}
 				});
@@ -1373,22 +1413,22 @@ public class CommandLoader {

 					@Override
 					public void run() {
-						sender.sendMessage(StringParser.getInstance().colorize("&cChecking for update..."));
+						sender.sendMessage(MessageAPI.colorize("&cChecking for update..."));
 						plugin.setUpdater(new Updater(plugin, 15358, false));
 						final Updater.UpdateResult result = plugin.getUpdater().getResult();
 						switch (result) {
 						case FAIL_SPIGOT: {
-							sender.sendMessage(StringParser.getInstance()
+							sender.sendMessage(MessageAPI
 									.colorize("&cFailed to check for update for &c&l" + plugin.getName() + "&c!"));
 							break;
 						}
 						case NO_UPDATE: {
-							sender.sendMessage(StringParser.getInstance().colorize("&c&l" + plugin.getName()
+							sender.sendMessage(MessageAPI.colorize("&c&l" + plugin.getName()
 									+ " &cis up to date! Version: &c&l" + plugin.getUpdater().getVersion()));
 							break;
 						}
 						case UPDATE_AVAILABLE: {
-							sender.sendMessage(StringParser.getInstance().colorize(
+							sender.sendMessage(MessageAPI.colorize(
 									"&c&l" + plugin.getName() + " &chas an update available! Your Version: &c&l"
 											+ plugin.getDescription().getVersion() + " &cNew Version: &c&l"
 											+ plugin.getUpdater().getVersion()));
@@ -1414,8 +1454,7 @@ public class CommandLoader {
 						boolean value = Boolean.parseBoolean(args[3]);

 						plugin.getConfigVoteSites().setEnabled(voteSite, value);
-						sender.sendMessage(StringParser.getInstance()
-								.colorize("&cSet votesite " + voteSite + " enabled to " + value));
+						sender.sendMessage(MessageAPI.colorize("&cSet votesite " + voteSite + " enabled to " + value));

 					}
 				});
@@ -1427,23 +1466,22 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				String siteName = args[1];
 				if (!plugin.getConfigVoteSites().isServiceSiteGood(siteName)) {
-					sender.sendMessage(StringParser.getInstance()
-							.colorize("&cServiceSite is invalid, votes may not work properly"));
+					sender.sendMessage(MessageAPI.colorize("&cServiceSite is invalid, votes may not work properly"));
 				} else {
 					String service = plugin.getConfigVoteSites().getServiceSite(siteName);
 					if (plugin.getServerData().getServiceSites().contains(service)) {
-						sender.sendMessage(StringParser.getInstance().colorize("&aServiceSite is properly setup"));
+						sender.sendMessage(MessageAPI.colorize("&aServiceSite is properly setup"));
 					} else {
-						sender.sendMessage(StringParser.getInstance()
-								.colorize("&cService may not be valid, haven't recieved a vote from " + service
-										+ ", see /av servicesites"));
+						sender.sendMessage(
+								MessageAPI.colorize("&cService may not be valid, haven't recieved a vote from "
+										+ service + ", see /av servicesites"));
 					}

 				}
 				if (!plugin.getConfigVoteSites().isVoteURLGood(siteName)) {
-					sender.sendMessage(StringParser.getInstance().colorize("&cVoteURL is invalid"));
+					sender.sendMessage(MessageAPI.colorize("&cVoteURL is invalid"));
 				} else {
-					sender.sendMessage(StringParser.getInstance().colorize("&aVoteURL is properly setup"));
+					sender.sendMessage(MessageAPI.colorize("&aVoteURL is properly setup"));
 				}
 			}
 		});
@@ -1455,7 +1493,7 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				plugin.setUpdate(true);
 				plugin.update();
-				sender.sendMessage(StringParser.getInstance().colorize("&cUpdating..."));
+				sender.sendMessage(MessageAPI.colorize("&cUpdating..."));
 			}
 		});

@@ -1466,7 +1504,7 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				plugin.getUserManager().removeAllKeyValues("OfflineVotes", DataType.STRING);
 				plugin.getUserManager().getDataManager().clearCache();
-				sender.sendMessage(StringParser.getInstance().colorize("&cOffline votes Cleared"));
+				sender.sendMessage(MessageAPI.colorize("&cOffline votes Cleared"));
 			}
 		});

@@ -1579,7 +1617,7 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 						plugin.getRewardHandler().giveReward(user, plugin.getConfigFile().getData(),
-								plugin.getGui().getChestShopIdentifierRewardsPath(args[3]), new RewardOptions());
+								plugin.getShopFile().getShopIdentifierRewardsPath(args[3]), new RewardOptions());
 						sendMessage(sender, "&cVoteShop " + args[3] + " forced");
 					}
 				});
@@ -1646,15 +1684,19 @@ public class CommandLoader {

 			plugin.getAdminVoteCommand()
 					.add(new CommandHandler(plugin,
-							new String[] { "User", "(player)", "ForceVoteStreak", str, "(Number)" },
+							new String[] { "User", "(player)", "ForceVoteStreak", str, "(Text)" },
 							"VotingPlugin.Commands.AdminVote.ForceVoteStreak|" + adminPerm,
 							"Force a votestreak reward for " + str) {

 						@Override
 						public void execute(CommandSender sender, String[] args) {
+							String num = args[4];
+							if (num.contains("-")) {
+								num = num.replaceAll("-", "");
+							}
 							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 							plugin.getSpecialRewards().giveVoteStreakReward(user, user.isOnline(), str, args[4],
-									parseInt(args[4]), plugin.getBungeeSettings().isUseBungeecoord());
+									parseInt(num), plugin.getBungeeSettings().isUseBungeecoord());
 							sendMessage(sender, "&cVoteStreak " + str + " " + args[4] + " forced");
 						}
 					});
@@ -1726,6 +1768,17 @@ public class CommandLoader {
 					}
 				});

+		plugin.getAdminVoteCommand().add(new CommandHandler(plugin, new String[] { "PurgeNoData" },
+				"VotingPlugin.PurgeNoData",
+				"Purge players from database with no data and haven't been online for a number of days (Set in Config.yml)") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				plugin.getVotingPluginUserManager().purgeOldPlayersNowNoData();
+				sendMessage(sender, "&cPurged players with no data");
+			}
+		});
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(plugin, new String[] { "RemoveOfflineUUIDs" },
 						"VotingPlugin.Commands.AdminVote.RemoveOfflineUUIDs|" + adminPerm,
@@ -1948,8 +2001,8 @@ public class CommandLoader {
 								for (VoteSite voteSite : plugin.getVoteSitesEnabled()) {
 									voteSites.add(voteSite.getKey());
 								}
-								new ValueRequest().requestString(player, "",
-										ArrayUtils.getInstance().convert(voteSites), true, new StringListener() {
+								new ValueRequest().requestString(player, "", ArrayUtils.convert(voteSites), true,
+										new StringListener() {

 											@Override
 											public void onInput(Player player, String value) {
@@ -1978,7 +2031,7 @@ public class CommandLoader {
 								String playerName = (String) event.getMeta(player, "Player");
 								BInventory inv = new BInventory("MileStones: " + playerName);
 								for (String mileStoneName : plugin.getSpecialRewardsConfig().getMilestoneVotes()) {
-									if (StringParser.getInstance().isInt(mileStoneName)) {
+									if (MessageAPI.isInt(mileStoneName)) {
 										int mileStone = Integer.parseInt(mileStoneName);

 										inv.addButton(inv.getNextSlot(),
@@ -1990,8 +2043,8 @@ public class CommandLoader {

 													@Override
 													public void onClick(ClickEvent clickEvent) {
-														if (StringParser.getInstance().isInt(clickEvent.getClickedItem()
-																.getItemMeta().getDisplayName())) {
+														if (MessageAPI.isInt(clickEvent.getClickedItem().getItemMeta()
+																.getDisplayName())) {
 															Player player = clickEvent.getPlayer();
 															int mileStone = Integer.parseInt(clickEvent.getClickedItem()
 																	.getItemMeta().getDisplayName());
@@ -2085,7 +2138,7 @@ public class CommandLoader {
 			@Override
 			public void reload() {
 				ArrayList<String> sites = new ArrayList<String>();
-				for (String str : plugin.getGui().getChestShopIdentifiers()) {
+				for (String str : plugin.getShopFile().getShopIdentifiers()) {
 					sites.add(str);
 				}
 				setReplace(sites);
@@ -2115,7 +2168,7 @@ public class CommandLoader {
 					} else {
 						try {
 							user.setPrimaryAccount(
-									java.util.UUID.fromString(PlayerUtils.getInstance().getUUID(args[1])));
+									java.util.UUID.fromString(PlayerManager.getInstance().getUUID(args[1])));
 							sendMessage(sender, "&cPrimary account set");
 						} catch (Exception e) {
 							e.printStackTrace();
@@ -2166,7 +2219,7 @@ public class CommandLoader {
 			}
 		});

-		if (plugin.getGui().isChestVoteShopEnabled()) {
+		if (plugin.getShopFile().isVoteShopEnabled()) {
 			plugin.getVoteCommand().add(new CommandHandler(plugin, new String[] { "Shop" },
 					"VotingPlugin.Commands.Vote.Shop|" + playerPerm, "Open VoteShop GUI", false) {

@@ -2181,21 +2234,21 @@ public class CommandLoader {

 				@Override
 				public void execute(CommandSender sender, String[] args) {
-					if (!plugin.getGui().isChestVoteShopEnabled()) {
-						sender.sendMessage(StringParser.getInstance().colorize("&cVote shop disabled"));
+					if (!plugin.getShopFile().isVoteShopEnabled()) {
+						sender.sendMessage(MessageAPI.colorize("&cVote shop disabled"));
 						return;
 					}

 					String identifier = args[1];
-					Set<String> identifiers = plugin.getGui().getChestShopIdentifiers();
-					if (ArrayUtils.getInstance().containsIgnoreCase(identifiers, identifier)) {
+					Set<String> identifiers = plugin.getShopFile().getShopIdentifiers();
+					if (ArrayUtils.containsIgnoreCase(identifiers, identifier)) {
 						for (String ident : identifiers) {
 							if (ident.equalsIgnoreCase(args[1])) {
 								identifier = ident;
 							}
 						}

-						String perm = plugin.getGui().getChestVoteShopPermission(identifier);
+						String perm = plugin.getShopFile().getVoteShopPermission(identifier);
 						boolean hasPerm = false;
 						if (perm.isEmpty()) {
 							hasPerm = true;
@@ -2203,7 +2256,7 @@ public class CommandLoader {
 							hasPerm = sender.hasPermission(perm);
 						}

-						int limit = plugin.getGui().getChestShopIdentifierLimit(identifier);
+						int limit = plugin.getShopFile().getShopIdentifierLimit(identifier);

 						VotingPluginUser user = plugin.getVotingPluginUserManager()
 								.getVotingPluginUser(sender.getName());
@@ -2215,12 +2268,12 @@ public class CommandLoader {
 							}
 						}

-						if (!plugin.getGui().getChestVoteShopNotBuyable(identifier)) {
+						if (!plugin.getShopFile().getVoteShopNotBuyable(identifier)) {
 							if (hasPerm) {
 								if (plugin.getConfigFile().isExtraVoteShopCheck()) {
 									user.cache();
 								}
-								int points = plugin.getGui().getChestShopIdentifierCost(identifier);
+								int points = plugin.getShopFile().getShopIdentifierCost(identifier);
 								if (identifier != null) {

 									if (limitPass) {
@@ -2230,22 +2283,22 @@ public class CommandLoader {
 										placeholders.put("limit", "" + limit);
 										if (user.removePoints(points, true)) {

-											plugin.getRewardHandler().giveReward(user, plugin.getGui().getData(),
-													plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
+											plugin.getRewardHandler().giveReward(user, plugin.getShopFile().getData(),
+													plugin.getShopFile().getShopIdentifierRewardsPath(identifier),
 													new RewardOptions().setPlaceholders(placeholders));

-											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+											user.sendMessage(PlaceholderUtils.replacePlaceHolder(
 													plugin.getConfigFile().getFormatShopPurchaseMsg(), placeholders));
 											if (limit > 0) {
 												user.setVoteShopIdentifierLimit(identifier,
 														user.getVoteShopIdentifierLimit(identifier) + 1);
 											}
 										} else {
-											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+											user.sendMessage(PlaceholderUtils.replacePlaceHolder(
 													plugin.getConfigFile().getFormatShopFailedMsg(), placeholders));
 										}
 									} else {
-										user.sendMessage(plugin.getGui().getChestVoteShopLimitReached());
+										user.sendMessage(plugin.getShopFile().getVoteShopLimitReached());
 									}
 								}

@@ -2288,7 +2341,7 @@ public class CommandLoader {
 					new VoteLast(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]))
 							.open();
 				} else {
-					sendMessage(sender, StringParser.getInstance()
+					sendMessage(sender, PlaceholderUtils
 							.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
 				}

@@ -2333,7 +2386,7 @@ public class CommandLoader {
 					new VoteNext(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]))
 							.open();
 				} else {
-					sendMessage(sender, StringParser.getInstance()
+					sendMessage(sender, PlaceholderUtils
 							.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
 				}
 			}
@@ -2351,10 +2404,10 @@ public class CommandLoader {
 					if (sender instanceof Player) {
 						plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender).sendMessage(msg);
 					} else {
-						sender.sendMessage(StringParser.getInstance().colorize(msg));
+						sender.sendMessage(MessageAPI.colorize(msg));
 					}
 				} else {
-					sendMessage(sender, StringParser.getInstance()
+					sendMessage(sender, PlaceholderUtils
 							.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
 				}

@@ -2392,7 +2445,7 @@ public class CommandLoader {
 					new VoteGUI(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]))
 							.open();
 				} else {
-					sendMessage(sender, StringParser.getInstance()
+					sendMessage(sender, PlaceholderUtils
 							.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
 				}

@@ -2424,6 +2477,21 @@ public class CommandLoader {
 					});
 		}

+		if (plugin.getConfigFile().isStoreMonthTotalsWithDate()
+				|| plugin.getOptions().getDebug().equals(DebugLevel.DEV)) {
+			plugin.getVoteCommand()
+					.add(new CommandHandler(plugin, new String[] { "PreviousMonthsTotals" },
+							"VotingPlugin.Commands.Vote.PreviousMonthsTotals",
+							"Open list of Top Voters from all known previous months") {
+
+						@Override
+						public void execute(CommandSender sender, String[] args) {
+							new VoteTopVoterPreviousMonths(plugin, sender,
+									plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender), 0).open();
+						}
+					});
+		}
+
 		plugin.getVoteCommand().add(new CommandHandler(plugin, new String[] { "Top" },
 				"VotingPlugin.Commands.Vote.Top|" + playerPerm, "Open list of Top Voters") {

@@ -2544,14 +2612,14 @@ public class CommandLoader {
 				}

 				for (String s : plugin.getConfigFile().getFormatCommandsVoteTotalAll()) {
-					String str = StringParser.getInstance().replaceIgnoreCase(s, "%DailyTotal%", "" + daily);
-					str = StringParser.getInstance().replaceIgnoreCase(str, "%WeeklyTotal%", "" + weekly);
-					str = StringParser.getInstance().replaceIgnoreCase(str, "%MonthlyTotal%", "" + month);
-					str = StringParser.getInstance().replaceIgnoreCase(str, "%AllTimeTotal%", "" + all);
+					String str = MessageAPI.replaceIgnoreCase(s, "%DailyTotal%", "" + daily);
+					str = MessageAPI.replaceIgnoreCase(str, "%WeeklyTotal%", "" + weekly);
+					str = MessageAPI.replaceIgnoreCase(str, "%MonthlyTotal%", "" + month);
+					str = MessageAPI.replaceIgnoreCase(str, "%AllTimeTotal%", "" + all);
 					msg.add(str);
 				}

-				msg = ArrayUtils.getInstance().colorize(msg);
+				msg = ArrayUtils.colorize(msg);
 				sendMessage(sender, msg);

 			}
@@ -2566,7 +2634,7 @@ public class CommandLoader {
 					new VoteTotal(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]))
 							.open();
 				} else {
-					sendMessage(sender, StringParser.getInstance()
+					sendMessage(sender, PlaceholderUtils
 							.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
 				}

@@ -2602,7 +2670,7 @@ public class CommandLoader {
 					new VoteBest(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]))
 							.open();
 				} else {
-					sendMessage(sender, StringParser.getInstance()
+					sendMessage(sender, PlaceholderUtils
 							.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
 				}
 			}
@@ -2627,7 +2695,7 @@ public class CommandLoader {
 					new VoteStreak(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]))
 							.open();
 				} else {
-					sendMessage(sender, StringParser.getInstance()
+					sendMessage(sender, PlaceholderUtils
 							.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
 				}
 			}
@@ -2661,11 +2729,11 @@ public class CommandLoader {
 											placeholders.put("touser", "" + user.getPlayerName());
 											placeholders.put("fromuser", "" + cPlayer.getPlayerName());
 											sendMessage(sender,
-													StringParser.getInstance()
-															.replacePlaceHolder(plugin.getConfigFile()
+													PlaceholderUtils.replacePlaceHolder(
+															plugin.getConfigFile()
 																	.getFormatCommandsVoteGivePointsTransferFrom(),
-																	placeholders));
-											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+															placeholders));
+											user.sendMessage(PlaceholderUtils.replacePlaceHolder(
 													plugin.getConfigFile().getFormatCommandsVoteGivePointsTransferTo(),
 													placeholders));
 										} else {
@@ -2678,7 +2746,7 @@ public class CommandLoader {
 									}
 								} else {
 									sendMessage(sender,
-											StringParser.getInstance().replacePlaceHolder(
+											PlaceholderUtils.replacePlaceHolder(
 													plugin.getConfigFile()
 															.getFormatCommandsVoteGivePointsNotJoinedServer(),
 													"player", args[1]));
@@ -2720,7 +2788,7 @@ public class CommandLoader {
 			for (String ident : plugin.getConfigFile().getCustomCommands()) {
 				ConfigurationSection section = plugin.getConfigFile().getCustomCommands(ident);
 				@SuppressWarnings("unchecked")
-				String[] args = ArrayUtils.getInstance()
+				String[] args = ArrayUtils
 						.convert((ArrayList<String>) section.getList("Args", new ArrayList<String>()));
 				plugin.getVoteCommand().add(new CommandHandler(plugin, args, section.getString("Permission", ""),
 						section.getString("HelpMessage", "")) {
@@ -2763,8 +2831,7 @@ public class CommandLoader {
 			}

 			if (remove) {
-				plugin.debug("Disabling: " + ArrayUtils.getInstance()
-						.makeStringList(ArrayUtils.getInstance().convert(list.get(i).getArgs())));
+				plugin.debug("Disabling: " + ArrayUtils.makeStringList(ArrayUtils.convert(list.get(i).getArgs())));
 				list.remove(i);
 			}
 		}
@@ -5,7 +5,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

 import com.bencodez.advancedcore.api.command.CommandHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;

 // TODO: Auto-generated Javadoc
@@ -36,7 +36,7 @@ public class CommandAdminVote implements CommandExecutor {
 		}

 		// invalid command
-		sender.sendMessage(StringParser.getInstance().colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));
+		sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));

 		return true;
 	}
@@ -7,8 +7,8 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

 import com.bencodez.advancedcore.api.command.CommandHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;

 // TODO: Auto-generated Javadoc
@@ -46,7 +46,7 @@ public class CommandAliases implements CommandExecutor {
 			argsNew.add(arg);
 		}
 		plugin.debug("Attempting cmd...");
-		plugin.debug("Inputed args: " + ArrayUtils.getInstance().makeStringList(argsNew));
+		plugin.debug("Inputed args: " + ArrayUtils.makeStringList(argsNew));

 		ArrayList<CommandHandler> handles = new ArrayList<CommandHandler>();
 		if (adminCommand) {
@@ -73,7 +73,7 @@ public class CommandAliases implements CommandExecutor {
 						}

 						if (argsMatch) {
-							if (cmdHandle.runCommand(sender, ArrayUtils.getInstance().convert(argsNew))) {
+							if (cmdHandle.runCommand(sender, ArrayUtils.convert(argsNew))) {
 								plugin.debug("cmd found, ran cmd");
 								return true;
 							}
@@ -92,10 +92,10 @@ public class CommandAliases implements CommandExecutor {
 		// invalid command
 		if (adminCommand) {
 			sender.sendMessage(
-					StringParser.getInstance().colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));
+					MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));
 		} else {
 			sender.sendMessage(
-					StringParser.getInstance().colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
+					MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
 		}
 		return true;
 	}
@@ -5,7 +5,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

 import com.bencodez.advancedcore.api.command.CommandHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;

 // TODO: Auto-generated Javadoc
@@ -61,7 +61,7 @@ public class CommandVote implements CommandExecutor {
 		}

 		// invalid command
-		sender.sendMessage(StringParser.getInstance().colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
+		sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
 		return true;
 	}

@@ -19,14 +19,14 @@ import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueLi
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueNumber;
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueString;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
-import com.bencodez.advancedcore.api.misc.PlayerUtils;
 import com.bencodez.advancedcore.api.valuerequest.InputMethod;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
 import com.bencodez.advancedcore.api.valuerequest.listeners.StringListener;
 import com.bencodez.advancedcore.api.yml.editor.ConfigEditor;
 import com.bencodez.advancedcore.command.gui.RewardEditGUI;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.player.PlayerUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVoteVoteParty;
 import com.bencodez.votingplugin.commands.gui.admin.cumulative.AdminVoteCumulative;
@@ -251,7 +251,7 @@ public class AdminGUI {
 			lore.add("VoteDelay: " + voteSite.getVoteDelay());
 			lore.add("VoteDelayMin: " + voteSite.getVoteDelayMin());

-			inv.addButton(count, new BInventoryButton(voteSite.getKey(), ArrayUtils.getInstance().convert(lore),
+			inv.addButton(count, new BInventoryButton(voteSite.getKey(), ArrayUtils.convert(lore),
 					new ItemStack(Material.STONE)) {

 				@Override
@@ -289,7 +289,7 @@ public class AdminGUI {

 					@Override
 					public void onInput(Player player, String value) {
-						Object ob = PlayerUtils.getInstance().getPlayerMeta(player, "VoteSite");
+						Object ob = PlayerUtils.getPlayerMeta(plugin, player, "VoteSite");
 						if (ob != null) {
 							VoteSite site = (VoteSite) ob;
 							PlayerVoteEvent voteEvent = new PlayerVoteEvent(site, value, site.getServiceSite(), false);
@@ -302,7 +302,7 @@ public class AdminGUI {
 							});
 						}
 					}
-				}, ArrayUtils.getInstance().convert(playerNames)).usingMethod(InputMethod.INVENTORY)
+				}, ArrayUtils.convert(playerNames)).usingMethod(InputMethod.INVENTORY)
 						.allowCustomOption(true).request(event.getWhoClicked());
 			}
 		});
@@ -10,7 +10,7 @@ import org.bukkit.entity.Player;
 import com.bencodez.advancedcore.api.command.CommandHandler;
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;

 import net.md_5.bungee.api.chat.TextComponent;
@@ -43,9 +43,9 @@ public class AdminVoteHelp extends GUIHandler {
 			maxPage++;
 		}

-		msg.add(StringParser.getInstance().stringToComp("&6&lVotingPlugin Admin Help " + (page) + "/" + maxPage));
-		msg.add(StringParser.getInstance().stringToComp("&6&l() = Needed"));
-		msg.add(StringParser.getInstance().stringToComp("&6&lAliases: adminvote, av"));
+		msg.add(MessageAPI.stringToComp("&6&lVotingPlugin Admin Help " + (page) + "/" + maxPage));
+		msg.add(MessageAPI.stringToComp("&6&l() = Needed"));
+		msg.add(MessageAPI.stringToComp("&6&lAliases: adminvote, av"));

 		for (int i = pagesize * (page - 1); (i < text.size()) && (i < ((page) * pagesize)); i++) {
 			msg.add(text.get(i));
@@ -12,7 +12,7 @@ import org.bukkit.permissions.Permission;
 import com.bencodez.advancedcore.api.command.CommandHandler;
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;

 public class AdminVotePerms extends GUIHandler {
@@ -108,9 +108,9 @@ public class AdminVotePerms extends GUIHandler {
 			text.add(msg.get(i));
 		}

-		text = ArrayUtils.getInstance().colorize(text);
+		text = ArrayUtils.colorize(text);

-		return ArrayUtils.getInstance().convert(text);
+		return ArrayUtils.convert(text);
 	}

 	public ArrayList<String> listPerms(CommandSender sender, String player, int page) {
@@ -158,7 +158,7 @@ public class AdminVotePerms extends GUIHandler {
 				}
 			}

-			msg = ArrayUtils.getInstance().colorize(msg);
+			msg = ArrayUtils.colorize(msg);

 			int pagesize = plugin.getConfigFile().getFormatPageSize();

@@ -175,7 +175,7 @@ public class AdminVotePerms extends GUIHandler {
 		} else {
 			text.add("&cPlayer not online: " + player);
 		}
-		return ArrayUtils.getInstance().colorize(text);
+		return ArrayUtils.colorize(text);

 	}

@@ -202,9 +202,9 @@ public class AdminVotePerms extends GUIHandler {
 			msg.add(perm.getName() + " : " + perm.getDescription());
 		}

-		msg = ArrayUtils.getInstance().colorize(msg);
+		msg = ArrayUtils.colorize(msg);

-		return ArrayUtils.getInstance().convert(msg);
+		return ArrayUtils.convert(msg);
 	}

 	@Override
@@ -12,12 +12,12 @@ import com.bencodez.advancedcore.api.inventory.BInventory;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.valuerequest.InputMethod;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
 import com.bencodez.advancedcore.api.valuerequest.listeners.NumberListener;
 import com.bencodez.advancedcore.command.gui.RewardEditGUI;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;

 public class AdminVoteCumulative extends GUIHandler {
@@ -54,7 +54,7 @@ public class AdminVoteCumulative extends GUIHandler {
 					public void onClick(ClickEvent clickEvent) {
 						ArrayList<Integer> nums = new ArrayList<Integer>();
 						for (String num : plugin.getSpecialRewardsConfig().getCumulativeVotes()) {
-							if (StringParser.getInstance().isInt(num)) {
+							if (MessageAPI.isInt(num)) {
 								nums.add(Integer.parseInt(num));
 							}
 						}
@@ -12,12 +12,12 @@ import com.bencodez.advancedcore.api.inventory.BInventory;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.valuerequest.InputMethod;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
 import com.bencodez.advancedcore.api.valuerequest.listeners.NumberListener;
 import com.bencodez.advancedcore.command.gui.RewardEditGUI;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;

 public class AdminVoteMilestones extends GUIHandler {
@@ -54,7 +54,7 @@ public class AdminVoteMilestones extends GUIHandler {
 					public void onClick(ClickEvent clickEvent) {
 						ArrayList<Integer> nums = new ArrayList<Integer>();
 						for (String num : plugin.getSpecialRewardsConfig().getMilestoneVotes()) {
-							if (StringParser.getInstance().isInt(num)) {
+							if (MessageAPI.isInt(num)) {
 								nums.add(Integer.parseInt(num));
 							}
 						}
@@ -59,7 +59,7 @@ public class AdminVoteVoteShop extends GUIHandler {

 					@Override
 					public void onInput(Player player, String value) {
-						plugin.getGui().createShop(value);
+						plugin.getShopFile().createShop(value);
 						plugin.reload();
 					}
 				});
@@ -53,7 +53,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");
 		// to add
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueString("Identifier_Name",
-				plugin.getGui().getChestShopIdentifierIdentifierName(identifier)) {
+				plugin.getShopFile().getShopIdentifierIdentifierName(identifier)) {

 			@Override
 			public void setValue(Player player, String name) {
@@ -61,7 +61,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 			}
 		}));
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.OAK_DOOR, 1),
-				new EditGUIValueString("Permission", plugin.getGui().getChestVoteShopPermission(identifier)) {
+				new EditGUIValueString("Permission", plugin.getShopFile().getVoteShopPermission(identifier)) {

 					@Override
 					public void setValue(Player player, String name) {
@@ -69,7 +69,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 					}
 				}));
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.EMERALD, 1),
-				new EditGUIValueNumber("Cost", plugin.getGui().getChestShopIdentifierCost(identifier)) {
+				new EditGUIValueNumber("Cost", plugin.getShopFile().getShopIdentifierCost(identifier)) {

 					@Override
 					public void setValue(Player player, Number num) {
@@ -77,7 +77,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 					}
 				}));
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.BARRIER, 1),
-				new EditGUIValueNumber("Limit", plugin.getGui().getChestShopIdentifierLimit(identifier)) {
+				new EditGUIValueNumber("Limit", plugin.getShopFile().getShopIdentifierLimit(identifier)) {

 					@Override
 					public void setValue(Player player, Number num) {
@@ -86,7 +86,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 				}));

 		// display item
-		ConfigurationSection displayItemData = plugin.getGui().getChestShopIdentifierSection(identifier);
+		ConfigurationSection displayItemData = plugin.getShopFile().getShopIdentifierSection(identifier);
 		inv.addButton(new EditGUIButton(new ItemBuilder(displayItemData.getString("Material")).setAmount(1),
 				new EditGUIValueString("Material", displayItemData.getString("Material")) {

@@ -156,8 +156,8 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 	}

 	private void setPathData(String path, Object value) {
-		plugin.getGui().getData().set("CHEST.Shop." + identifier + "." + path, value);
-		plugin.getGui().saveData();
+		plugin.getShopFile().getData().set("Shop." + identifier + "." + path, value);
+		plugin.getShopFile().saveData();
 		plugin.reload();
 	}

@@ -42,9 +42,9 @@ public class AdminVoteVoteShopItemRemove extends GUIHandler {
 		BInventory inv = new BInventory("Edit VoteShop Remove Item");
 		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");

-		for (final String identifier : plugin.getGui().getChestShopIdentifiers()) {
+		for (final String identifier : plugin.getShopFile().getShopIdentifiers()) {
 			inv.addButton(
-					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier))
+					new BInventoryButton(new ItemBuilder(plugin.getShopFile().getShopIdentifierSection(identifier))
 							.addLoreLine("&c&lClick to remove")) {

 						@Override
@@ -54,7 +54,7 @@ public class AdminVoteVoteShopItemRemove extends GUIHandler {

 								@Override
 								public void onConfirm(Player p) {
-									plugin.getGui().removeShop(identifier);
+									plugin.getShopFile().removeShop(identifier);
 									p.sendMessage("Removed " + identifier);
 									plugin.reload();
 								}
@@ -65,7 +65,6 @@ public class AdminVoteVoteShopItemRemove extends GUIHandler {
 								}
 							}.open();

-
 						}
 					}.addData("ident", identifier));
 		}
@@ -41,9 +41,9 @@ public class AdminVoteVoteShopItems extends GUIHandler {
 		BInventory inv = new BInventory("Edit VoteShop Items");
 		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");

-		for (String identifier : plugin.getGui().getChestShopIdentifiers()) {
+		for (String identifier : plugin.getShopFile().getShopIdentifiers()) {
 			inv.addButton(
-					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier))) {
+					new BInventoryButton(new ItemBuilder(plugin.getShopFile().getShopIdentifierSection(identifier))) {

 						@Override
 						public void onClick(ClickEvent clickEvent) {
@@ -12,8 +12,9 @@ import com.bencodez.advancedcore.api.inventory.BInventory;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;

@@ -41,9 +42,9 @@ public class VoteBest extends GUIHandler {

 		placeholders.put("player", user.getPlayerName());

-		msg = ArrayUtils.getInstance().replacePlaceHolder(msg, placeholders);
+		msg = PlaceholderUtils.replacePlaceHolder(msg, placeholders);

-		return ArrayUtils.getInstance().colorize(msg);
+		return ArrayUtils.colorize(msg);
 	}

 	@Override
@@ -12,10 +12,10 @@ import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;

@@ -39,19 +39,19 @@ public class VoteGUI extends GUIHandler {
 		ItemBuilder builder = new ItemBuilder(plugin.getGui().getChestVoteGUISlotSection(slot));

 		String[] lore = new String[1];
-		lore = ArrayUtils.getInstance().convert(plugin.getGui().getChestVoteGUISlotLore(slot));
+		lore = ArrayUtils.convert(plugin.getGui().getChestVoteGUISlotLore(slot));

 		String str = plugin.getConfigFile().getVoteTopDefault();
 		if (lore.length == 0) {
-			if (StringParser.getInstance().startsWithIgnoreCase(slot, "url")) {
+			if (MessageAPI.startsWithIgnoreCase(slot, "url")) {
 				lore = new String[] { "&aClick me" };
-			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "next")) {
-				lore = ArrayUtils.getInstance().convert(new VoteNext(plugin, player, user).getChat(player));
-			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "last")) {
-				lore = ArrayUtils.getInstance().convert(new VoteLast(plugin, player, user).getChat(player));
-			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "total")) {
-				lore = ArrayUtils.getInstance().convert(new VoteTotal(plugin, player, user).getChat(player));
-			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "top")) {
+			} else if (MessageAPI.startsWithIgnoreCase(slot, "next")) {
+				lore = ArrayUtils.convert(new VoteNext(plugin, player, user).getChat(player));
+			} else if (MessageAPI.startsWithIgnoreCase(slot, "last")) {
+				lore = ArrayUtils.convert(new VoteLast(plugin, player, user).getChat(player));
+			} else if (MessageAPI.startsWithIgnoreCase(slot, "total")) {
+				lore = ArrayUtils.convert(new VoteTotal(plugin, player, user).getChat(player));
+			} else if (MessageAPI.startsWithIgnoreCase(slot, "top")) {

 				if (str.equalsIgnoreCase("monthly")) {
 					lore = plugin.getTopVoterHandler().topVoterMonthly(1);
@@ -70,12 +70,12 @@ public class VoteGUI extends GUIHandler {
 						list.add(today[i]);
 					}
 				}
-				lore = ArrayUtils.getInstance().convert(list);
+				lore = ArrayUtils.convert(list);
 			} else if (slot.equalsIgnoreCase("help")) {
 				lore = new String[] { "Click to view help" };
 			}
 		}
-		builder.setLore(ArrayUtils.getInstance().convert(lore));
+		builder.setLore(ArrayUtils.convert(lore));
 		return builder;
 	}

@@ -10,8 +10,8 @@ import org.bukkit.entity.Player;
 import com.bencodez.advancedcore.api.command.CommandHandler;
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.nms.NMSManager;
+import com.bencodez.simpleapi.messages.MessageAPI;
+import com.bencodez.simpleapi.nms.NMSManager;
 import com.bencodez.votingplugin.VotingPluginMain;

 import net.md_5.bungee.api.ChatColor;
@@ -121,7 +121,7 @@ public class VoteHelp extends GUIHandler {
 			maxPage++;
 		}

-		msg.add(StringParser.getInstance()
+		msg.add(MessageAPI
 				.stringToComp(plugin.getConfigFile().getFormatCommandsVoteHelpTitle() + " " + page + "/" + maxPage));

 		for (int i = pagesize * (page - 1); (i < text.size()) && (i < ((page) * pagesize)); i++) {
@@ -12,9 +12,10 @@ import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -36,8 +37,8 @@ public class VoteLast extends GUIHandler {

 		String playerName = user.getPlayerName();

-		msg.add(StringParser.getInstance().replaceIgnoreCase(plugin.getConfigFile().getFormatCommandsVoteLastTitle(),
-				"%player%", playerName));
+		msg.add(MessageAPI.replaceIgnoreCase(plugin.getConfigFile().getFormatCommandsVoteLastTitle(), "%player%",
+				playerName));

 		for (VoteSite voteSite : plugin.getVoteSitesEnabled()) {
 			if (!voteSite.isHidden()) {
@@ -45,7 +46,7 @@ public class VoteLast extends GUIHandler {
 			}
 		}

-		return ArrayUtils.getInstance().colorize(msg);
+		return ArrayUtils.colorize(msg);
 	}

 	@Override
@@ -73,12 +74,13 @@ public class VoteLast extends GUIHandler {
 								if (plugin.getGui().isChestVoteLastClickableLinks()) {
 									Player player = event.getPlayer();
 									if (player != null) {
-										VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
+										VotingPluginUser user = plugin.getVotingPluginUserManager()
+												.getVotingPluginUser(player);
 										user.sendMessage(
-												StringParser.getInstance()
+												PlaceholderUtils
 														.replacePlaceHolder(
-																StringParser.getInstance().replacePlaceHolder(
-																		StringParser.getInstance()
+																PlaceholderUtils.replacePlaceHolder(
+																		PlaceholderUtils
 																				.replacePlaceHolder(plugin.getGui()
 																						.getChestVoteURLURLText(),
 																						"voteurl", site.getVoteURL()),
@@ -11,12 +11,13 @@ import com.bencodez.advancedcore.api.bookgui.Layout;
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.inventory.BInventory;
-import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -40,19 +41,17 @@ public class VoteNext extends GUIHandler {

 		String playerName = user.getPlayerName();

-		msg.add(StringParser.getInstance().colorize(StringParser.getInstance()
+		msg.add(MessageAPI.colorize(MessageAPI
 				.replaceIgnoreCase(plugin.getConfigFile().getFormatCommandsVoteNextTitle(), "%player%", playerName)));

 		for (VoteSite voteSite : plugin.getVoteSitesEnabled()) {
 			if (!voteSite.isHidden()) {
 				String msgLine = plugin.getConfigFile().getFormatCommandsVoteNextLayout();

-				msgLine = StringParser.getInstance().replaceIgnoreCase(msgLine, "%info%",
-						user.voteCommandNextInfo(voteSite));
+				msgLine = MessageAPI.replaceIgnoreCase(msgLine, "%info%", user.voteCommandNextInfo(voteSite));

-				msgLine = StringParser.getInstance().replaceIgnoreCase(msgLine, "%SiteName%",
-						voteSite.getDisplayName());
-				msg.add(StringParser.getInstance().colorize(msgLine));
+				msgLine = MessageAPI.replaceIgnoreCase(msgLine, "%SiteName%", voteSite.getDisplayName());
+				msg.add(MessageAPI.colorize(msgLine));
 			}
 		}
 		return msg;
@@ -95,7 +94,7 @@ public class VoteNext extends GUIHandler {
 				}
 				inv.addButton(inv.getNextSlot(),
 						new UpdatingBInventoryButton(plugin, site.getItem().setName(siteNameDisplay)
-								.setLore(StringParser.getInstance().replacePlaceHolder(
+								.setLore(PlaceholderUtils.replacePlaceHolder(
 										plugin.getGui().getChestVoteNextLine(), "time", user.voteCommandNextInfo(site)))
 								.setAmountNone(1), 1000, 1000) {

@@ -12,9 +12,10 @@ import com.bencodez.advancedcore.api.inventory.BInventory;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;

@@ -45,8 +46,8 @@ public class VoteShop extends GUIHandler {

 	@Override
 	public void onChest(Player player) {
-		if (!plugin.getGui().isChestVoteShopEnabled()) {
-			player.sendMessage(StringParser.getInstance().colorize(plugin.getGui().getChestVoteShopDisabled()));
+		if (!plugin.getShopFile().isVoteShopEnabled()) {
+			player.sendMessage(MessageAPI.colorize(plugin.getShopFile().getVoteShopDisabled()));
 			return;
 		}

@@ -57,26 +58,33 @@ public class VoteShop extends GUIHandler {
 		/*
 		 * if (!plugin.getConfigFile().isExtraVoteShopCheck()) { user.cacheAsync(); }
 		 */
-		BInventory inv = new BInventory(plugin.getGui().getChestVoteShopName());
+		BInventory inv = new BInventory(plugin.getShopFile().getVoteShopName());
 		inv.addPlaceholder("points", "" + user.getPoints());
 		inv.addPlaceholder("sitesavailable", "" + user.getSitesNotVotedOn());
 		inv.dontClose();

-		for (final String identifier : plugin.getGui().getChestShopIdentifiers()) {
+		for (final String identifier : plugin.getShopFile().getShopIdentifiers()) {

-			String perm = plugin.getGui().getChestVoteShopPermission(identifier);
+			String perm = plugin.getShopFile().getVoteShopPermission(identifier);
 			boolean hasPerm = false;
 			if (perm.isEmpty()) {
 				hasPerm = true;
 			} else {
+				String p = "";
 				if (perm.startsWith("!")) {
-					hasPerm = !player.hasPermission(perm.substring(1));
+					p = PlaceholderUtils.replacePlaceHolders(player, perm.substring(1));
+					hasPerm = !player.hasPermission(p);
 				} else {
-					hasPerm = player.hasPermission(perm);
+					p = PlaceholderUtils.replacePlaceHolders(player, perm);
+					hasPerm = player.hasPermission(p);
+				}
+				if (!hasPerm) {
+					plugin.extraDebug("VoteShop: " + player.getName() + "/" + player.getUniqueId()
+							+ " does not have permission `" + p + "` for " + identifier);
 				}
 			}

-			int limit = plugin.getGui().getChestShopIdentifierLimit(identifier);
+			int limit = plugin.getShopFile().getShopIdentifierLimit(identifier);

 			boolean limitPass = true;
 			if (limit > 0) {
@@ -85,10 +93,10 @@ public class VoteShop extends GUIHandler {
 				}
 			}

-			if (!plugin.getGui().getChestVoteShopNotBuyable(identifier)) {
-				if ((hasPerm || !plugin.getGui().getChestVoteShopHideOnNoPermission(identifier))
-						&& (limitPass || !plugin.getGui().isChestVoteShopHideLimitedReached())) {
-					ItemBuilder builder = new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier));
+			if (!plugin.getShopFile().getVoteShopNotBuyable(identifier)) {
+				if ((hasPerm || !plugin.getShopFile().getVoteShopHideOnNoPermission(identifier))
+						&& (limitPass || !plugin.getShopFile().isVoteShopHideLimitedReached())) {
+					ItemBuilder builder = new ItemBuilder(plugin.getShopFile().getShopIdentifierSection(identifier));

 					inv.addButton(new BInventoryButton(builder) {

@@ -103,7 +111,7 @@ public class VoteShop extends GUIHandler {

 							String identifier = (String) getData("identifier");
 							int limit = (int) getData("Limit");
-							int points = plugin.getGui().getChestShopIdentifierCost(identifier);
+							int points = plugin.getShopFile().getShopIdentifierCost(identifier);
 							if (identifier != null) {
 								// if (plugin.getGui().getChestVoteShopCloseGUI(identifier)) {
 								// event.closeInventory();
@@ -118,10 +126,10 @@ public class VoteShop extends GUIHandler {
 								}

 								if (limitPass) {
-									if (!plugin.getGui().isChestVoteShopRequireConfirmation(identifier)) {
+									if (!plugin.getShopFile().isVoteShopRequireConfirmation(identifier)) {
 										HashMap<String, String> placeholders = new HashMap<String, String>();
 										placeholders.put("identifier",
-												plugin.getGui().getChestShopIdentifierIdentifierName(identifier));
+												plugin.getShopFile().getShopIdentifierIdentifierName(identifier));
 										placeholders.put("points", "" + points);
 										placeholders.put("limit", "" + limit);
 										if (user.removePoints(points, true)) {
@@ -131,19 +139,19 @@ public class VoteShop extends GUIHandler {
 												plugin.getServerData().addVoteShopPurchase(identifier);
 											}

-											plugin.getRewardHandler().giveReward(user, plugin.getGui().getData(),
-													plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
+											plugin.getRewardHandler().giveReward(user, plugin.getShopFile().getData(),
+													plugin.getShopFile().getShopIdentifierRewardsPath(identifier),
 													new RewardOptions().setPlaceholders(placeholders));

-											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
-													plugin.getGui().getCHESTVoteShopPurchase(identifier),
+											user.sendMessage(PlaceholderUtils.replacePlaceHolder(
+													plugin.getShopFile().getVoteShopPurchase(identifier),
 													placeholders));
 											if (limit > 0) {
 												user.setVoteShopIdentifierLimit(identifier,
 														user.getVoteShopIdentifierLimit(identifier) + 1);
 											}
 										} else {
-											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+											user.sendMessage(PlaceholderUtils.replacePlaceHolder(
 													plugin.getConfigFile().getFormatShopFailedMsg(), placeholders));
 										}
 									} else {
@@ -158,10 +166,10 @@ public class VoteShop extends GUIHandler {

 									}
 								} else {
-									user.sendMessage(plugin.getGui().getChestVoteShopLimitReached());
+									user.sendMessage(plugin.getShopFile().getVoteShopLimitReached());
 								}
 								plugin.getCommandLoader().processSlotClick(player, user, identifier);
-								if (plugin.getGui().isChestVoteShopReopenGUIOnPurchase()) {
+								if (plugin.getShopFile().isVoteShopReopenGUIOnPurchase()) {
 									plugin.getCommandLoader().processSlotClick(player, user, "shop");
 								}
 							}
@@ -171,7 +179,7 @@ public class VoteShop extends GUIHandler {
 				}
 			} else {
 				if (hasPerm) {
-					ItemBuilder builder = new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier));
+					ItemBuilder builder = new ItemBuilder(plugin.getShopFile().getShopIdentifierSection(identifier));
 					inv.addButton(new BInventoryButton(builder) {

 						@Override
@@ -184,20 +192,20 @@ public class VoteShop extends GUIHandler {
 			}
 		}

-		for (final String str : plugin.getGui().getChestGUIVoteShopExtraItems()) {
-			inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIVoteShopExtraItems(str))) {
+		for (final String str : plugin.getShopFile().getVoteShopExtraItems()) {
+			inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getShopFile().getGUIVoteShopExtraItems(str))) {

 				@Override
 				public void onClick(ClickEvent clickEvent) {
 					plugin.getCommandLoader().processSlotClick(player, user, str);
-					new RewardBuilder(plugin.getGui().getData(),
-							"CHEST.VoteShopExtraItems." + str + "." + clickEvent.getButton().getLastRewardsPath(player))
+					new RewardBuilder(plugin.getShopFile().getData(),
+							"ExtraItems." + str + "." + clickEvent.getButton().getLastRewardsPath(player))
 							.setGiveOffline(false).send(clickEvent.getPlayer());
 				}
 			});
 		}

-		if (plugin.getGui().isChestVoteShopBackButton()) {
+		if (plugin.getShopFile().isVoteShopBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}

@@ -12,9 +12,9 @@ import com.bencodez.advancedcore.api.inventory.BInventory;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.PlayerUtils;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
+import com.bencodez.simpleapi.player.PlayerUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;

@@ -46,16 +46,16 @@ public class VoteShopConfirm extends GUIHandler {

 	@Override
 	public void onChest(Player player) {
-		PlayerUtils.getInstance().setPlayerMeta(player, "ident", identifier);
-		BInventory inv = new BInventory(plugin.getGui().getChestShopConfirmPurchaseTitle());
+		PlayerUtils.setPlayerMeta(plugin, player, "ident", identifier);
+		BInventory inv = new BInventory(plugin.getShopFile().getShopConfirmPurchaseTitle());
 		inv.dontClose();
-		inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopConfirmPurchaseYesItem())) {
+		inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getShopFile().getShopConfirmPurchaseYesItem())) {

 			@Override
 			public void onClick(ClickEvent event) {
 				user.cache();
-				int points = plugin.getGui().getChestShopIdentifierCost(identifier);
-				int limit = plugin.getGui().getChestShopIdentifierLimit(identifier);
+				int points = plugin.getShopFile().getShopIdentifierCost(identifier);
+				int limit = plugin.getShopFile().getShopIdentifierLimit(identifier);
 				HashMap<String, String> placeholders = new HashMap<String, String>();
 				placeholders.put("identifier", identifier);
 				placeholders.put("points", "" + points);
@@ -67,20 +67,20 @@ public class VoteShopConfirm extends GUIHandler {
 						plugin.getServerData().addVoteShopPurchase(identifier);
 					}

-					plugin.getRewardHandler().giveReward(user, plugin.getGui().getData(),
-							plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
+					plugin.getRewardHandler().giveReward(user, plugin.getShopFile().getData(),
+							plugin.getShopFile().getShopIdentifierRewardsPath(identifier),
 							new RewardOptions().setPlaceholders(placeholders));

-					user.sendMessage(StringParser.getInstance()
-							.replacePlaceHolder(plugin.getGui().getCHESTVoteShopPurchase(identifier), placeholders));
+					user.sendMessage(PlaceholderUtils
+							.replacePlaceHolder(plugin.getShopFile().getVoteShopPurchase(identifier), placeholders));
 					if (limit > 0) {
 						user.setVoteShopIdentifierLimit(identifier, user.getVoteShopIdentifierLimit(identifier) + 1);
 					}
 				} else {
-					user.sendMessage(StringParser.getInstance()
+					user.sendMessage(PlaceholderUtils
 							.replacePlaceHolder(plugin.getConfigFile().getFormatShopFailedMsg(), placeholders));
 				}
-				if (plugin.getGui().getChestVoteShopCloseGUI(identifier)) {
+				if (plugin.getShopFile().getVoteShopCloseGUI(identifier)) {
 					event.getButton().getInv().closeInv(player, null);
 				} else {
 					new VoteShop(plugin, event.getPlayer(), user).open();
@@ -88,11 +88,11 @@ public class VoteShopConfirm extends GUIHandler {

 			}
 		});
-		inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopConfirmPurchaseNoItem())) {
+		inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getShopFile().getShopConfirmPurchaseNoItem())) {

 			@Override
 			public void onClick(ClickEvent event) {
-				if (plugin.getGui().getChestVoteShopCloseGUI(identifier)) {
+				if (plugin.getShopFile().getVoteShopCloseGUI(identifier)) {
 					event.getButton().getInv().closeInv(player, null);
 				} else {
 					new VoteShop(plugin, event.getPlayer(), user).open();
@@ -12,8 +12,9 @@ import com.bencodez.advancedcore.api.inventory.BInventory;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;

@@ -46,9 +47,9 @@ public class VoteStreak extends GUIHandler {

 		placeholders.put("player", user.getPlayerName());

-		msg = ArrayUtils.getInstance().replacePlaceHolder(msg, placeholders);
+		msg = PlaceholderUtils.replacePlaceHolder(msg, placeholders);

-		return ArrayUtils.getInstance().colorize(msg);
+		return ArrayUtils.colorize(msg);
 	}

 	@Override
@@ -16,10 +16,10 @@ import com.bencodez.advancedcore.api.inventory.BInventory;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
-import com.bencodez.advancedcore.nms.NMSManager;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.nms.NMSManager;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
@@ -66,7 +66,7 @@ public class VoteToday extends GUIHandler {
 			msg.add(voteToday[i]);
 		}

-		return ArrayUtils.getInstance().colorize(ArrayUtils.getInstance().replacePlaceHolder(msg, placeholders));
+		return ArrayUtils.colorize(PlaceholderUtils.replacePlaceHolder(msg, placeholders));
 	}

 	@Override
@@ -94,15 +94,15 @@ public class VoteToday extends GUIHandler {
 				HashMap<String, String> placeholders = new HashMap<String, String>();
 				placeholders.put("VoteSite", voteSite.getDisplayName());
 				placeholders.put("Time", timeString);
-				msg = StringParser.getInstance().replacePlaceHolder(msg, placeholders);
+				msg = PlaceholderUtils.replacePlaceHolder(msg, placeholders);
 				ItemBuilder item = null;
 				if (plugin.getGui().isChestVoteTodayUseSkull() && !NMSManager.getInstance().isVersion("1.12")) {
 					item = new ItemBuilder(user.getPlayerHead());
 				} else {
 					item = new ItemBuilder(plugin.getGui().getChestVoteTodayPlayerItem());
 				}
-				item.setName(StringParser.getInstance().replacePlaceHolder(plugin.getGui().getChestVoteTodayIconTitle(),
-						"player", user.getPlayerName()));
+				item.setName(PlaceholderUtils.replacePlaceHolder(plugin.getGui().getChestVoteTodayIconTitle(), "player",
+						user.getPlayerName()));
 				item.setLore(msg);
 				final UUID uuid = user.getUuid();
 				inv.addButton(inv.getNextSlot(), new BInventoryButton(item) {
@@ -116,7 +116,7 @@ public class VoteToday extends GUIHandler {
 				});
 			}
 		}
-		
+
 		String guiPath = "VoteToday";
 		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
 			inv.addButton(
@@ -130,6 +130,7 @@ public class VoteToday extends GUIHandler {
 									.setGiveOffline(false).send(clickEvent.getPlayer());

 						}
+
 					});
 		}

@@ -155,14 +156,14 @@ public class VoteToday extends GUIHandler {
 				placeholders.put("player", user.getPlayerName());
 				placeholders.put("votesite", voteSite.getKey());
 				placeholders.put("time", timeString);
-				msg.add(StringParser.getInstance()
-						.replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteTodayLine(), placeholders));
+				msg.add(PlaceholderUtils.replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteTodayLine(),
+						placeholders));
 				// msg.add("&6" + user.getPlayerName() + " : " + voteSite.getKey() + " : " +
 				// timeString);
 			}
 		}
-		msg = ArrayUtils.getInstance().colorize(msg);
-		return ArrayUtils.getInstance().convert(msg);
+		msg = ArrayUtils.colorize(msg);
+		return ArrayUtils.convert(msg);
 	}

 	public String[] voteTodayGUI() {
@@ -184,12 +185,12 @@ public class VoteToday extends GUIHandler {
 				placeholders.put("player", user.getPlayerName());
 				placeholders.put("votesite", mostRecentSite.getKey());
 				placeholders.put("time", timeString);
-				msg.add(StringParser.getInstance()
-						.replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteTodayLine(), placeholders));
+				msg.add(PlaceholderUtils.replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteTodayLine(),
+						placeholders));
 			}
 		}
-		msg = ArrayUtils.getInstance().colorize(msg);
-		return ArrayUtils.getInstance().convert(msg);
+		msg = ArrayUtils.colorize(msg);
+		return ArrayUtils.convert(msg);
 	}

 }
@@ -20,8 +20,8 @@ import com.bencodez.advancedcore.api.inventory.BInventory;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
@@ -46,13 +46,13 @@ public class VoteTopVoter extends GUIHandler {
 	public ArrayList<String> getChat(CommandSender sender) {
 		switch (top) {
 		case AllTime:
-			return ArrayUtils.getInstance().convert(plugin.getTopVoterHandler().topVoterAllTime(page));
+			return ArrayUtils.convert(plugin.getTopVoterHandler().topVoterAllTime(page));
 		case Daily:
-			return ArrayUtils.getInstance().convert(plugin.getTopVoterHandler().topVoterDaily(page));
+			return ArrayUtils.convert(plugin.getTopVoterHandler().topVoterDaily(page));
 		case Monthly:
-			return ArrayUtils.getInstance().convert(plugin.getTopVoterHandler().topVoterMonthly(page));
+			return ArrayUtils.convert(plugin.getTopVoterHandler().topVoterMonthly(page));
 		case Weekly:
-			return ArrayUtils.getInstance().convert(plugin.getTopVoterHandler().topVoterWeekly(page));
+			return ArrayUtils.convert(plugin.getTopVoterHandler().topVoterWeekly(page));
 		default:
 			break;
 		}
@@ -0,0 +1,150 @@
+package com.bencodez.votingplugin.commands.gui.player;
+
+import java.time.YearMonth;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
+import com.bencodez.votingplugin.user.VotingPluginUser;
+
+import net.md_5.bungee.api.ChatColor;
+
+public class VoteTopVoterPreviousMonths extends GUIHandler {
+
+	private VotingPluginMain plugin;
+	private VotingPluginUser user;
+	private int index = -1;
+
+	public VoteTopVoterPreviousMonths(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, int index) {
+		super(plugin, player);
+		this.plugin = plugin;
+		this.user = user;
+		this.index = index;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender arg0) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+		// TODO
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+	}
+
+	public void next(int index) {
+
+	}
+
+	@Override
+	public void onChest(Player player) {
+
+		Set<YearMonth> months = plugin.getPreviousMonthsTopVoters().keySet();
+
+		List<YearMonth> yearMonthList = months.stream().sorted(Collections.reverseOrder()).collect(Collectors.toList());
+		YearMonth yearMonth = null;
+
+		if (index < 0) {
+			if (!yearMonthList.isEmpty()) {
+				yearMonth = yearMonthList.get(0);
+			}
+			player.sendMessage(ChatColor.RED + "Can't open previous months, no data");
+			return;
+		} else {
+			if (yearMonthList.size() > index) {
+				yearMonth = yearMonthList.get(index);
+			} else {
+				player.sendMessage(ChatColor.RED + "Can't open previous months, no data for requested index");
+				return;
+			}
+		}
+
+		Set<Entry<TopVoterPlayer, Integer>> users = null;
+		if (plugin.getPreviousMonthsTopVoters().containsKey(yearMonth)) {
+			users = plugin.getPreviousMonthsTopVoters().get(yearMonth).entrySet();
+		} else {
+			player.sendMessage(ChatColor.RED + "Can't open previous months, no data");
+			return;
+		}
+
+		BInventory inv = new BInventory(plugin.getGui().getChestVoteTopName());
+		inv.addPlaceholder("topvoter", yearMonth.toString());
+		if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
+
+		int pos = 1;
+		for (Entry<TopVoterPlayer, Integer> entry : users) {
+			ItemBuilder playerItem;
+
+			if (plugin.getGui().isChestVoteTopUseSkull()) {
+				playerItem = new ItemBuilder(entry.getKey().getPlayerHead());
+			} else {
+				playerItem = new ItemBuilder(Material.valueOf(plugin.getGui().getChestVoteTopPlayerItemMaterial()));
+			}
+
+			playerItem.setLore(new ArrayList<String>());
+
+			inv.addButton(new BInventoryButton(playerItem.setName(plugin.getGui().getChestVoteTopItemName())
+					.addLoreLine(plugin.getGui().getChestVoteTopItemLore()).addPlaceholder("position", "" + pos)
+					.addPlaceholder("player", entry.getKey().getPlayerName())
+					.addPlaceholder("votes", "" + entry.getValue())) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					TopVoterPlayer user = (TopVoterPlayer) getData("User");
+					new VoteGUI(plugin, player, user.getUser())
+							.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
+				}
+			}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey()));
+			pos++;
+		}
+
+		inv.getPageButtons().add(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestVoteTopSwitchItem())
+				.addPlaceholder("Top", yearMonth.toString())) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
+					new VoteTopVoterPreviousMonths(plugin, player, user, index + 1).open(GUIMethod.CHEST);
+				} else {
+					new VoteTopVoterPreviousMonths(plugin, player, user, index - 1).open(GUIMethod.CHEST);
+				}
+			}
+		});
+
+		if (plugin.getGui().isChestVoteTopBackButton()) {
+			inv.getPageButtons().add(plugin.getCommandLoader().getBackButton(user).setSlot(1));
+		}
+
+		inv.setPages(true);
+		inv.setMaxInvSize(plugin.getGui().getChestVoteTopSize());
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}
@@ -8,13 +8,13 @@ import org.bukkit.entity.Player;
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.inventory.BInventory;
-import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -40,15 +40,15 @@ public class VoteTotal extends GUIHandler {
 		int all = user.getTotal(TopVoter.AllTime);

 		for (String s : plugin.getConfigFile().getFormatCommandsVoteTotal()) {
-			String str = StringParser.getInstance().replaceIgnoreCase(s, "%DailyTotal%", "" + daily);
-			str = StringParser.getInstance().replaceIgnoreCase(str, "%WeeklyTotal%", "" + weekly);
-			str = StringParser.getInstance().replaceIgnoreCase(str, "%MonthlyTotal%", "" + month);
-			str = StringParser.getInstance().replaceIgnoreCase(str, "%AllTimeTotal%", "" + all);
-			str = StringParser.getInstance().replaceIgnoreCase(str, "%player%", user.getPlayerName());
+			String str = MessageAPI.replaceIgnoreCase(s, "%DailyTotal%", "" + daily);
+			str = MessageAPI.replaceIgnoreCase(str, "%WeeklyTotal%", "" + weekly);
+			str = MessageAPI.replaceIgnoreCase(str, "%MonthlyTotal%", "" + month);
+			str = MessageAPI.replaceIgnoreCase(str, "%AllTimeTotal%", "" + all);
+			str = MessageAPI.replaceIgnoreCase(str, "%player%", user.getPlayerName());
 			msg.add(str);
 		}

-		return ArrayUtils.getInstance().colorize(msg);
+		return ArrayUtils.colorize(msg);
 	}

 	@Override
@@ -7,6 +7,7 @@ import java.util.List;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;

 import com.bencodez.advancedcore.api.bookgui.BookWrapper;
 import com.bencodez.advancedcore.api.bookgui.Layout;
@@ -18,9 +19,9 @@ import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.MessageBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.topvoter.TopVoter;
@@ -50,7 +51,11 @@ public class VoteURL extends GUIHandler {
 	}

 	@Override
-	public ArrayList<String> getChat(CommandSender arg0) {
+	public ArrayList<String> getChat(CommandSender sender) {
+		return getChat(sender, false);
+	}
+
+	public ArrayList<String> getChat(CommandSender sender, boolean bypassCanVote) {
 		ArrayList<String> sites = new ArrayList<String>();

 		List<String> title = plugin.getConfigFile().getFormatCommandsVoteText();
@@ -61,16 +66,25 @@ public class VoteURL extends GUIHandler {
 			int counter = 0;
 			for (VoteSite voteSite : plugin.getVoteSitesEnabled()) {
 				if (!voteSite.isHidden()) {
-					counter++;
-					String voteURL = voteSite.getVoteURL(json);
-					MessageBuilder message = new MessageBuilder(plugin.getConfigFile().getFormatCommandsVoteURLS());
-					message.replacePlaceholder("num", Integer.toString(counter)).replacePlaceholder("url", voteURL)
-							.replacePlaceholder("SiteName", voteSite.getDisplayName());
-					if (user != null && user.getPlayerName() != null) {
-						message.replacePlaceholder("player", "" + user.getPlayerName()).replacePlaceholder("Next",
-								"" + user.voteCommandNextInfo(voteSite));
+					if (voteSite.getPermissionToView().isEmpty()
+							|| sender.hasPermission(voteSite.getPermissionToView())) {
+						if (!plugin.getConfigFile().isFormatCommandsVoteOnlyShowSitesToVote()
+								|| user.canVoteSite(voteSite) || bypassCanVote) {
+							counter++;
+							String voteURL = voteSite.getVoteURL(json);
+							MessageBuilder message = new MessageBuilder(
+									plugin.getConfigFile().getFormatCommandsVoteURLS());
+							message.replacePlaceholder("num", Integer.toString(counter))
+									.replacePlaceholder("url", voteURL)
+									.replacePlaceholder("SiteName", voteSite.getDisplayName());
+							if (user != null && user.getPlayerName() != null) {
+								message.replacePlaceholder("player", "" + user.getPlayerName())
+										.replacePlaceholder("Next", "" + user.voteCommandNextInfo(voteSite));
+							}
+
+							sites.add(message.colorize().getText());
+						}
 					}
-					sites.add(message.colorize().getText());
 				}
 			}
 		}
@@ -81,10 +95,10 @@ public class VoteURL extends GUIHandler {
 			phs.put("MonthTotal", "" + user.getTotal(TopVoter.Monthly));
 			phs.put("Total", "" + user.getTotal(TopVoter.AllTime));

-			sites = ArrayUtils.getInstance().replacePlaceHolder(sites, phs);
+			sites = PlaceholderUtils.replacePlaceHolder(sites, phs);
 		}

-		return ArrayUtils.getInstance().colorize(sites);
+		return ArrayUtils.colorize(sites);
 	}

 	private ItemBuilder getItemAll() {
@@ -141,20 +155,25 @@ public class VoteURL extends GUIHandler {
 		}
 		int i = 1;
 		for (VoteSite site : plugin.getVoteSitesEnabled()) {
-			Layout layout = new Layout(plugin.getGui().getBookVoteURLBookGUILayout()).addPlaceholder("sitename",
-					site.getDisplayName());
-			String text = plugin.getGui().getBookVoteURLBookGUIAlreadyVotedText();
-			ChatColor color = ChatColor.valueOf(plugin.getGui().getBookVoteURLBookGUIAlreadyVotedColor());
-			if (user.canVoteSite(site)) {
-				color = ChatColor.valueOf(plugin.getGui().getBookVoteURLBookGUICanVoteColor());
-				text = plugin.getGui().getBookVoteURLBookGUICanVoteText();
+			if (!site.isHidden()) {
+				if (site.getPermissionToView().isEmpty() || player.hasPermission(site.getPermissionToView())) {
+					Layout layout = new Layout(plugin.getGui().getBookVoteURLBookGUILayout())
+							.addPlaceholder("sitename", site.getDisplayName()).addPlaceholder("num", "" + i);
+					String text = plugin.getGui().getBookVoteURLBookGUIAlreadyVotedText();
+					ChatColor color = ChatColor.valueOf(plugin.getGui().getBookVoteURLBookGUIAlreadyVotedColor());
+					if (user.canVoteSite(site)) {
+						color = ChatColor.valueOf(plugin.getGui().getBookVoteURLBookGUICanVoteColor());
+						text = plugin.getGui().getBookVoteURLBookGUICanVoteText();
+					}
+					String url = PlaceholderUtils.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
+							site.getVoteURLJsonStrip(), "player", user.getPlayerName()), "num", "" + i);
+					layout.replaceTextComponent("[UrlText]",
+							BookUtil.TextBuilder.of(text).color(color).onClick(BookUtil.ClickAction.openUrl(url))
+									.onHover(BookUtil.HoverAction.showText(url)).build());
+					book.addLayout(layout);
+					i++;
+				}
 			}
-			String url = StringParser.getInstance().replacePlaceHolder(StringParser.getInstance()
-					.replacePlaceHolder(site.getVoteURLJsonStrip(), "player", user.getPlayerName()), "num", "" + i);
-			layout.replaceTextComponent("[UrlText]", BookUtil.TextBuilder.of(text).color(color)
-					.onClick(BookUtil.ClickAction.openUrl(url)).onHover(BookUtil.HoverAction.showText(url)).build());
-			book.addLayout(layout);
-			i++;
 		}

 		book.open(player);
@@ -178,7 +197,12 @@ public class VoteURL extends GUIHandler {
 				public void onClick(ClickEvent event) {
 					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(event.getPlayer());
 					json = true;
-					user.sendMessage(getChat(player));
+					if (event.getClick().equals(ClickType.SHIFT_LEFT)
+							|| event.getClick().equals(ClickType.SHIFT_RIGHT)) {
+						user.sendMessage(getChat(player, true));
+					} else {
+						user.sendMessage(getChat(player, false));
+					}
 				}

 				@Override
@@ -191,42 +215,46 @@ public class VoteURL extends GUIHandler {
 		int startSlot = plugin.getGui().getChestVoteURLAllUrlsButtonStartSlot();
 		for (final VoteSite voteSite : plugin.getVoteSitesEnabled()) {
 			if (!voteSite.isHidden()) {
-				ItemBuilder builder = getItemVoteSite(voteSite);
-				if (startSlot >= 0) {
-					builder.setSlot(startSlot);
-					startSlot++;
-				}
+				if (voteSite.getPermissionToView().isEmpty() || player.hasPermission(voteSite.getPermissionToView())) {
+					ItemBuilder builder = getItemVoteSite(voteSite);
+					if (startSlot >= 0) {
+						builder.setSlot(startSlot);
+						startSlot++;
+					}

-				inv.addButton(new UpdatingBInventoryButton(plugin, builder, 5000, 5000) {
+					inv.addButton(new UpdatingBInventoryButton(plugin, builder, 5000, 5000) {

-					@Override
-					public void onClick(ClickEvent event) {
-						Player player = event.getPlayer();
-						if (player != null) {
-							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
-							HashMap<String, String> placeholders = new HashMap<String, String>();
-							placeholders.put("voteurl", voteSite.getVoteURL());
-							placeholders.put("sitename", voteSite.getDisplayName());
-							placeholders.put("player", player.getName());
-							placeholders.put("servicesite", voteSite.getServiceSite());
-							placeholders.put("VoteDelay", "" + voteSite.getVoteDelay());
-							placeholders.put("VoteHour", "" + voteSite.getVoteDelayDailyHour());
-							user.sendMessage(plugin.getGui().getChestVoteURLURLText(), placeholders);
+						@Override
+						public void onClick(ClickEvent event) {
+							Player player = event.getPlayer();
+							if (player != null) {
+								VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
+								HashMap<String, String> placeholders = new HashMap<String, String>();
+								placeholders.put("voteurl", voteSite.getVoteURL());
+								placeholders.put("sitename", voteSite.getDisplayName());
+								placeholders.put("player", player.getName());
+								placeholders.put("servicesite", voteSite.getServiceSite());
+								placeholders.put("VoteDelay", "" + voteSite.getVoteDelay());
+								placeholders.put("VoteHour", "" + voteSite.getVoteDelayDailyHour());
+								user.sendMessage(plugin.getGui().getChestVoteURLURLText(), placeholders);
+
+							}

 						}

-					}
+						@Override
+						public ItemBuilder onUpdate(Player player) {
+							return getItemVoteSite(voteSite);
+						}

-					@Override
-					public ItemBuilder onUpdate(Player player) {
-						return getItemVoteSite(voteSite);
-					}
-
-				});
+					});
+				}
 			}
 		}

-		for (final String str : plugin.getGui().getChestVoteURLExtraItems()) {
+		for (
+
+		final String str : plugin.getGui().getChestVoteURLExtraItems()) {
 			inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestVoteURLExtraItemsItem(str))) {

 				@Override
@@ -10,8 +10,8 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;

-import com.bencodez.advancedcore.api.command.TabCompleteHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.command.AdvancedCoreTabCompleteHandler;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;

 /**
@@ -36,11 +36,11 @@ public class AdminVoteTabCompleter implements TabCompleter {

 		Set<String> cmds = new HashSet<String>();

-		cmds.addAll(TabCompleteHandler.getInstance().getTabCompleteOptions(plugin.getAdminVoteCommand(), sender, args,
-				args.length - 1));
+		cmds.addAll(AdvancedCoreTabCompleteHandler.getInstance().getTabCompleteOptions(plugin.getAdminVoteCommand(),
+				sender, args, args.length - 1));

 		for (String str : cmds) {
-			if (StringParser.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
+			if (MessageAPI.startsWithIgnoreCase(str, args[args.length - 1])) {
 				tab.add(str);
 			}
 		}
@@ -12,9 +12,9 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;

 import com.bencodez.advancedcore.api.command.CommandHandler;
-import com.bencodez.advancedcore.api.command.TabCompleteHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.command.TabCompleteHandler;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;

 /**
@@ -45,7 +45,7 @@ public class AliasesTabCompleter implements TabCompleter {
 			msgArray.add(arg);
 		}

-		String[] args = ArrayUtils.getInstance().convert(msgArray);
+		String[] args = ArrayUtils.convert(msgArray);

 		ArrayList<String> tab = new ArrayList<String>();

@@ -88,7 +88,7 @@ public class AliasesTabCompleter implements TabCompleter {
 		}

 		for (String str : cmds) {
-			if (StringParser.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
+			if (MessageAPI.startsWithIgnoreCase(str, args[args.length - 1])) {
 				tab.add(str);
 			}
 		}
@@ -10,8 +10,8 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;

-import com.bencodez.advancedcore.api.command.TabCompleteHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.command.AdvancedCoreTabCompleteHandler;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;

 // TODO: Auto-generated Javadoc
@@ -37,11 +37,11 @@ public class VoteTabCompleter implements TabCompleter {

 		Set<String> cmds = new HashSet<String>();

-		cmds.addAll(TabCompleteHandler.getInstance().getTabCompleteOptions(plugin.getVoteCommand(), sender, args,
+		cmds.addAll(AdvancedCoreTabCompleteHandler.getInstance().getTabCompleteOptions(plugin.getVoteCommand(), sender, args,
 				args.length - 1));

 		for (String str : cmds) {
-			if (StringParser.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
+			if (MessageAPI.startsWithIgnoreCase(str, args[args.length - 1])) {
 				tab.add(str);
 			}
 		}
@@ -3,12 +3,12 @@ package com.bencodez.votingplugin.config;
 import java.io.File;
 import java.util.ArrayList;

-import com.bencodez.advancedcore.api.yml.YMLFile;
-import com.bencodez.advancedcore.api.yml.annotation.AnnotationHandler;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataBoolean;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataInt;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataListString;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataString;
+import com.bencodez.simpleapi.file.YMLFile;
+import com.bencodez.simpleapi.file.annotation.AnnotationHandler;
+import com.bencodez.simpleapi.file.annotation.ConfigDataBoolean;
+import com.bencodez.simpleapi.file.annotation.ConfigDataInt;
+import com.bencodez.simpleapi.file.annotation.ConfigDataListString;
+import com.bencodez.simpleapi.file.annotation.ConfigDataString;
 import com.bencodez.votingplugin.VotingPluginMain;

 import lombok.Getter;
@@ -7,14 +7,14 @@ import java.util.Set;

 import org.bukkit.configuration.ConfigurationSection;

-import com.bencodez.advancedcore.api.misc.ArrayUtils;
-import com.bencodez.advancedcore.api.yml.YMLFile;
-import com.bencodez.advancedcore.api.yml.annotation.AnnotationHandler;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataBoolean;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataInt;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataKeys;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataListString;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataString;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.file.YMLFile;
+import com.bencodez.simpleapi.file.annotation.AnnotationHandler;
+import com.bencodez.simpleapi.file.annotation.ConfigDataBoolean;
+import com.bencodez.simpleapi.file.annotation.ConfigDataInt;
+import com.bencodez.simpleapi.file.annotation.ConfigDataKeys;
+import com.bencodez.simpleapi.file.annotation.ConfigDataListString;
+import com.bencodez.simpleapi.file.annotation.ConfigDataString;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.placeholders.PlaceholderCacheLevel;
 import com.bencodez.votingplugin.topvoter.TopVoter;
@@ -39,10 +39,18 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean addTotalsOffline = true;

+	@ConfigDataBoolean(path = "LoadInteralExpansion")
+	@Getter
+	private boolean loadInteralExpansion = true;
+
 	@ConfigDataBoolean(path = "PerSiteCoolDownEvents")
 	@Getter
 	private boolean perSiteCoolDownEvents = false;

+	@ConfigDataInt(path = "LimitVotePoints")
+	@Getter
+	private int limitVotePoints = -1;
+
 	@ConfigDataBoolean(path = "QueueVotesDuringTimeChange")
 	@Getter
 	private boolean queueVotesDuringTimeChange = false;
@@ -217,7 +225,7 @@ public class Config extends YMLFile {

 	@ConfigDataListString(path = "Format.Commands.Vote.Today.Title")
 	@Getter
-	private ArrayList<String> formatCommandsVoteTodayTitle = ArrayUtils.getInstance()
+	private ArrayList<String> formatCommandsVoteTodayTitle = ArrayUtils
 			.convert(new String[] { "&cToday's Votes %page%/%maxpage%", "&cPlayerName : VoteSite : Time" });

 	@ConfigDataString(path = "Format.Commands.Vote.ToggleBroadcasts.Disabled")
@@ -381,6 +389,10 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean formatCommandsVoteAutoInputSites = true;

+	@ConfigDataBoolean(path = "Format.Commands.Vote.OnlyShowSitesToVote")
+	@Getter
+	private boolean formatCommandsVoteOnlyShowSitesToVote = false;
+
 	@ConfigDataListString(path = "Format.Commands.Vote.Best.Lines")
 	@Getter
 	private ArrayList<String> formatCommandsVoteBestLines = new ArrayList<String>();
@@ -651,13 +663,17 @@ public class Config extends YMLFile {
 	@Getter
 	private int pointsOnVote = 1;

-	@ConfigDataInt(path = "PurgeMin")
+	@ConfigDataBoolean(path = "PurgeNoDataOnStartup")
 	@Getter
-	private int purgeMin = 90;
+	private boolean purgeNoDataOnStartup = false;

-	@ConfigDataBoolean(path = "PurgeOldData")
+	@ConfigDataBoolean(path = "StoreMonthTotalsWithDate")
 	@Getter
-	private boolean purgeOldData = false;
+	private boolean storeMonthTotalsWithDate = false;
+
+	@ConfigDataBoolean(path = "UseMonthDateTotalsAsPrimaryTotal")
+	@Getter
+	private boolean useMonthDateTotalsAsPrimaryTotal = false;

 	@ConfigDataString(path = "RequestAPI.DefaultMethod")
 	@Getter
@@ -13,10 +13,10 @@ import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;

-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.rewards.DirectlyDefinedReward;
-import com.bencodez.advancedcore.api.yml.YMLFile;
+import com.bencodez.simpleapi.file.YMLFile;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;

@@ -103,8 +103,8 @@ public class ConfigVoteSites extends YMLFile {

 			for (Player p : Bukkit.getOnlinePlayers()) {
 				if (p.hasPermission("VotingPlugin.Admin.GenerateServiceSite") || p.isOp()) {
-					p.sendMessage(StringParser.getInstance().colorize("&cGenerating votesite for service site "
-							+ siteName + ", please check console for details"));
+					p.sendMessage(MessageAPI.colorize("&cGenerating votesite for service site " + siteName
+							+ ", please check console for details"));
 				}
 			}
 		}
@@ -278,7 +278,7 @@ public class ConfigVoteSites extends YMLFile {
 	public ArrayList<String> getVoteSitesNames(boolean checkEnabled) {
 		ArrayList<String> siteNames = new ArrayList<String>();
 		if (getData().isConfigurationSection("VoteSites")) {
-			siteNames = ArrayUtils.getInstance().convert(getData().getConfigurationSection("VoteSites").getKeys(false));
+			siteNames = ArrayUtils.convert(getData().getConfigurationSection("VoteSites").getKeys(false));
 		}

 		for (int i = siteNames.size() - 1; i >= 0; i--) {
@@ -298,6 +298,10 @@ public class ConfigVoteSites extends YMLFile {
 		return siteNames;
 	}

+	public String getPermissionToView(String siteName) {
+		return getData(siteName).getString("PermissionToView", "");
+	}
+
 	/**
 	 * Gets the vote URL.
 	 *
@@ -7,15 +7,15 @@ import java.util.Set;

 import org.bukkit.configuration.ConfigurationSection;

-import com.bencodez.advancedcore.api.misc.ArrayUtils;
-import com.bencodez.advancedcore.api.yml.YMLFile;
-import com.bencodez.advancedcore.api.yml.annotation.AnnotationHandler;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataBoolean;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataConfigurationSection;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataInt;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataKeys;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataListString;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataString;
+import com.bencodez.simpleapi.file.YMLFile;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.file.annotation.AnnotationHandler;
+import com.bencodez.simpleapi.file.annotation.ConfigDataBoolean;
+import com.bencodez.simpleapi.file.annotation.ConfigDataConfigurationSection;
+import com.bencodez.simpleapi.file.annotation.ConfigDataInt;
+import com.bencodez.simpleapi.file.annotation.ConfigDataKeys;
+import com.bencodez.simpleapi.file.annotation.ConfigDataListString;
+import com.bencodez.simpleapi.file.annotation.ConfigDataString;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;

@@ -45,7 +45,7 @@ public class GUI extends YMLFile {

 	@ConfigDataListString(path = "BOOK.VoteURLBookGUI.Layout")
 	@Getter
-	private ArrayList<String> bookVoteURLBookGUILayout = ArrayUtils.getInstance()
+	private ArrayList<String> bookVoteURLBookGUILayout = ArrayUtils
 			.convert(new String[] { "&c%Sitename%", "[UrlText]" });

 	@ConfigDataListString(path = "BOOK.VoteURLBookGUI.TopLayout")
@@ -56,34 +56,6 @@ public class GUI extends YMLFile {
 	@Getter
 	private String bookVoteURLBookGUITitle = "&cVoteURL";

-	@Getter
-	@ConfigDataConfigurationSection(path = "CHEST.ShopConfirmPurchase.NoItem")
-	private ConfigurationSection chestShopConfirmPurchaseNoItem;
-
-	@Getter
-	@ConfigDataString(path = "CHEST.ShopConfirmPurchase.Title")
-	private String chestShopConfirmPurchaseTitle = "Confirm Purchase?";
-
-	@Getter
-	@ConfigDataConfigurationSection(path = "CHEST.ShopConfirmPurchase.YesItem")
-	private ConfigurationSection chestShopConfirmPurchaseYesItem;
-
-	@Getter
-	@ConfigDataString(path = "CHEST.VoteShopDisabled")
-	private String chestVoteShopDisabled = "&cVote shop disabled";
-
-	@ConfigDataBoolean(path = "CHEST.VoteShopHideLimitedReached")
-	@Getter
-	private boolean chestVoteShopHideLimitedReached = true;
-
-	@ConfigDataString(path = "CHEST.VoteShopLimitReached")
-	@Getter
-	private String chestVoteShopLimitReached = "&aYou reached your limit";
-
-	@ConfigDataBoolean(path = "CHEST.VoteShopRequireConfirmation")
-	@Getter
-	private boolean chestVoteShopRequireConfirmation = false;
-
 	@ConfigDataBoolean(path = "CHEST.VoteBest.BackButton")
 	@Getter
 	private boolean chestVoteBestBackButton = true;
@@ -167,54 +139,10 @@ public class GUI extends YMLFile {
 		this.plugin = plugin;
 	}

-	public void createShop(String value) {
-		ConfigurationSection shopData = getData().createSection("CHEST.Shop." + value);
-		shopData.set("Identifier_Name", value);
-		shopData.set("Material", "STONE");
-		shopData.set("Amount", 1);
-		shopData.set("Name", "&cPlaceholder item");
-		shopData.set("Cost", 1);
-		shopData.set("Permission", "");
-		shopData.set("CloseGUI", true);
-		shopData.set("RequireConfirmation", false);
-
-		shopData.set("Rewards.Items.Item1.Material", "STONE");
-		shopData.set("Rewards.Items.Item1.Amount", 1);
-		saveData();
-	}
-
 	@ConfigDataConfigurationSection(path = "CHEST.BackButton")
 	@Getter
 	private ConfigurationSection CHESTBackButton;

-	public int getChestShopIdentifierCost(String identifier) {
-		return getData().getInt("CHEST.Shop." + identifier + ".Cost");
-	}
-
-	public String getChestShopIdentifierIdentifierName(String identifier) {
-		return getData().getString("CHEST.Shop." + identifier + ".Identifier_Name", identifier);
-	}
-
-	public int getChestShopIdentifierLimit(String identifier) {
-		return getData().getInt("CHEST.Shop." + identifier + ".Limit", -1);
-	}
-
-	public String getChestShopIdentifierRewardsPath(String identifier) {
-		return "CHEST.Shop." + identifier + ".Rewards";
-	}
-
-	public Set<String> getChestShopIdentifiers() {
-		ConfigurationSection shop = getData().getConfigurationSection("CHEST.Shop");
-		if (shop != null) {
-			return shop.getKeys(false);
-		}
-		return new HashSet<String>();
-	}
-
-	public ConfigurationSection getChestShopIdentifierSection(String identifier) {
-		return getData().getConfigurationSection("CHEST.Shop." + identifier);
-	}
-
 	@ConfigDataConfigurationSection(path = "CHEST.VoteBest.DayBest.Item")
 	@Getter
 	private ConfigurationSection chestVoteBestDayBestItem;
@@ -246,6 +174,10 @@ public class GUI extends YMLFile {
 		return getData().getString("CHEST.VoteGUI." + slot + ".Command", "");
 	}

+	public ConfigurationSection getChestGUIExtraItemsItem(String gui, String item) {
+		return getData().getConfigurationSection("CHEST." + gui + ".ExtraItems." + item);
+	}
+
 	/**
 	 * Gets the vote GUI slot lore.
 	 *
@@ -315,55 +247,6 @@ public class GUI extends YMLFile {
 	@Getter
 	private String chestVoteRewardName = "VoteReward";

-	@ConfigDataBoolean(path = "CHEST.VoteShopBackButton")
-	@Getter
-	private boolean chestVoteShopBackButton = true;
-
-	@ConfigDataBoolean(path = "CHEST.VoteShopReopenGUIOnPurchase")
-	@Getter
-	private boolean chestVoteShopReopenGUIOnPurchase = true;
-
-	public boolean getChestVoteShopCloseGUI(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".CloseGUI", true);
-	}
-	
-	public boolean getChestVoteShopHideOnNoPermission(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".HideOnNoPermission", true);
-	}
-
-	@ConfigDataBoolean(path = "CHEST.VoteShopEnabled")
-	@Getter
-	private boolean chestVoteShopEnabled = true;
-
-	@ConfigDataString(path = "CHEST.VoteShopName")
-	@Getter
-	private String chestVoteShopName = "VoteShop";
-
-	public boolean getChestVoteShopNotBuyable(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".NotBuyable", false);
-	}
-
-	public String getChestVoteShopPermission(String ident) {
-		return getData().getString("CHEST.Shop." + ident + ".Permission", "");
-	}
-
-	public String getCHESTVoteShopPurchase(String identifier) {
-		return getData().getString("CHEST.Shop." + identifier + ".PurchaseMessage",
-				plugin.getConfigFile().getFormatShopPurchaseMsg());
-	}
-
-	public boolean getChestVoteShopResetDaily(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".Reset.Daily", false);
-	}
-
-	public boolean getChestVoteShopResetMonthly(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".Reset.Monthly", false);
-	}
-
-	public boolean getChestVoteShopResetWeekly(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".Reset.Weekly", false);
-	}
-
 	@ConfigDataBoolean(path = "CHEST.VoteStreak.BackButton")
 	@Getter
 	private boolean chestVoteStreakBackButton = false;
@@ -523,18 +406,6 @@ public class GUI extends YMLFile {
 		return new HashSet<String>();
 	}

-	public ConfigurationSection getChestGUIVoteShopExtraItems(String item) {
-		return getData().getConfigurationSection("CHEST.VoteShopExtraItems." + item);
-	}
-
-	@ConfigDataKeys(path = "CHEST.VoteShopExtraItems")
-	@Getter
-	private Set<String> chestGUIVoteShopExtraItems = new HashSet<String>();
-
-	public ConfigurationSection getChestGUIExtraItemsItem(String gui, String item) {
-		return getData().getConfigurationSection("CHEST." + gui + ".ExtraItems." + item);
-	}
-
 	@ConfigDataString(path = "CHEST.VoteURL.SiteName")
 	@Getter
 	private String chestVoteURLGUISiteName = "&c%Name%";
@@ -567,11 +438,6 @@ public class GUI extends YMLFile {
 	@Getter
 	private boolean chestVoteURLViewAllUrlsButtonEnabled = false;

-	public boolean isChestVoteShopRequireConfirmation(String identifier) {
-		return getData().getBoolean("CHEST.Shop." + identifier + ".RequireConfirmation",
-				isChestVoteShopRequireConfirmation());
-	}
-
 	@Override
 	public void loadValues() {
 		new AnnotationHandler().load(getData(), this);
@@ -581,9 +447,4 @@ public class GUI extends YMLFile {
 	public void onFileCreation() {
 		plugin.saveResource("GUI.yml", true);
 	}
-
-	public void removeShop(String value) {
-		getData().set("CHEST.Shop." + value, null);
-		saveData();
-	}
 }
@@ -0,0 +1,198 @@
+package com.bencodez.votingplugin.config;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+import com.bencodez.simpleapi.file.YMLFile;
+import com.bencodez.simpleapi.file.annotation.AnnotationHandler;
+import com.bencodez.simpleapi.file.annotation.ConfigDataBoolean;
+import com.bencodez.simpleapi.file.annotation.ConfigDataConfigurationSection;
+import com.bencodez.simpleapi.file.annotation.ConfigDataKeys;
+import com.bencodez.simpleapi.file.annotation.ConfigDataString;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+import lombok.Getter;
+
+public class ShopFile extends YMLFile {
+
+	@Getter
+	@ConfigDataConfigurationSection(path = "ShopConfirmPurchase.NoItem")
+	private ConfigurationSection shopConfirmPurchaseNoItem;
+
+	@Getter
+	@ConfigDataString(path = "ShopConfirmPurchase.Title")
+	private String shopConfirmPurchaseTitle = "Confirm Purchase?";
+
+	@Getter
+	@ConfigDataConfigurationSection(path = "ShopConfirmPurchase.YesItem")
+	private ConfigurationSection shopConfirmPurchaseYesItem;
+
+	@Getter
+	@ConfigDataString(path = "VoteShop.Disabled")
+	private String voteShopDisabled = "&cVote shop disabled";
+
+	@ConfigDataBoolean(path = "VoteShop.HideLimitedReached")
+	@Getter
+	private boolean voteShopHideLimitedReached = true;
+
+	@ConfigDataString(path = "VoteShop.LimitReached")
+	@Getter
+	private String voteShopLimitReached = "&aYou reached your limit";
+
+	@ConfigDataBoolean(path = "VoteShop.RequireConfirmation")
+	@Getter
+	private boolean voteShopRequireConfirmation = false;
+
+	private VotingPluginMain plugin;
+
+	public ShopFile(VotingPluginMain plugin) {
+		super(plugin, new File(plugin.getDataFolder(), "Shop.yml"));
+		this.plugin = plugin;
+	}
+
+	public void createShop(String value) {
+		ConfigurationSection shopData = getData().createSection("Shop." + value);
+		shopData.set("Identifier_Name", value);
+		shopData.set("Material", "STONE");
+		shopData.set("Amount", 1);
+		shopData.set("Name", "&cPlaceholder item");
+		shopData.set("Cost", 1);
+		shopData.set("Permission", "");
+		shopData.set("CloseGUI", true);
+		shopData.set("RequireConfirmation", false);
+
+		shopData.set("Rewards.Items.Item1.Material", "STONE");
+		shopData.set("Rewards.Items.Item1.Amount", 1);
+		saveData();
+	}
+
+	public int getShopIdentifierCost(String identifier) {
+		return getData().getInt("Shop." + identifier + ".Cost");
+	}
+
+	public String getShopIdentifierIdentifierName(String identifier) {
+		return getData().getString("Shop." + identifier + ".Identifier_Name", identifier);
+	}
+
+	public int getShopIdentifierLimit(String identifier) {
+		return getData().getInt("Shop." + identifier + ".Limit", -1);
+	}
+
+	public String getShopIdentifierRewardsPath(String identifier) {
+		return "Shop." + identifier + ".Rewards";
+	}
+
+	public Set<String> getShopIdentifiers() {
+		ConfigurationSection shop = getData().getConfigurationSection("Shop");
+		if (shop != null) {
+			return shop.getKeys(false);
+		}
+		return new HashSet<String>();
+	}
+
+	public ConfigurationSection getShopIdentifierSection(String identifier) {
+		return getData().getConfigurationSection("Shop." + identifier);
+	}
+
+	@ConfigDataBoolean(path = "VoteShop.BackButton")
+	@Getter
+	private boolean voteShopBackButton = true;
+
+	@ConfigDataBoolean(path = "VoteShop.ReopenGUIOnPurchase")
+	@Getter
+	private boolean voteShopReopenGUIOnPurchase = true;
+
+	public boolean getVoteShopCloseGUI(String shop) {
+		return getData().getBoolean("Shop." + shop + ".CloseGUI", true);
+	}
+
+	public boolean getVoteShopHideOnNoPermission(String shop) {
+		return getData().getBoolean("Shop." + shop + ".HideOnNoPermission", true);
+	}
+
+	@ConfigDataBoolean(path = "VoteShop.Enabled")
+	@Getter
+	private boolean voteShopEnabled = true;
+
+	@ConfigDataString(path = "VoteShop.Name")
+	@Getter
+	private String voteShopName = "VoteShop";
+
+	public boolean getVoteShopNotBuyable(String shop) {
+		return getData().getBoolean("Shop." + shop + ".NotBuyable", false);
+	}
+
+	public String getVoteShopPermission(String ident) {
+		return getData().getString("Shop." + ident + ".Permission", "");
+	}
+
+	public String getVoteShopPurchase(String identifier) {
+		return getData().getString("Shop." + identifier + ".PurchaseMessage",
+				plugin.getConfigFile().getFormatShopPurchaseMsg());
+	}
+
+	public boolean getVoteShopResetDaily(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Daily", false);
+	}
+
+	public boolean getVoteShopResetMonthly(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Monthly", false);
+	}
+
+	public boolean getVoteShopResetWeekly(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Weekly", false);
+	}
+
+	public ConfigurationSection getGUIVoteShopExtraItems(String item) {
+		return getData().getConfigurationSection("ExtraItems." + item);
+	}
+
+	@ConfigDataKeys(path = "ExtraItems")
+	@Getter
+	private Set<String> voteShopExtraItems = new HashSet<String>();
+
+	public boolean isVoteShopRequireConfirmation(String identifier) {
+		return getData().getBoolean("Shop." + identifier + ".RequireConfirmation", isVoteShopRequireConfirmation());
+	}
+
+	@Override
+	public void loadValues() {
+		new AnnotationHandler().load(getData(), this);
+	}
+
+	@Override
+	public void onFileCreation() {
+		plugin.saveResource("Shop.yml", true);
+	}
+
+	public void convertFromGUIFile() {
+		// booleans
+		setValue("VoteShop.Enabled", plugin.getGui().getData().getBoolean("CHEST.VoteShopEnabled"));
+		setValue("VoteShop.BackButton", plugin.getGui().getData().getBoolean("CHEST.VoteShopBackButton"));
+		setValue("VoteShop.HideLimitReached", plugin.getGui().getData().getBoolean("CHEST.VoteShopHideLimitedReached"));
+		setValue("VoteShop.RequireConfirmation",
+				plugin.getGui().getData().getBoolean("CHEST.VoteShopRequireConfirmation"));
+		setValue("VoteShop.ReopenGUIOnPurchase",
+				plugin.getGui().getData().getBoolean("CHEST.VoteShopReopenGUIOnPurchase"));
+
+		// strings
+		setValue("VoteShop.Name", plugin.getGui().getData().getString("CHEST.VoteShopName"));
+		setValue("VoteShop.LimitReached", plugin.getGui().getData().getString("CHEST.VoteShopLimitReached"));
+		setValue("VoteShop.Disabled", plugin.getGui().getData().getString("CHEST.VoteShopDisabled"));
+
+		// sections
+		setValue("Shop", plugin.getGui().getData().getConfigurationSection("CHEST.Shop"));
+		setValue("ExtraItems", plugin.getGui().getData().getConfigurationSection("CHEST.VoteShopExtraItems"));
+		setValue("ShopConfirmPurchase", plugin.getGui().getData().getConfigurationSection("CHEST.ShopConfirmPurchase"));
+		saveData();
+
+	}
+
+	public void removeShop(String value) {
+		getData().set("Shop." + value, null);
+		saveData();
+	}
+}
@@ -6,14 +6,15 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

-import com.bencodez.advancedcore.api.yml.YMLFile;
-import com.bencodez.advancedcore.api.yml.annotation.AnnotationHandler;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataBoolean;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataDouble;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataInt;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataKeys;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataListString;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataString;
+import com.bencodez.simpleapi.file.YMLFile;
+import com.bencodez.simpleapi.file.annotation.AnnotationHandler;
+import com.bencodez.simpleapi.file.annotation.ConfigDataBoolean;
+import com.bencodez.simpleapi.file.annotation.ConfigDataDouble;
+import com.bencodez.simpleapi.file.annotation.ConfigDataInt;
+import com.bencodez.simpleapi.file.annotation.ConfigDataKeys;
+import com.bencodez.simpleapi.file.annotation.ConfigDataListInt;
+import com.bencodez.simpleapi.file.annotation.ConfigDataListString;
+import com.bencodez.simpleapi.file.annotation.ConfigDataString;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;

@@ -66,7 +67,7 @@ public class SpecialRewardsConfig extends YMLFile {
 	@ConfigDataBoolean(path = "VoteParty.ResetExtraVotesMonthly")
 	@Getter
 	private boolean votePartyResetExtraVotesMonthly = false;
-	
+
 	@ConfigDataBoolean(path = "VoteParty.ResetExtraVotesWeekly")
 	@Getter
 	private boolean votePartyResetExtraVotesWeekly = false;
@@ -75,9 +76,9 @@ public class SpecialRewardsConfig extends YMLFile {
 	@Getter
 	private String votePartyVoteReminderBroadcast = "%votesrequired% left to go, go vote!";

-	@ConfigDataListString(path = "VoteParty.VoteReminderAtVotes")
+	@ConfigDataListInt(path = "VoteParty.VoteReminderAtVotes")
 	@Getter
-	private ArrayList<String> votePartyVoteReminderAtVotes = new ArrayList<String>();
+	private ArrayList<Integer> votePartyVoteReminderAtVotes = new ArrayList<Integer>();

 	@ConfigDataListString(path = "VoteParty.GlobalRandomCommand")
 	@Getter
@@ -232,10 +233,23 @@ public class SpecialRewardsConfig extends YMLFile {
 	@Getter
 	private boolean votePartyGiveAllPlayers = false;

+	@Deprecated
 	@ConfigDataInt(path = "VoteParty.IncreaseVotesRquired")
 	@Getter
+	private int votePartyIncreaseVotesRquired = 0;
+
+	@ConfigDataInt(path = "VoteParty.IncreaseVotesRequired")
+	@Getter
 	private int votePartyIncreaseVotesRequired = 0;

+	public int getVotePartyIncreaseVotesRequiredWithTypo() {
+		int increase = getVotePartyIncreaseVotesRequired();
+		if (increase > 0) {
+			return increase;
+		}
+		return getVotePartyIncreaseVotesRquired();
+	}
+
 	@ConfigDataBoolean(path = "VoteParty.OnlyOncePerDay")
 	@Getter
 	private boolean votePartyOnlyOncePerDay = false;
@@ -12,7 +12,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.configuration.ConfigurationSection;

-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.signs.SignHandler;
 import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
@@ -32,12 +32,21 @@ public class ServerData {
 	public void addAutoCachedPlaceholder(String placeholder) {
 		List<String> p = getAutoCachedPlaceholder();

-		if (!ArrayUtils.getInstance().containsIgnoreCase(p, placeholder)) {
+		if (!ArrayUtils.containsIgnoreCase(p, placeholder)) {
 			p.add(placeholder);
 			setAutoCachedPlaceholder(p);
 		}
 	}

+	public void setShopConverted(boolean value) {
+		getData().set("VoteShopConverted", value);
+		saveData();
+	}
+
+	public boolean isVoteShopConverted() {
+		return getData().getBoolean("VoteShopConverted");
+	}
+
 	public void updatePlaceholders() {
 		boolean data = getData().getBoolean("AutoCacheUpdated", false);
 		if (!data) {
@@ -82,7 +91,7 @@ public class ServerData {
 		if (!getServiceSites().contains(site)) {
 			l.add(site);
 		}
-		setServiceSites(ArrayUtils.getInstance().removeDuplicates(l));
+		setServiceSites(ArrayUtils.removeDuplicates(l));
 	}

 	/**
@@ -9,7 +9,8 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;

-import com.bencodez.advancedcore.api.misc.PlayerUtils;
+import com.bencodez.advancedcore.api.misc.PlayerManager;
+import com.bencodez.simpleapi.player.PlayerUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.signs.SignHandler;

@@ -55,19 +56,19 @@ public class PlayerInteract implements Listener {
 									.sendMessage(sign.getRightClickMessage());

 							if (!sign.isSkullSet()) {
-								if (PlayerUtils.getInstance().hasServerPermission(event.getPlayer().getName(),
+								if (PlayerManager.getInstance().hasServerPermission(event.getPlayer().getName(),
 										"VotingPlugin.Sign.Create")
-										|| PlayerUtils.getInstance().hasServerPermission(event.getPlayer().getName(),
+										|| PlayerManager.getInstance().hasServerPermission(event.getPlayer().getName(),
 												"VotingPlugin.Admin")) {
 									player.sendMessage("Skull not set, click to set skull");
-									PlayerUtils.getInstance().setPlayerMeta(player, "skullset", sign.getSign());
+									PlayerUtils.setPlayerMeta(plugin, player, "skullset", sign.getSign());
 								}
 							}
 						}
 					}

 				} else if (event.getClickedBlock().getState() instanceof Skull) {
-					Object ob = PlayerUtils.getInstance().getPlayerMeta(player, "skullset");
+					Object ob = PlayerUtils.getPlayerMeta(plugin, player, "skullset");
 					if (ob != null) {
 						String sign1 = (String) ob;
 						for (SignHandler sign : plugin.getSigns().getSigns()) {
@@ -78,7 +79,7 @@ public class PlayerInteract implements Listener {
 								player.sendMessage("Skull set");
 							}
 						}
-						PlayerUtils.getInstance().setPlayerMeta(player, "skullset", null);
+						PlayerUtils.setPlayerMeta(plugin, player, "skullset", null);
 					}
 				}
 			}
@@ -42,6 +42,8 @@ public class PlayerJoinEvent implements Listener {
 		if (data) {
 			// give offline vote (if they voted offline)
 			user.offVote();
+		} else {
+			plugin.debug("No data detected for " + player.getUniqueId().toString() + "/" + player.getName());
 		}

 		user.loginRewards();
@@ -10,8 +10,8 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;

-import com.bencodez.advancedcore.api.misc.ArrayUtils;
-import com.bencodez.advancedcore.api.misc.PlayerUtils;
+import com.bencodez.advancedcore.api.misc.PlayerManager;
+import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.events.PlayerPostVoteEvent;
@@ -50,7 +50,7 @@ public class PlayerVoteListener implements Listener {
 		}
 		String playerName = event.getPlayer();
 		plugin.debug("Processing PlayerVoteEvent: " + playerName + "/" + event.getServiceSite());
-		if (!PlayerUtils.getInstance().isValidUser(playerName, plugin.getConfigFile().isAllowUnJoinedCheckServer())) {
+		if (!PlayerManager.getInstance().isValidUser(playerName, plugin.getConfigFile().isAllowUnJoinedCheckServer())) {
 			if (!plugin.getConfigFile().isAllowUnjoined()) {
 				plugin.getLogger().warning("Player " + playerName
 						+ " has not joined before, disregarding vote, set AllowUnjoined to true to prevent this");
@@ -90,8 +90,7 @@ public class PlayerVoteListener implements Listener {
 				for (VoteSite site : plugin.getVoteSites()) {
 					services.add(site.getServiceSite());
 				}
-				plugin.getLogger()
-						.warning("Currently set service sites: " + ArrayUtils.getInstance().makeStringList(services));
+				plugin.getLogger().warning("Currently set service sites: " + ArrayUtils.makeStringList(services));
 			}
 			return;
 		}
@@ -227,7 +226,10 @@ public class PlayerVoteListener implements Listener {
 			}
 			LocalDateTime cTime = plugin.getTimeChecker().getTime();
 			int days = cTime.getDayOfMonth();
+			plugin.extraDebug("Current day of month: " + days + " Current total: " + value);
 			if (value >= days * plugin.getVoteSitesEnabled().size()) {
+				plugin.debug("Detected higher month total, changing. Current Total: " + value + " Days: " + days
+						+ " New Total: " + days * plugin.getVoteSitesEnabled().size());
 				user.setTotal(TopVoter.Monthly, days * plugin.getVoteSitesEnabled().size());
 			}
 		}
@@ -4,8 +4,8 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.SignChangeEvent;

-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.PlayerUtils;
+import com.bencodez.advancedcore.api.misc.PlayerManager;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;

 // TODO: Auto-generated Javadoc
@@ -34,8 +34,8 @@ public class SignChange implements Listener {
 	@EventHandler(ignoreCancelled = true)
 	public void onSignChange(SignChangeEvent event) {
 		if (event.getLine(0).equalsIgnoreCase("[VotingPlugin]")) {
-			if (PlayerUtils.getInstance().hasServerPermission(event.getPlayer().getName(), "VotingPlugin.Sign.Create")
-					|| PlayerUtils.getInstance().hasServerPermission(event.getPlayer().getName(),
+			if (PlayerManager.getInstance().hasServerPermission(event.getPlayer().getName(), "VotingPlugin.Sign.Create")
+					|| PlayerManager.getInstance().hasServerPermission(event.getPlayer().getName(),
 							"VotingPlugin.Admin")) {
 				String data = event.getLine(2);
 				if (!data.equalsIgnoreCase("all") && !data.equalsIgnoreCase("monthly")
@@ -45,7 +45,7 @@ public class SignChange implements Listener {
 				try {
 					plugin.getServerData().addSign(event.getBlock().getLocation(), event.getLine(2),
 							Integer.parseInt(event.getLine(1)));
-					event.getPlayer().sendMessage(StringParser.getInstance().colorize("&aAdded sign!"));
+					event.getPlayer().sendMessage(MessageAPI.colorize("&aAdded sign!"));
 					plugin.getBukkitScheduler().runTaskAsynchronously(plugin, new Runnable() {

 						@Override
@@ -55,12 +55,11 @@ public class SignChange implements Listener {
 						}
 					});
 				} catch (Exception ex) {
-					event.getPlayer().sendMessage(StringParser.getInstance().colorize("&cError on sign creation!"));
+					event.getPlayer().sendMessage(MessageAPI.colorize("&cError on sign creation!"));
 					ex.printStackTrace();
 				}
 			} else {
-				event.getPlayer()
-						.sendMessage(StringParser.getInstance().colorize(plugin.getConfigFile().getFormatNoPerms()));
+				event.getPlayer().sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatNoPerms()));
 			}
 		}

@@ -6,7 +6,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;

-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
@@ -89,7 +89,7 @@ public class VotiferEvent implements Listener {
 					ArrayList<String> sites = plugin.getConfigVoteSites().getVoteSitesNames(false);
 					boolean createSite = false;
 					if (sites != null) {
-						if (!ArrayUtils.getInstance().containsIgnoreCase(sites, voteSiteNameStr)) {
+						if (!ArrayUtils.containsIgnoreCase(sites, voteSiteNameStr)) {
 							createSite = true;
 						}
 					} else {
@@ -104,7 +104,7 @@ public class VotiferEvent implements Listener {
 						plugin.getConfigVoteSites().generateVoteSite(voteSiteNameStr);

 						plugin.getLogger().info("Current known service sites: "
-								+ ArrayUtils.getInstance().makeStringList(plugin.getServerData().getServiceSites()));
+								+ ArrayUtils.makeStringList(plugin.getServerData().getServiceSites()));
 					}

 					if (plugin.getTimeChecker().isActiveProcessing()
@@ -10,10 +10,11 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;

 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -81,6 +82,10 @@ public class VoteSite {
 	@Setter
 	private String voteURL;

+	@Getter
+	@Setter
+	private String permissionToView;
+
 	@Getter
 	@Setter
 	private boolean waitUntilVoteDelay;
@@ -126,7 +131,7 @@ public class VoteSite {
 				}

 			} else {
-				String bc = StringParser.getInstance().colorize(plugin.getConfigFile().getFormatBroadCastMsg());
+				String bc = MessageAPI.colorize(plugin.getConfigFile().getFormatBroadCastMsg());
 				HashMap<String, String> placeholders = new HashMap<String, String>();
 				placeholders.put("player", playerName);
 				placeholders.put("nickname",
@@ -135,8 +140,8 @@ public class VoteSite {
 				placeholders.put("servicesite", getServiceSite());
 				placeholders.put("votesrequired", "" + plugin.getVoteParty().getVotesRequired());
 				placeholders.put("neededvotes", "" + plugin.getVoteParty().getNeededVotes());
-				bc = StringParser.getInstance().replacePlaceHolder(bc, placeholders);
-				bc = StringParser.getInstance().replacePlaceHolders(user.getOfflinePlayer(), bc);
+				bc = PlaceholderUtils.replacePlaceHolder(bc, placeholders);
+				bc = PlaceholderUtils.replacePlaceHolders(user.getOfflinePlayer(), bc);
 				ArrayList<Player> players = new ArrayList<Player>();
 				for (Player p : Bukkit.getOnlinePlayers()) {
 					if (!plugin.getVotingPluginUserManager().getVotingPluginUser(p).getDisableBroadcast()) {
@@ -173,8 +178,7 @@ public class VoteSite {
 	}

 	public String getVoteURL(boolean json) {
-		if (!plugin.getConfigFile().isFormatCommandsVoteForceLinks() || !json
-				|| StringParser.getInstance().containsJson(voteURL)) {
+		if (!plugin.getConfigFile().isFormatCommandsVoteForceLinks() || !json || MessageAPI.containsJson(voteURL)) {
 			return voteURL;
 		} else {
 			if (!voteURL.startsWith("http")) {
@@ -185,8 +189,8 @@ public class VoteSite {
 	}

 	public String getVoteURLJsonStrip() {
-		String url = ChatColor.stripColor(StringParser.getInstance()
-				.colorize(StringParser.getInstance().parseJson(getVoteURL(false)).toPlainText()));
+		String url = ChatColor
+				.stripColor(MessageAPI.colorize(PlaceholderUtils.parseJson(getVoteURL(false)).toPlainText()));
 		if (!url.startsWith("http")) {
 			if (!url.startsWith("www.")) {
 				url = "https://www." + url;
@@ -198,15 +202,16 @@ public class VoteSite {
 	}

 	public void giveRewards(VotingPluginUser user, boolean online, boolean bungee) {
+		new RewardBuilder(plugin.getConfigVoteSites().getData(), plugin.getConfigVoteSites().getEverySiteRewardPath())
+				.setOnline(online).withPlaceHolder("ServiceSite", getServiceSite())
+				.withPlaceHolder("SiteName", getDisplayName()).withPlaceHolder("VoteDelay", "" + getVoteDelay())
+				.withPlaceHolder("VoteURL", getVoteURL()).setServer(bungee).send(user);
+
 		new RewardBuilder(plugin.getConfigVoteSites().getData(), plugin.getConfigVoteSites().getRewardsPath(key))
 				.setOnline(online).withPlaceHolder("ServiceSite", getServiceSite())
 				.withPlaceHolder("SiteName", getDisplayName()).withPlaceHolder("VoteDelay", "" + getVoteDelay())
 				.withPlaceHolder("VoteURL", getVoteURL()).setServer(bungee).send(user);

-		new RewardBuilder(plugin.getConfigVoteSites().getData(), plugin.getConfigVoteSites().getEverySiteRewardPath())
-				.setOnline(online).withPlaceHolder("ServiceSite", getServiceSite())
-				.withPlaceHolder("SiteName", getDisplayName()).withPlaceHolder("VoteDelay", "" + getVoteDelay())
-				.withPlaceHolder("VoteURL", getVoteURL()).setServer(bungee).send(user);
 	}

 	public boolean hasRewards() {
@@ -235,10 +240,11 @@ public class VoteSite {
 		voteDelayDailyHour = plugin.getConfigVoteSites().getVoteDelayDailyHour(key);
 		hidden = plugin.getConfigVoteSites().getVoteSiteHidden(key);
 		ignoreCanVote = plugin.getConfigVoteSites().getVoteSiteIgnoreCanVote(key);
+		permissionToView = plugin.getConfigVoteSites().getPermissionToView(key);
 	}

 	public boolean isVaidServiceSite() {
-		return ArrayUtils.getInstance().containsIgnoreCase(plugin.getServerData().getServiceSites(), getServiceSite());
+		return ArrayUtils.containsIgnoreCase(plugin.getServerData().getServiceSites(), getServiceSite());
 	}

 	public String loadingDebug() {
@@ -19,12 +19,13 @@ import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;

-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.placeholder.CalculatingPlaceholder;
 import com.bencodez.advancedcore.api.placeholder.NonPlayerPlaceHolder;
 import com.bencodez.advancedcore.api.placeholder.PlaceHolder;
 import com.bencodez.advancedcore.api.user.AdvancedCoreUser;
 import com.bencodez.advancedcore.api.user.UserDataChanged;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.topvoter.TopVoter;
@@ -111,10 +112,10 @@ public class PlaceHolders {
 	public String getPlaceholderValue(OfflinePlayer p, String identifier, boolean javascript, boolean forceProcess,
 			boolean useCache) {
 		if (plugin.getConfigFile().isUseJavascriptPlaceholders() && javascript && p != null) {
-			identifier = StringParser.getInstance().replaceJavascript(p, identifier);
+			identifier = PlaceholderUtils.replaceJavascript(p, identifier);
 		}

-		if (!identifier.endsWith("Position")) {
+		if (!identifier.toLowerCase().endsWith("position")) {
 			for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : nonPlayerPlaceholders) {
 				if (placeholder.matches(identifier)) {
 					String str = placeholder.placeholderRequest(identifier);
@@ -244,7 +245,7 @@ public class PlaceHolders {

 	public String getPlaceHolder(Player p, String identifier) {
 		if (plugin.getConfigFile().isUseJavascriptPlaceholders()) {
-			identifier = StringParser.getInstance().replaceJavascript(p, identifier);
+			identifier = PlaceholderUtils.replaceJavascript(p, identifier);
 		}
 		return getPlaceHolder(p, identifier, false);
 	}
@@ -312,7 +313,7 @@ public class PlaceHolders {

 		Set<String> mVotes = plugin.getSpecialRewardsConfig().getMilestoneVotes();
 		for (String vote : mVotes) {
-			if (StringParser.getInstance().isInt(vote)) {
+			if (MessageAPI.isInt(vote)) {

 				final int num = Integer.parseInt(vote);
 				if (plugin.getSpecialRewardsConfig().getMilestoneRewardEnabled(num)) {
@@ -351,8 +352,20 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get number of votes until next available milestone").updateDataKey("MilestoneCount"));

-		for (final String identifier : plugin.getGui().getChestShopIdentifiers()) {
-			if (plugin.getGui().getChestShopIdentifierLimit(identifier) > 0) {
+		placeholders.add(new PlaceHolder<VotingPluginUser>("lastmilestone_votes_since") {
+
+			@Override
+			public String placeholderRequest(VotingPluginUser user, String identifier) {
+				int toGo = user.getMilestoneCount() - user.getLastGottenMilestone();
+				if (toGo >= 0) {
+					return "" + toGo;
+				}
+				return "0";
+			}
+		}.withDescription("Get number of votes since last milestone").updateDataKey("MilestoneCount"));
+
+		for (final String identifier : plugin.getShopFile().getShopIdentifiers()) {
+			if (plugin.getShopFile().getShopIdentifierLimit(identifier) > 0) {
 				placeholders.add(new PlaceHolder<VotingPluginUser>("VoteShopLimit_" + identifier) {

 					@Override
@@ -572,6 +585,9 @@ public class PlaceHolders {

 			@Override
 			public String placeholderRequest(VotingPluginUser user, String identifier) {
+				if (!MessageAPI.isInt(identifier.split("_")[1])) {
+					return "invalid";
+				}
 				int number = Integer.parseInt(identifier.split("_")[1]);
 				if (user.getPoints() >= number) {
 					return "true";
@@ -600,8 +616,8 @@ public class PlaceHolders {

 			@Override
 			public String placeholderRequest(String identifier) {
-				if (!StringParser.getInstance().isInt(identifier.split("_")[2])) {
-					return null;
+				if (!MessageAPI.isInt(identifier.split("_")[2])) {
+					return "invalid";
 				}
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
@@ -651,8 +667,8 @@ public class PlaceHolders {

 				@Override
 				public String placeholderRequest(String identifier) {
-					if (!StringParser.getInstance().isInt(identifier.split("_")[2])) {
-						return null;
+					if (!MessageAPI.isInt(identifier.split("_")[2])) {
+						return "invalid";
 					}
 					int num = 1;
 					int number = Integer.parseInt(identifier.split("_")[2]);
@@ -688,8 +704,8 @@ public class PlaceHolders {

 			@Override
 			public String placeholderRequest(String identifier) {
-				if (!StringParser.getInstance().isInt(identifier.split("_")[2])) {
-					return null;
+				if (!MessageAPI.isInt(identifier.split("_")[2])) {
+					return "invalid";
 				}
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
@@ -739,8 +755,8 @@ public class PlaceHolders {

 			@Override
 			public String placeholderRequest(String identifier) {
-				if (!StringParser.getInstance().isInt(identifier.split("_")[2])) {
-					return null;
+				if (!MessageAPI.isInt(identifier.split("_")[2])) {
+					return "invalid";
 				}
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
@@ -790,8 +806,8 @@ public class PlaceHolders {

 			@Override
 			public String placeholderRequest(String identifier) {
-				if (!StringParser.getInstance().isInt(identifier.split("_")[2])) {
-					return null;
+				if (!MessageAPI.isInt(identifier.split("_")[2])) {
+					return "invalid";
 				}
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
@@ -967,9 +983,8 @@ public class PlaceHolders {
 					diffMinutes = diffMinutes * -1;
 				}

-				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
-				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
-						Long.toString(diffMinutes));
+				timeMsg = MessageAPI.replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
+				timeMsg = MessageAPI.replaceIgnoreCase(timeMsg, "%minutes%", Long.toString(diffMinutes));
 				return timeMsg;

 			}
@@ -1008,10 +1023,9 @@ public class PlaceHolders {
 					diffMinutes = diffMinutes * -1;
 				}

-				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%days%", Integer.toString(diffDays));
-				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
-				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
-						Long.toString(diffMinutes));
+				timeMsg = MessageAPI.replaceIgnoreCase(timeMsg, "%days%", Integer.toString(diffDays));
+				timeMsg = MessageAPI.replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
+				timeMsg = MessageAPI.replaceIgnoreCase(timeMsg, "%minutes%", Long.toString(diffMinutes));
 				return timeMsg;

 			}
@@ -1042,10 +1056,9 @@ public class PlaceHolders {
 					diffMinutes = diffMinutes * -1;
 				}

-				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%days%", Integer.toString(diffDays));
-				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
-				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
-						Long.toString(diffMinutes));
+				timeMsg = MessageAPI.replaceIgnoreCase(timeMsg, "%days%", Integer.toString(diffDays));
+				timeMsg = MessageAPI.replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
+				timeMsg = MessageAPI.replaceIgnoreCase(timeMsg, "%minutes%", Long.toString(diffMinutes));
 				return timeMsg;

 			}
@@ -10,9 +10,9 @@ import org.bukkit.block.Sign;
 import org.bukkit.block.Skull;
 import org.bukkit.block.data.Directional;

-import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
-import com.bencodez.advancedcore.nms.NMSManager;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.nms.NMSManager;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
@@ -227,7 +227,7 @@ public class SignHandler {
 				lines.set(j, lines.get(j).replace("%SiteName%", data).replace("%position%", "" + position));
 			}

-			lines = ArrayUtils.getInstance().colorize(lines);
+			lines = ArrayUtils.colorize(lines);

 		}

@@ -7,9 +7,9 @@ import java.util.Set;

 import org.bukkit.Bukkit;

-import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.events.PlayerSpecialRewardEvent;
@@ -88,7 +88,7 @@ public class SpecialRewards {
 		boolean gotCumulativeAny = false;
 		Set<String> votes = plugin.getSpecialRewardsConfig().getCumulativeVotes();
 		for (String vote : votes) {
-			if (StringParser.getInstance().isInt(vote)) {
+			if (MessageAPI.isInt(vote)) {
 				int votesRequired = Integer.parseInt(vote);
 				if (votesRequired != 0) {
 					if (plugin.getSpecialRewardsConfig().getCumulativeRewardEnabled(votesRequired)
@@ -110,7 +110,11 @@ public class SpecialRewards {
 								total = bungeeMessageData.getDailyTotal();
 								break;
 							case Monthly:
-								total = bungeeMessageData.getMonthTotal();
+								if (plugin.getConfigFile().isUseMonthDateTotalsAsPrimaryTotal()) {
+									total = bungeeMessageData.getDateMonthTotal();
+								} else {
+									total = bungeeMessageData.getMonthTotal();
+								}
 								break;
 							case Weekly:
 								total = bungeeMessageData.getWeeklyTotal();
@@ -164,6 +168,7 @@ public class SpecialRewards {
 			}
 		}
 		return gotCumulativeAny;
+
 	}

 	public boolean checkFirstVote(VotingPluginUser user, boolean forceBungee) {
@@ -228,7 +233,7 @@ public class SpecialRewards {
 		boolean gotMilestone = false;
 		Set<String> votes = plugin.getSpecialRewardsConfig().getMilestoneVotes();
 		for (String vote : votes) {
-			if (StringParser.getInstance().isInt(vote)) {
+			if (MessageAPI.isInt(vote)) {
 				int votesRequired = Integer.parseInt(vote);
 				if (votesRequired != 0) {
 					if (plugin.getSpecialRewardsConfig().getMilestoneRewardEnabled(votesRequired)
@@ -258,15 +263,16 @@ public class SpecialRewards {

 		Set<String> streaks = plugin.getSpecialRewardsConfig().getVoteStreakVotes(type);
 		for (String streak : streaks) {
-			String s = streak.replaceAll("-", "");
 			boolean multiple = false;
 			if (streak.contains("-")) {
 				// multiple
 				multiple = true;

 			}
+			String s = streak.replaceAll("-", "");
+
 			plugin.debug("Streak: " + streak + " multiple: " + multiple);
-			if (StringParser.getInstance().isInt(s)) {
+			if (MessageAPI.isInt(s)) {
 				int streakRequired = Integer.parseInt(s);
 				if (streakRequired != 0) {
 					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled(type, streak)
@@ -61,7 +61,7 @@ public class VoteTester {
 		String SALTCHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
 		StringBuilder salt = new StringBuilder();
 		Random rnd = new Random();
-		while (salt.length() < 18) { // length of the random string.
+		while (salt.length() < 12) { // length of the random string.
 			int index = (int) (rnd.nextFloat() * SALTCHARS.length());
 			salt.append(SALTCHARS.charAt(index));
 		}
@@ -2,6 +2,8 @@ package com.bencodez.votingplugin.topvoter;

 import java.io.File;
 import java.time.LocalDateTime;
+import java.time.Month;
+import java.time.YearMonth;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -13,12 +15,12 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.UUID;

+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;

-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.time.TimeType;
 import com.bencodez.advancedcore.api.time.events.DateChangedEvent;
 import com.bencodez.advancedcore.api.time.events.DayChangeEvent;
@@ -28,7 +30,9 @@ import com.bencodez.advancedcore.api.time.events.WeekChangeEvent;
 import com.bencodez.advancedcore.api.user.UserStorage;
 import com.bencodez.advancedcore.api.user.userstorage.Column;
 import com.bencodez.advancedcore.api.user.userstorage.DataType;
-import com.bencodez.advancedcore.api.yml.YMLFileHandler;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.file.YMLFileHandler;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;

@@ -59,8 +63,8 @@ public class TopVoterHandler implements Listener {
 					.replace("%votes%", "" + plugin.getTopVoter(TopVoter.Weekly).get(users.get(i)));
 			msg.add(line);
 		}
-		msg = ArrayUtils.getInstance().colorize(msg);
-		return ArrayUtils.getInstance().convert(msg);
+		msg = ArrayUtils.colorize(msg);
+		return ArrayUtils.convert(msg);
 	}

 	private HashMap<Integer, String> handlePlaces(Set<String> places) {
@@ -83,11 +87,106 @@ public class TopVoterHandler implements Listener {
 		return place;
 	}

+	public void loadPreviousMonthTopVoters() {
+		if (plugin.getConfigFile().isStoreMonthTotalsWithDate()) {
+
+			LocalDateTime now = plugin.getTimeChecker().getTime();
+
+			for (String column : plugin.getUserManager().getAllColumns()) {
+				if (column.startsWith("MonthTotal-")) {
+					String[] data = column.split("-");
+					if (data.length > 2) {
+						String year = data[2];
+						String month = data[1];
+						if (MessageAPI.isInt(year)) {
+							YearMonth yearMonth = YearMonth.of(Integer.parseInt(year), Month.valueOf(month));
+							if (yearMonth.atDay(now.getDayOfMonth()).atTime(23, 59).isBefore(now)) {
+								plugin.debug("Loading previous month top voters of " + yearMonth.toString());
+								plugin.getPreviousMonthsTopVoters().put(yearMonth,
+										new LinkedHashMap<TopVoterPlayer, Integer>());
+							}
+						}
+					}
+				}
+			}
+
+			if (plugin.getPreviousMonthsTopVoters().size() > 0) {
+				HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+				for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+
+					String uuid = playerData.getKey().toString();
+					if (uuid != null && !uuid.isEmpty()) {
+						VotingPluginUser user = plugin.getVotingPluginUserManager()
+								.getVotingPluginUser(UUID.fromString(uuid), false);
+						user.dontCache();
+						user.updateTempCacheWithColumns(playerData.getValue());
+
+						for (YearMonth month : plugin.getPreviousMonthsTopVoters().keySet()) {
+							LocalDateTime atTime = month.atDay(15).atTime(0, 0);
+							int total = user.getTotal(TopVoter.Monthly, atTime);
+							if (total > 0) {
+								plugin.getPreviousMonthsTopVoters().get(month).put(user.getTopVoterPlayer(), total);
+							}
+						}
+
+						cols.put(playerData.getKey(), null);
+						user.clearTempCache();
+					}
+				}
+
+				cols.clear();
+				cols = null;
+			}
+
+			for (YearMonth month : plugin.getPreviousMonthsTopVoters().keySet()) {
+				plugin.getPreviousMonthsTopVoters().put(month,
+						sortByValues(plugin.getPreviousMonthsTopVoters().get(month), false));
+			}
+
+			plugin.extraDebug("Previous Months: " + plugin.getPreviousMonthsTopVoters().keySet().toString());
+
+			for (Entry<YearMonth, LinkedHashMap<TopVoterPlayer, Integer>> entry : plugin.getPreviousMonthsTopVoters()
+					.entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry2 : entry.getValue().entrySet()) {
+					plugin.extraDebug(entry.getKey().toString() + ": " + entry2.getKey().getUser().getPlayerName() + ":"
+							+ entry2.getValue().intValue());
+				}
+			}
+		}
+	}
+
+	public LinkedHashMap<TopVoterPlayer, Integer> getTopVotersOfMonth(YearMonth month,
+			HashMap<UUID, ArrayList<Column>> cols) {
+
+		LinkedHashMap<TopVoterPlayer, Integer> totals = new LinkedHashMap<TopVoterPlayer, Integer>();
+		LocalDateTime atTime = month.atDay(15).atTime(0, 0);
+		for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+
+			String uuid = playerData.getKey().toString();
+			if (uuid != null && !uuid.isEmpty()) {
+				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid),
+						false);
+				user.dontCache();
+				user.updateTempCacheWithColumns(playerData.getValue());
+				int total = 0;
+				total = user.getTotal(TopVoter.Monthly, atTime);
+
+				if (total > 0) {
+					totals.put(user.getTopVoterPlayer(), total);
+				}
+				user.clearTempCache();
+			}
+		}
+
+		return sortByValues(totals, false);
+	}
+
 	public void loadLastMonth() {
 		if (plugin.getGui().isLastMonthGUI()) {
 			plugin.getLastMonthTopVoter().clear();
 			LinkedHashMap<TopVoterPlayer, Integer> totals = new LinkedHashMap<TopVoterPlayer, Integer>();
 			HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+			LocalDateTime lastMonthTime = plugin.getTimeChecker().getTime().minusMonths(1);
 			for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {

 				String uuid = playerData.getKey().toString();
@@ -98,7 +197,12 @@ public class TopVoterHandler implements Listener {
 						user.dontCache();
 						user.updateTempCacheWithColumns(playerData.getValue());
 						cols.put(playerData.getKey(), null);
-						int total = user.getLastMonthTotal();
+						int total = 0;
+						if (plugin.getConfigFile().isUseMonthDateTotalsAsPrimaryTotal()) {
+							total = user.getTotal(TopVoter.Monthly, lastMonthTime);
+						} else {
+							total = user.getLastMonthTotal();
+						}
 						if (total > 0) {
 							totals.put(user.getTopVoterPlayer(), total);
 						}
@@ -198,8 +302,8 @@ public class TopVoterHandler implements Listener {
 				e.printStackTrace();
 			}

-			for (String shopIdent : plugin.getGui().getChestShopIdentifiers()) {
-				if (plugin.getGui().getChestVoteShopResetDaily(shopIdent)) {
+			for (String shopIdent : plugin.getShopFile().getShopIdentifiers()) {
+				if (plugin.getShopFile().getVoteShopResetDaily(shopIdent)) {
 					resetVoteShopLimit(shopIdent);
 				}
 			}
@@ -236,6 +340,7 @@ public class TopVoterHandler implements Listener {
 				plugin.getUserManager().copyColumnData(TopVoter.Monthly.getColumnName(),
 						TopVoter.Monthly.getLastColumnName());
 			}
+			LocalDateTime lastMonthTime = plugin.getTimeChecker().getTime().minusMonths(1);
 			if (plugin.getConfigFile().isUseHighestTotals() || plugin.getConfigFile().isUseVoteStreaks()) {
 				HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
 				for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
@@ -245,13 +350,13 @@ public class TopVoterHandler implements Listener {
 					user.updateTempCacheWithColumns(playerData.getValue());
 					cols.put(playerData.getKey(), null);
 					if (plugin.getConfigFile().isUseVoteStreaks()) {
-						if (user.getTotal(TopVoter.Monthly) == 0 && user.getMonthVoteStreak() != 0) {
+						if (user.getTotal(TopVoter.Monthly, lastMonthTime) == 0 && user.getMonthVoteStreak() != 0) {
 							user.setMonthVoteStreak(0);
 						} else {
 							if (!plugin.getSpecialRewardsConfig().isVoteStreakRequirementUsePercentage()
 									|| user.hasPercentageTotal(TopVoter.Monthly,
 											plugin.getSpecialRewardsConfig().getVoteStreakRequirementMonth(),
-											LocalDateTime.now().minusDays(1))) {
+											lastMonthTime)) {
 								user.addMonthVoteStreak();
 								plugin.getSpecialRewards().checkVoteStreak(user, "Month",
 										plugin.getBungeeSettings().isUseBungeecoord());
@@ -263,8 +368,8 @@ public class TopVoterHandler implements Listener {
 					// user.setLastMonthTotal(user.getTotal(TopVoter.Monthly));

 					if (plugin.getConfigFile().isUseHighestTotals()) {
-						if (user.getHighestMonthlyTotal() < user.getTotal(TopVoter.Monthly)) {
-							user.setHighestMonthlyTotal(user.getTotal(TopVoter.Monthly));
+						if (user.getHighestMonthlyTotal() < user.getTotal(TopVoter.Monthly, lastMonthTime)) {
+							user.setHighestMonthlyTotal(user.getTotal(TopVoter.Monthly, lastMonthTime));
 						}
 					}
 					user.clearTempCache();
@@ -281,10 +386,17 @@ public class TopVoterHandler implements Listener {
 					int i = 0;
 					int lastTotal = -1;

-					@SuppressWarnings("unchecked")
-					LinkedHashMap<TopVoterPlayer, Integer> clone = (LinkedHashMap<TopVoterPlayer, Integer>) plugin
-							.getTopVoter(TopVoter.Monthly).clone();
-					for (Entry<TopVoterPlayer, Integer> entry : clone.entrySet()) {
+					LinkedHashMap<TopVoterPlayer, Integer> topVoters = null;
+					if (plugin.getConfigFile().isUseMonthDateTotalsAsPrimaryTotal()) {
+						topVoters = getMonthlyTopVotersAtTime(lastMonthTime);
+					} else {
+						@SuppressWarnings("unchecked")
+						LinkedHashMap<TopVoterPlayer, Integer> clone = (LinkedHashMap<TopVoterPlayer, Integer>) plugin
+								.getTopVoter(TopVoter.Monthly).clone();
+						topVoters = clone;
+					}
+
+					for (Entry<TopVoterPlayer, Integer> entry : topVoters.entrySet()) {
 						if (plugin.getConfigFile().isTopVoterAwardsTies()) {
 							if (entry.getValue().intValue() != lastTotal) {
 								i++;
@@ -315,8 +427,8 @@ public class TopVoterHandler implements Listener {
 				resetGottenMilestones();
 			}

-			for (String shopIdent : plugin.getGui().getChestShopIdentifiers()) {
-				if (plugin.getGui().getChestVoteShopResetMonthly(shopIdent)) {
+			for (String shopIdent : plugin.getShopFile().getShopIdentifiers()) {
+				if (plugin.getShopFile().getVoteShopResetMonthly(shopIdent)) {
 					resetVoteShopLimit(shopIdent);
 				}
 			}
@@ -344,6 +456,12 @@ public class TopVoterHandler implements Listener {

 	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
 	public void onPreDateChanged(PreDateChangedEvent event) {
+		if (event.getTimeType().equals(TimeType.DAY)) {
+			plugin.getBannedPlayers().clear();
+			for (OfflinePlayer p : Bukkit.getBannedPlayers()) {
+				plugin.getBannedPlayers().add(p.getUniqueId().toString());
+			}
+		}
 		plugin.setUpdate(true);
 		plugin.update();
 	}
@@ -425,8 +543,8 @@ public class TopVoterHandler implements Listener {
 				e.printStackTrace();
 			}

-			for (String shopIdent : plugin.getGui().getChestShopIdentifiers()) {
-				if (plugin.getGui().getChestVoteShopResetWeekly(shopIdent)) {
+			for (String shopIdent : plugin.getShopFile().getShopIdentifiers()) {
+				if (plugin.getShopFile().getVoteShopResetWeekly(shopIdent)) {
 					resetVoteShopLimit(shopIdent);
 				}
 			}
@@ -597,14 +715,14 @@ public class TopVoterHandler implements Listener {
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
 		title = title.replace("%Top%", plugin.getConfigFile().getFormatTopVoterAllTime());
-		msg.add(StringParser.getInstance().colorize(title));
+		msg.add(MessageAPI.colorize(title));

 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 			msg.add(topVoters.get(i));
 		}

-		msg = ArrayUtils.getInstance().colorize(msg);
-		return ArrayUtils.getInstance().convert(msg);
+		msg = ArrayUtils.colorize(msg);
+		return ArrayUtils.convert(msg);
 	}

 	/**
@@ -636,14 +754,14 @@ public class TopVoterHandler implements Listener {
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
 		title = title.replace("%Top%", plugin.getConfigFile().getFormatTopVoterDaily());
-		msg.add(StringParser.getInstance().colorize(title));
+		msg.add(MessageAPI.colorize(title));

 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 			msg.add(topVoters.get(i));
 		}

-		msg = ArrayUtils.getInstance().colorize(msg);
-		return ArrayUtils.getInstance().convert(msg);
+		msg = ArrayUtils.colorize(msg);
+		return ArrayUtils.convert(msg);
 	}

 	/**
@@ -675,14 +793,14 @@ public class TopVoterHandler implements Listener {
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
 		title = title.replace("%Top%", plugin.getConfigFile().getFormatTopVoterMonthly());
-		msg.add(StringParser.getInstance().colorize(title));
+		msg.add(MessageAPI.colorize(title));

 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 			msg.add(topVoters.get(i));
 		}

-		msg = ArrayUtils.getInstance().colorize(msg);
-		return ArrayUtils.getInstance().convert(msg);
+		msg = ArrayUtils.colorize(msg);
+		return ArrayUtils.convert(msg);
 	}

 	/**
@@ -709,8 +827,8 @@ public class TopVoterHandler implements Listener {
 			i++;
 		}

-		msg = ArrayUtils.getInstance().colorize(msg);
-		return ArrayUtils.getInstance().convert(msg);
+		msg = ArrayUtils.colorize(msg);
+		return ArrayUtils.convert(msg);
 	}

 	/**
@@ -734,8 +852,8 @@ public class TopVoterHandler implements Listener {
 			msg.add(line);
 		}

-		msg = ArrayUtils.getInstance().colorize(msg);
-		return ArrayUtils.getInstance().convert(msg);
+		msg = ArrayUtils.colorize(msg);
+		return ArrayUtils.convert(msg);
 	}

 	/**
@@ -762,8 +880,8 @@ public class TopVoterHandler implements Listener {
 			i++;
 		}

-		msg = ArrayUtils.getInstance().colorize(msg);
-		return ArrayUtils.getInstance().convert(msg);
+		msg = ArrayUtils.colorize(msg);
+		return ArrayUtils.convert(msg);
 	}

 	/**
@@ -795,14 +913,45 @@ public class TopVoterHandler implements Listener {
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
 		title = title.replace("%Top%", plugin.getConfigFile().getFormatTopVoterWeekly());
-		msg.add(StringParser.getInstance().colorize(title));
+		msg.add(MessageAPI.colorize(title));

 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 			msg.add(topVoters.get(i));
 		}

-		msg = ArrayUtils.getInstance().colorize(msg);
-		return ArrayUtils.getInstance().convert(msg);
+		msg = ArrayUtils.colorize(msg);
+		return ArrayUtils.convert(msg);
+	}
+
+	public LinkedHashMap<TopVoterPlayer, Integer> getMonthlyTopVotersAtTime(LocalDateTime atTime) {
+		// int limitSize = plugin.getConfigFile().getMaxiumNumberOfTopVotersToLoad();
+
+		HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+
+		LinkedHashMap<TopVoterPlayer, Integer> topVoter = new LinkedHashMap<TopVoterPlayer, Integer>();
+
+		for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+
+			String uuid = playerData.getKey().toString();
+			if (plugin != null && plugin.isEnabled()) {
+				if (uuid != null && !uuid.isEmpty()) {
+					VotingPluginUser user = plugin.getVotingPluginUserManager()
+							.getVotingPluginUser(UUID.fromString(uuid), false);
+					user.dontCache();
+					user.updateTempCacheWithColumns(playerData.getValue());
+					cols.put(playerData.getKey(), null);
+
+					int total = user.getTotal(TopVoter.Monthly, atTime);
+					if (total > 0) {
+						topVoter.put(user.getTopVoterPlayer(), total);
+					}
+
+				}
+			}
+		}
+
+		return sortByValues(topVoter, false);
+
 	}

 	public synchronized void updateTopVoters(
@@ -4,7 +4,6 @@ import java.util.UUID;

 import org.bukkit.inventory.ItemStack;

-import com.bencodez.advancedcore.api.misc.PlayerUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;

@@ -30,7 +29,7 @@ public class TopVoterPlayer {
 	}

 	public ItemStack getPlayerHead() {
-		return PlayerUtils.getInstance().getPlayerSkull(getPlayerName(), false);
+		return VotingPluginMain.plugin.getSkullCacheHandler().getSkull(uuid, playerName);
 	}

 	public VotingPluginUser getUser() {
@@ -3,7 +3,7 @@ package com.bencodez.votingplugin.updater;
 import java.util.Timer;
 import java.util.TimerTask;

-import com.bencodez.advancedcore.api.updater.Updater;
+import com.bencodez.simpleapi.updater.Updater;
 import com.bencodez.votingplugin.VotingPluginMain;

 // TODO: Auto-generated Javadoc
@@ -22,7 +22,8 @@ public class CheckUpdate {
 	 * Check update.
 	 */
 	public void checkUpdate() {
-		if (plugin.getConfigFile().isDisableUpdateChecking()) {
+		if (plugin.getConfigFile().isDisableUpdateChecking()
+				|| plugin.getDescription().getVersion().endsWith("SNAPSHOT")) {
 			return;
 		}
 		plugin.setUpdater(new Updater(plugin, 15358, false));
@@ -69,7 +70,8 @@ public class CheckUpdate {
 	 * Start up.
 	 */
 	public void startUp() {
-		if (plugin.getConfigFile().isDisableUpdateChecking()) {
+		if (plugin.getConfigFile().isDisableUpdateChecking()
+				|| plugin.getDescription().getVersion().endsWith("SNAPSHOT")) {
 			return;
 		}
 		plugin.getBukkitScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
@@ -1,16 +1,23 @@
 package com.bencodez.votingplugin.user;

+import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map.Entry;
 import java.util.UUID;

 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;

+import com.bencodez.advancedcore.api.user.AdvancedCoreUser;
+import com.bencodez.advancedcore.api.user.UserStartup;
 import com.bencodez.advancedcore.api.user.usercache.UserDataManager;
 import com.bencodez.advancedcore.api.user.usercache.keys.UserDataKeyBoolean;
 import com.bencodez.advancedcore.api.user.usercache.keys.UserDataKeyInt;
 import com.bencodez.advancedcore.api.user.usercache.keys.UserDataKeyString;
+import com.bencodez.advancedcore.api.user.userstorage.Column;
 import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.topvoter.TopVoter;

 public class UserManager {
 	private VotingPluginMain plugin;
@@ -28,6 +35,14 @@ public class UserManager {
 		manager.addKey(new UserDataKeyString("OfflineVotes").setColumnType("MEDIUMTEXT"));
 		manager.addKey(new UserDataKeyInt("MilestoneCount"));
 		manager.addKey(new UserDataKeyInt("MonthTotal"));
+
+		if (plugin.getConfigFile().isUseMonthDateTotalsAsPrimaryTotal()) {
+			manager.addKey(new UserDataKeyInt(getMonthTotalsWithDatePath(LocalDateTime.now().minusMonths(1))));
+			manager.addKey(new UserDataKeyInt(getMonthTotalsWithDatePath(LocalDateTime.now())));
+			manager.addKey(new UserDataKeyInt(getMonthTotalsWithDatePath(LocalDateTime.now().plusMonths(1))));
+			manager.addKey(new UserDataKeyInt(getMonthTotalsWithDatePath(LocalDateTime.now().plusMonths(2))));
+		}
+
 		manager.addKey(new UserDataKeyInt("AllTimeTotal"));
 		manager.addKey(new UserDataKeyInt("DailyTotal"));
 		manager.addKey(new UserDataKeyInt("WeeklyTotal"));
@@ -89,6 +104,15 @@ public class UserManager {
 		}
 	}

+	public String getMonthTotalsWithDatePath() {
+		LocalDateTime cTime = plugin.getTimeChecker().getTime();
+		return getMonthTotalsWithDatePath(cTime);
+	}
+
+	public String getMonthTotalsWithDatePath(LocalDateTime cTime) {
+		return "MonthTotal-" + cTime.getMonth().toString() + "-" + cTime.getYear();
+	}
+
 	public ArrayList<String> getAllUUIDs() {
 		return plugin.getUserManager().getAllUUIDs();
 	}
@@ -124,4 +148,81 @@ public class UserManager {
 	public VotingPluginUser getVotingPluginUser(UUID uuid, boolean loadName) {
 		return new VotingPluginUser(plugin, uuid, loadName);
 	}
+
+	public void purgeOldPlayersNoData() {
+		if (plugin.getOptions().isPurgeOldData() && plugin.getConfigFile().isPurgeNoDataOnStartup()) {
+			plugin.addUserStartup(new UserStartup() {
+
+				@Override
+				public void onFinish() {
+					plugin.debug("Finished no data purging");
+				}
+
+				@Override
+				public void onStart() {
+
+				}
+
+				@Override
+				public void onStartUp(AdvancedCoreUser acUser) {
+					VotingPluginUser user = getVotingPluginUser(acUser);
+					user.dontCache();
+					int daysOld = plugin.getOptions().getPurgeMinimumDays();
+					int days = user.getNumberOfDaysSinceLogin();
+					if (days == -1) {
+						// fix ones with no last online
+						user.setLastOnline(System.currentTimeMillis());
+					} else if (days > daysOld) {
+						if (user.getTotal(TopVoter.AllTime) == 0 && user.getMilestoneCount() == 0
+								&& user.getTotal(TopVoter.Monthly) == 0 && user.getTotal(TopVoter.Weekly) == 0
+								&& user.getTotal(TopVoter.Daily) == 0) {
+							plugin.debug("Removing " + user.getUUID() + " because of no data purge");
+							user.remove();
+						}
+					}
+
+				}
+			});
+
+		}
+
+		plugin.getUserManager().getDataManager().clearCache();
+	}
+
+	public void purgeOldPlayersNowNoData() {
+		HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+		for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+			String uuid = playerData.getKey().toString();
+			if (plugin.isEnabled()) {
+				if (uuid != null) {
+					VotingPluginUser user = getVotingPluginUser(UUID.fromString(uuid), false);
+					if (user != null) {
+						user.dontCache();
+						user.updateTempCacheWithColumns(playerData.getValue());
+						int daysOld = plugin.getOptions().getPurgeMinimumDays();
+						int days = user.getNumberOfDaysSinceLogin();
+						if (days == -1) {
+							// fix ones with no last online
+							user.setLastOnline(System.currentTimeMillis());
+						} else if (days > daysOld) {
+							if (user.getTotal(TopVoter.AllTime) == 0 && user.getMilestoneCount() == 0
+									&& user.getTotal(TopVoter.Monthly) == 0 && user.getTotal(TopVoter.Weekly) == 0
+									&& user.getTotal(TopVoter.Daily) == 0)
+								plugin.debug("Removing " + user.getUUID() + " because of no data purge");
+							user.remove();
+						}
+
+						user.clearTempCache();
+						cols.put(playerData.getKey(), null);
+						user = null;
+					}
+				}
+			}
+		}
+		cols.clear();
+		cols = null;
+
+		plugin.getUserManager().getDataManager().clearCache();
+		plugin.setUpdate(true);
+	}
 }
@@ -19,13 +19,14 @@ import java.util.stream.Collectors;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.advancedcore.api.user.AdvancedCoreUser;
 import com.bencodez.advancedcore.api.user.usercache.value.DataValue;
 import com.bencodez.advancedcore.api.user.usercache.value.DataValueInt;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
@@ -109,6 +110,11 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		if (points != 0) {
 			addPoints(points);
 		}
+		if (plugin.getConfigFile().getLimitVotePoints() > 0) {
+			if (getPoints() > plugin.getConfigFile().getLimitVotePoints()) {
+				setPoints(plugin.getConfigFile().getLimitVotePoints());
+			}
+		}
 	}

 	/**
@@ -533,7 +539,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance

 	@Deprecated
 	public int getMonthTotal() {
-		return getData().getInt("MonthTotal", isCacheData(), isWaitForCache());
+		return getTotal(TopVoter.Monthly);
 	}

 	public int getMonthVoteStreak() {
@@ -600,6 +606,30 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		case Daily:
 			return getUserData().getInt("DailyTotal", isCacheData(), isWaitForCache());
 		case Monthly:
+			if (plugin.getConfigFile().isUseMonthDateTotalsAsPrimaryTotal()) {
+				return getData().getInt(plugin.getVotingPluginUserManager().getMonthTotalsWithDatePath(), isCacheData(),
+						isWaitForCache());
+			}
+			return getData().getInt("MonthTotal", isCacheData(), isWaitForCache());
+		case Weekly:
+			return getUserData().getInt("WeeklyTotal", isCacheData(), isWaitForCache());
+		default:
+			break;
+		}
+		return 0;
+	}
+
+	public int getTotal(TopVoter top, LocalDateTime atTime) {
+		switch (top) {
+		case AllTime:
+			return getUserData().getInt("AllTimeTotal", isCacheData(), isWaitForCache());
+		case Daily:
+			return getUserData().getInt("DailyTotal", isCacheData(), isWaitForCache());
+		case Monthly:
+			if (plugin.getConfigFile().isUseMonthDateTotalsAsPrimaryTotal()) {
+				return getData().getInt(plugin.getVotingPluginUserManager().getMonthTotalsWithDatePath(atTime),
+						isCacheData(), isWaitForCache());
+			}
 			return getData().getInt("MonthTotal", isCacheData(), isWaitForCache());
 		case Weekly:
 			return getUserData().getInt("WeeklyTotal", isCacheData(), isWaitForCache());
@@ -683,7 +713,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	}

 	public boolean hasPercentageTotal(TopVoter top, double percentage, LocalDateTime time) {
-		int total = getTotal(top);
+		int total = getTotal(top, time);
 		switch (top) {
 		case Daily:
 			return (double) total / (double) plugin.getVoteSitesEnabled().size() * 100 > percentage;
@@ -796,14 +826,14 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 				}

 			} else {
-				String bc = StringParser.getInstance().colorize(plugin.getConfigFile().getFormatOfflineBroadcast());
+				String bc = MessageAPI.colorize(plugin.getConfigFile().getFormatOfflineBroadcast());
 				HashMap<String, String> placeholders = new HashMap<String, String>();
 				placeholders.put("player", playerName);
 				placeholders.put("nickname",
 						(user.getPlayer() != null) ? user.getPlayer().getDisplayName() : user.getPlayerName());
 				placeholders.put("numberofvotes", "" + numberOfVotes);
-				bc = StringParser.getInstance().replacePlaceHolder(bc, placeholders);
-				bc = StringParser.getInstance().replacePlaceHolders(user.getOfflinePlayer(), bc);
+				bc = PlaceholderUtils.replacePlaceHolder(bc, placeholders);
+				bc = PlaceholderUtils.replacePlaceHolders(user.getOfflinePlayer(), bc);
 				ArrayList<Player> players = new ArrayList<Player>();
 				for (Player p : Bukkit.getOnlinePlayers()) {
 					if (!plugin.getVotingPluginUserManager().getVotingPluginUser(p).getDisableBroadcast()) {
@@ -1040,7 +1070,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		int mileStoneCount = getMilestoneCount();
 		HashMap<String, Boolean> gottenMileStones = getHasGottenMilestone();
 		for (String vote : mVotes) {
-			if (StringParser.getInstance().isInt(vote)) {
+			if (MessageAPI.isInt(vote)) {
 				final int num = Integer.parseInt(vote);
 				if (plugin.getSpecialRewardsConfig().getMilestoneRewardEnabled(num)) {
 					if (gottenMileStones.containsKey("" + num)) {
@@ -1068,6 +1098,32 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance

 	}

+	public int getLastGottenMilestone() {
+		Set<String> mVotes = plugin.getSpecialRewardsConfig().getMilestoneVotes();
+		ArrayList<Integer> nums = new ArrayList<Integer>();
+		int mileStoneCount = getMilestoneCount();
+		for (String vote : mVotes) {
+			if (MessageAPI.isInt(vote)) {
+				final int num = Integer.parseInt(vote);
+				if (plugin.getSpecialRewardsConfig().getMilestoneRewardEnabled(num)) {
+					nums.add(Integer.valueOf(num));
+				}
+			}
+		}
+
+		int highestNum = -1;
+
+		for (Integer num : nums) {
+			if (mileStoneCount > num.intValue()) {
+				if (highestNum == -1 || num.intValue() > highestNum) {
+					highestNum = num.intValue();
+				}
+			}
+		}
+
+		return highestNum;
+	}
+
 	public void setReminded(boolean reminded) {
 		getUserData().setString("Reminded", "" + reminded);
 	}
@@ -1103,6 +1159,9 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 				}
 			}
 			getData().setInt("MonthTotal", value);
+			if (plugin.getConfigFile().isStoreMonthTotalsWithDate()) {
+				getData().setInt(plugin.getVotingPluginUserManager().getMonthTotalsWithDatePath(), value);
+			}
 			break;
 		case Weekly:
 			getUserData().setInt("WeeklyTotal", value);
@@ -1149,7 +1208,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		if (time > 0) {
 			Date date = new Date(time);
 			String timeString = new SimpleDateFormat(plugin.getConfigFile().getFormatTimeFormat()).format(date);
-			if (StringParser.getInstance().containsIgnorecase(timeString, "YamlConfiguration")) {
+			if (MessageAPI.containsIgnorecase(timeString, "YamlConfiguration")) {
 				plugin.getLogger().warning("Detected issue parsing time, check time format");
 			}
 			return timeString;
@@ -1173,40 +1232,36 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance

 			String info = "";
 			if (diffDays == 1) {
-				info += StringParser.getInstance()
-						.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
-								plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
-								plugin.getConfigFile().getFormatTimeFormatsDay()), "amount", "" + diffDays);
+				info += PlaceholderUtils.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
+						plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
+						plugin.getConfigFile().getFormatTimeFormatsDay()), "amount", "" + diffDays);
 				info += " ";
 			} else if (diffDays > 1) {
-				info += StringParser.getInstance()
-						.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
-								plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
-								plugin.getConfigFile().getFormatTimeFormatsDays()), "amount", "" + diffDays);
+				info += PlaceholderUtils.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
+						plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
+						plugin.getConfigFile().getFormatTimeFormatsDays()), "amount", "" + diffDays);
 				info += " ";
 			}

 			if (diffHours == 1) {
-				info += StringParser.getInstance()
-						.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
-								plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
-								plugin.getConfigFile().getFormatTimeFormatsHour()), "amount", "" + diffHours);
+				info += PlaceholderUtils.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
+						plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
+						plugin.getConfigFile().getFormatTimeFormatsHour()), "amount", "" + diffHours);
 				info += " ";
 			} else if (diffHours > 1) {
-				info += StringParser.getInstance()
-						.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
-								plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
-								plugin.getConfigFile().getFormatTimeFormatsHours()), "amount", "" + diffHours);
+				info += PlaceholderUtils.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
+						plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
+						plugin.getConfigFile().getFormatTimeFormatsHours()), "amount", "" + diffHours);
 				info += " ";
 			}

 			if (diffMinutes == 1) {
-				info += StringParser.getInstance().replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
+				info += PlaceholderUtils.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
 						plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
 						plugin.getConfigFile().getFormatTimeFormatsMinute()), "amount", "" + diffMinutes);
 				info += " ";
 			} else if (diffMinutes > 1) {
-				info += StringParser.getInstance().replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
+				info += PlaceholderUtils.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
 						plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
 						plugin.getConfigFile().getFormatTimeFormatsMinutes()), "amount", "" + diffMinutes);
 				info += " ";
@@ -1214,18 +1269,18 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance

 			if (plugin.getConfigFile().isFormatCommandsVoteLastIncludeSeconds()) {
 				if (diffSeconds == 1) {
-					info += StringParser.getInstance().replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
+					info += PlaceholderUtils.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
 							plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
 							plugin.getConfigFile().getFormatTimeFormatsSecond()), "amount", "" + diffSeconds);
 				} else {
-					info += StringParser.getInstance().replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
+					info += PlaceholderUtils.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
 							plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
 							plugin.getConfigFile().getFormatTimeFormatsSeconds()), "amount", "" + diffSeconds);
 				}
 			}

-			info = StringParser.getInstance()
-					.replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteLastLastVoted(), "times", info);
+			info = PlaceholderUtils.replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteLastLastVoted(),
+					"times", info);

 			return info;
 		}
@@ -1241,7 +1296,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		placeholders.put("SiteName", voteSite.getDisplayName());
 		placeholders.put("timesince", timeSince);

-		return StringParser.getInstance().replacePlaceHolder(plugin.getGui().getChestVoteLastLine(), placeholders);
+		return PlaceholderUtils.replacePlaceHolder(plugin.getGui().getChestVoteLastLine(), placeholders);
 	}

 	public String voteCommandLastLine(VoteSite voteSite) {
@@ -1253,7 +1308,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		placeholders.put("SiteName", voteSite.getDisplayName());
 		placeholders.put("timesince", timeSince);

-		return StringParser.getInstance().replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteLastLine(),
+		return PlaceholderUtils.replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteLastLine(),
 				placeholders);
 	}

@@ -1282,8 +1337,8 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			}

 			String timeMsg = plugin.getConfigFile().getFormatCommandsVoteNextInfoVoteDelayDaily();
-			timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
-			timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%", Long.toString(diffMinutes));
+			timeMsg = MessageAPI.replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
+			timeMsg = MessageAPI.replaceIgnoreCase(timeMsg, "%minutes%", Long.toString(diffMinutes));
 			info = timeMsg;
 		}

@@ -13,14 +13,15 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.time.events.DayChangeEvent;
 import com.bencodez.advancedcore.api.time.events.MonthChangeEvent;
 import com.bencodez.advancedcore.api.time.events.WeekChangeEvent;
 import com.bencodez.advancedcore.api.user.userstorage.DataType;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.events.VotePartyEvent;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -89,9 +90,7 @@ public class VoteParty implements Listener {
 					+ plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRequired());
 		}

-		if (plugin.getSpecialRewardsConfig().isVotePartyOnlyOncePerDay()) {
-			plugin.getServerData().updateLastVoteParty();
-		}
+		plugin.getServerData().updateLastVoteParty();

 		if (plugin.getSpecialRewardsConfig().isVotePartyOnlyOncePerWeek()) {
 			plugin.getServerData().updateLastVotePartyWeek();
@@ -114,16 +113,15 @@ public class VoteParty implements Listener {
 			placeholders.put("votesrequired", "" + votesRequired);
 			placeholders.put("neededvotes", "" + neededVotes);
 			placeholders.put("votes", "" + votes);
-			msg = ArrayUtils.getInstance().colorize(ArrayUtils.getInstance().replacePlaceHolder(msg, placeholders));
+			msg = ArrayUtils.colorize(PlaceholderUtils.replacePlaceHolder(msg, placeholders));
 			if (sender instanceof Player) {
 				Player p = (Player) sender;
-				sender.sendMessage(
-						ArrayUtils.getInstance().convert(ArrayUtils.getInstance().replacePlaceHolders(msg, p)));
+				sender.sendMessage(ArrayUtils.convert(PlaceholderUtils.replacePlaceHolders(msg, p)));
 			} else {
-				sender.sendMessage(ArrayUtils.getInstance().convert(msg));
+				sender.sendMessage(ArrayUtils.convert(msg));
 			}
 		} else {
-			sender.sendMessage(StringParser.getInstance().colorize("&cVoteParty not enabled"));
+			sender.sendMessage(MessageAPI.colorize("&cVoteParty not enabled"));
 		}
 	}

@@ -184,6 +182,7 @@ public class VoteParty implements Listener {
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getVotePartyRewardsPath()).setOnline(online)
 				.withPlaceHolder("VotesRequired", "" + plugin.getSpecialRewardsConfig().getVotePartyVotesRequired())
+				.withPlaceHolder("FirstVotePartyToday", "" + !plugin.getServerData().isLastVotePartySameDay())
 				.setServer(useBungee).send(user);
 	}

@@ -209,7 +208,7 @@ public class VoteParty implements Listener {
 				@Override
 				public void run() {
 					Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(),
-							StringParser.getInstance().replacePlaceHolder(cmd, "randomonlineplayer", player));
+							PlaceholderUtils.replacePlaceHolder(cmd, "randomonlineplayer", player));
 				}

 			});
@@ -221,10 +220,8 @@ public class VoteParty implements Listener {

 				@Override
 				public void run() {
-					Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(),
-							StringParser.getInstance().replacePlaceHolder(
-									list.get(ThreadLocalRandom.current().nextInt(list.size())), "randomonlineplayer",
-									player));
+					Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), PlaceholderUtils.replacePlaceHolder(
+							list.get(ThreadLocalRandom.current().nextInt(list.size())), "randomonlineplayer", player));
 				}

 			});
@@ -232,6 +229,7 @@ public class VoteParty implements Listener {

 		if (plugin.getSpecialRewardsConfig().isVotePartyGiveAllPlayers()) {
 			plugin.debug("Trying to give all players vote party");
+
 			ArrayList<String> alreadyGotten = new ArrayList<String>();
 			for (Player p : Bukkit.getOnlinePlayers()) {
 				VotingPluginUser user;
@@ -264,8 +262,10 @@ public class VoteParty implements Listener {
 			}
 		} else {
 			plugin.debug("Trying to give all voted players vote party");
-			plugin.debug(ArrayUtils.getInstance().makeStringList(getVotedUsers()));
-			for (String uuid : getVotedUsers()) {
+			plugin.debug(ArrayUtils.makeStringList(getVotedUsers()));
+			for (String uuid :
+
+			getVotedUsers()) {
 				VotingPluginUser user;
 				if (orgUser != null && orgUser.getJavaUUID().toString().equals(uuid)) {
 					user = orgUser;
@@ -279,6 +279,7 @@ public class VoteParty implements Listener {

 			}
 		}
+
 		reset(false);
 	}

@@ -305,7 +306,7 @@ public class VoteParty implements Listener {
 		if (plugin.getSpecialRewardsConfig().isVotePartyResetWeekly()) {
 			reset(true);
 		}
-		
+
 		if (plugin.getSpecialRewardsConfig().isVotePartyResetExtraVotesWeekly()) {
 			plugin.getServerData().setVotePartyExtraRequired(0);
 		}
@@ -349,21 +350,22 @@ public class VoteParty implements Listener {
 	}

 	public void checkVoteReminder(VotingPluginUser user) {
-		int neededVotes = getNeededVotes();
+		if (!user.isVanished()) {
+			int neededVotes = getNeededVotes();

-		for (String str : plugin.getSpecialRewardsConfig().getVotePartyVoteReminderAtVotes()) {
-			if (StringParser.getInstance().isInt(str)) {
-				int num = Integer.parseInt(str);
+			for (Integer num1 : plugin.getSpecialRewardsConfig().getVotePartyVoteReminderAtVotes()) {
+				int num = num1.intValue();
 				if (neededVotes == num) {
 					String broadcastMessage = plugin.getSpecialRewardsConfig().getVotePartyVoteReminderBroadcast();
 					HashMap<String, String> placeholders = new HashMap<String, String>();
 					placeholders.put("player", user.getPlayerName());
 					placeholders.put("votesrequired", "" + neededVotes);
 					MiscUtils.getInstance()
-							.broadcast(StringParser.getInstance().replacePlaceHolder(broadcastMessage, placeholders));
+							.broadcast(PlaceholderUtils.replacePlaceHolder(broadcastMessage, placeholders));
 				}
 			}
 		}
+
 	}

 	public synchronized void vote(VotingPluginUser user, boolean realVote, boolean forceBungee) {