Update version number to 6.18.1

Adjust encryption
Add log warning for disabled plugin message encryption on proxy
2026-11-04 17:10:03 -05:00 · 2025-01-25 20:15:31 -06:00 · 2025-01-25 19:22:14 -06:00 · 2025-01-25 18:24:39 -06:00 · 2025-01-25 17:51:53 -06:00 · 2025-01-25 16:59:27 -06:00
142 changed files with 14821 additions and 7398 deletions
@@ -0,0 +1,14 @@
+# These are supported funding model platforms
+
+github: BenCodez # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+#patreon: # Replace with a single Patreon username
+#open_collective: # Replace with a single Open Collective username
+#ko_fi: # Replace with a single Ko-fi username
+#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+#liberapay: # Replace with a single Liberapay username
+#issuehunt: # Replace with a single IssueHunt username
+#lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+#polar: # Replace with a single Polar username
+#buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+custom: ["https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YQBX25RTXJ5DG"]
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "maven" # See documentation for possible values
+    directory: "/VotingPlugin/" # Location of package manifests
+    schedule:
+      interval: "weekly"
@@ -1,17 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 20
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 5
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - Priority
-  - nonstale
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
@@ -0,0 +1,24 @@
+name: Deploy Javadoc
+
+on:
+  release:
+    types: [published]
+    branches:
+      - master
+      - main
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy JavaDoc 🚀
+        uses: MathieuSoysal/Javadoc-publisher.yml@main
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          javadoc-branch: gh-pages
+          java-version: 17
+          target-folder: ''
+          project: maven # or gradle
+          # subdirectories: moduleA moduleB #for subdirectories support, needs to be run with custom command
+          custom-command: mvn -f VotingPlugin/pom.xml deploy -P javadoc javadoc:aggregate
+          javadoc-source-folder: 'VotingPlugin/target/apidocs'
@@ -0,0 +1,27 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '19 16 * * *'
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v5
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'Stale issue message'
+        stale-pr-message: 'Stale pull request message'
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'
@@ -2,30 +2,25 @@
 Plugin on SpigotMC
 https://www.spigotmc.org/resources/votingplugin.15358/

-![img](http://badge.henrya.org/spigot/downloads?id=15358&color=green)
-
-![img2](http://badge.henrya.org/spigot/version?id=15358&color=red)
-
 ## License
 ### Creative Commons Arttribution 3.0 Unported
-https://github.com/Ben12345rocks/VotingPlugin/blob/master/VotingPlugin/Resources/LICENSE.txt
+https://github.com/BenCodez/VotingPlugin/blob/master/VotingPlugin/Resources/LICENSE.txt

 ### Maven:

    <repository>
-        <id>jitpack.io</id>
-        <url>https://jitpack.io</url>
+	    <id>BenCodez Repo</id>
+	    <url>https://nexus.bencodez.com/repository/maven-public/</url>
    </repository>
-    
+
    <dependency>
-	    <groupId>com.github.BenCodez</groupId>
-	    <artifactId>VotingPlugin</artifactId>
+        <groupId>com.bencodez</groupId>
+	    <artifactId>votingplugin</artifactId>
 	    <version>LATEST</version>
 	    <scope>provided</scope>
-	</dependency>
+    </dependency>
  
  Versions:  
  LATEST - latest stable release  
-  BRANCH-SNAPHSOT - unstable builds  
 
    
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="Resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
@@ -1,3 +1,8 @@
 /bin/
 /target/
-/doc/
+/doc/
+/.idea/
+/*.iml
+/.settings/
+/.classpath
+/.factorypath
@@ -1,7 +0,0 @@
-add_todo=false
-eclipse.preferences.version=1
-include_subpackages=true
-mode=mode_replace
-project_specific_settings=true
-replacements=<?xml version\="1.0" standalone\="yes"?>\n\n<replacements>\n<replacement key\="get" scope\="1" mode\="0">Gets the</replacement>\n<replacement key\="set" scope\="1" mode\="0">Sets the</replacement>\n<replacement key\="add" scope\="1" mode\="0">Adds the</replacement>\n<replacement key\="edit" scope\="1" mode\="0">Edits the</replacement>\n<replacement key\="remove" scope\="1" mode\="0">Removes the</replacement>\n<replacement key\="init" scope\="1" mode\="0">Inits the</replacement>\n<replacement key\="parse" scope\="1" mode\="0">Parses the</replacement>\n<replacement key\="create" scope\="1" mode\="0">Creates the</replacement>\n<replacement key\="build" scope\="1" mode\="0">Builds the</replacement>\n<replacement key\="is" scope\="1" mode\="0">Checks if is</replacement>\n<replacement key\="print" scope\="1" mode\="0">Prints the</replacement>\n<replacement key\="has" scope\="1" mode\="0">Checks for</replacement>\n</replacements>\n\n
-use_internal_formatter=true
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=Cp1252
-encoding/Resources=Cp1252
-encoding/src=Cp1252
@@ -1,30 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=disabled
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
@@ -1,4 +0,0 @@
-activeProfiles=dev
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-project.repository.kind=github
-project.repository.url=http\://github.com/Ben12345rocks/VotingPlugin
@@ -1,8 +0,0 @@
-DELEGATES_PREFERENCE=delegateValidatorList
-USER_BUILD_PREFERENCE=enabledBuildValidatorList
-USER_MANUAL_PREFERENCE=enabledManualValidatorList
-USER_PREFERENCE=overrideGlobalPreferencesfalse
-eclipse.preferences.version=1
-override=false
-suspend=false
-vf.version=3
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.jboss.ide.eclipse.as.core.singledeployable.deployableList=\n
@@ -1,21 +1,32 @@
-# --------------------------
+##########################################
 # Bungee Setup 
 # Only if using votingplugin bungee to send votes
 # REQUIRES RESTART FOR CHANGES TO TAKE EFFECT
-# --------------------------
+##########################################

 # Plugin using bungee, requires plugin on bungee server
 UseBungeecord: false

 # What type of bungee setup
 # Requires restart and set on all servers
-# https://github.com/BenCodez/VotingPlugin/wiki/Bungeecoord-Setups
+# https://github.com/BenCodez/VotingPlugin/wiki/Bungeecord-Setups
 # Available:
 # SOCKETS
-# PLUGINMESSAGING
+# PLUGINMESSAGING (Recommended)
 # MYSQL
+# REDIS (2nd Most Recommended)
 BungeeMethod: PLUGINMESSAGING

+# Use Redis for between server communication, set BungeeMethod to REDIS to use this
+Redis:
+  Host: localhost
+  Port: 6379
+# To get the user name, run redis-cli, if you set a password, run "auth <your password>" and if the out put is "OK" run "ACL USERS"
+  Username: 'default'
+  Password: ''
+  # Set a prefix from an entire proxy network if using multi-proxy setup below
+  Prefix: ''
+
 # Enables more debug messages for communication between servers
 # Use /votingpluginbungee status for testing communication
 BungeeDebug: false
@@ -29,12 +40,21 @@ BungeeBroadcast: false
 # Whether to broadcast on cached votes
 BungeeBroadcastAlways: false

+# If true, the server won't broadcast votes
+# To be used in conjuction with Broadcast setting on bungee
+DisableBroadcast: false
+
 # If true, offline rewards will be stored per server, rather than global
 # This shouldn't need to be set unless you get alot of cross server rewards issues
 # You can also specify the server within the rewards
 # Requires server name below to be correct
 PerServerRewards: false

+# If true, milestones work per server
+# Please note totals still sync, but milestones can be claimed on each server
+# Needs to be set across all needed servers
+PerServerMilestones: false
+
 # If true, points will be given on a per server level
 # Points will be added when server gets vote from bungee
 PerServerPoints: false
@@ -43,22 +63,77 @@ PerServerPoints: false
 # Should allow some compability with other plugins
 TriggerVotifierEvent: false

+# If enabled plugin will give extra allsites reward if deterimned that it should
+# E.g. user votes offline for 7 days, they will only get 1 allsites reward by default
+# When enabled, they should get 7
+# Only applies to PLUGINMESSAGING
+# Recommend enabling ExtraAllSitesCheck in config.yml as well
+GiveExtraAllSitesRewards: false
+
 # What server this is in bungee (must match)
 # Also can be applied to rewards
 Server: PleaseSet

-# -----------------------------
-# For socket setup below only
-# -----------------------------
+# Rewards from bungee vote party
+# Gives to only players only
+# Use regular voteparty rewards otherwise
+# Can edit via /av gui
+BungeeVotePartyRewards: {}

-# Bungee communication, add bungee host/port here
-# For socket method
-BungeeServer:
-  Host: '127.0.0.1'
-  Port: 1297
-  
-# Bungee communication, add this to bungee server
-# For socket method
-SpigotServer:
-  Host: '127.0.0.1'
-  Port: 1298
+# List of commands to run on bungee party
+# This runs a one time command only
+BungeeVotePartyGlobalCommands: []
+
+# Default is vp:vp, can be changed to prevent potential exploits
+# Must match on all servers
+# This setting requires a restart
+PluginMessageChannel: "vp:vp"
+
+# Use this to encrypt the plugin messages
+# Must be set on all servers the same
+# Copy secretkey.key file to all servers (They all must match)
+# This setting requires a restart
+PluginMessageEncryption: false
+
+####################################################################################
+# Global mysql data handle for between server commmunications
+# This is NOT required for bungee voting to work
+# This is still a WIP, use with caution
+# This will create a different table then from users storing server info to process
+#
+# If you use this you need to enable this on BungeeSettings.yml on each server with votingplugin
+# Make sure server name is set correctly in BungeeSettings.yml or this will not work correctly
+# 
+# Please use PLUGINMESSAGING for this, SOCKETS should work as well, but not fully tested
+#
+# This will make votes cache until time change has finished processing
+# In the event a server is offline or time change fails, the time change process
+# will continue after a set amount of time (in essense skipping a specific server)
+# This will also respect blocked servers in bungeeconfig.yml
+GlobalData:
+  Enabled: false
+  # Use existing mysql connection from config.yml
+  UseMainMySQL: true
+  # Mysql settings only used if above is false
+  Host: ''
+  # Default port is 3306
+  Port: 3306 
+  Database: ''
+  Username: ''
+  Password: ''
+  # Max number of connections
+  MaxConnections: 1
+  # Must be the same on all servers
+  Prefix: ''
+  #UseSSL: true
+  #PublicKeyRetrieval: false
+  #Attempt to use mariadb driver
+  #UseMariaDB: false
+
+##########################################
+# For socket setup
+# Recommend to try PLUGINMESSAGING setup first
+# Options hidden by default to avoid confusion
+##########################################
+# Options available here:
+# https://github.com/BenCodez/VotingPlugin/wiki/Bungee-Setup-SOCKETS
@@ -4,10 +4,13 @@
 # https://github.com/BenCodez/VotingPlugin/wiki
 # Config is sorted in sections
 # Use Control + F to search with Notepad++
-# 
+
+
+###########################################
+# User storage
+###########################################
 # Valid Options:
 # - SQLITE 
-# - FLAT
 # - MYSQL
 DataStorage: SQLITE

@@ -22,57 +25,21 @@ MySQL:
  Password: ''
  # Max number of connections
  MaxConnections: 1
-  # Maxium size of caching mysql
-  # -1 for no limit
-  # Affecting this value may affect performance
-  MaxSize: -1
  # Table name prefix, for use with mutliple servers
+  # Don't use with PLUGINMESSAGING bungee setup
  Prefix: ''
  #UseSSL: true
  #PublicKeyRetrieval: false
+  #MaxLifeTime: -1
  #Additional info on connection string
  #Line: ''
-  
-# ---------------------------------------------------------
-# Mysql cache options 
-# Clearing cache forces the plugin to pull from database
-# Not needed unless you are using multiple servers
-# If using a bungee setup most of these options are overriden automatically
-# ---------------------------------------------------------
+  #Attempt to use mariadb driver
+  #UseMariaDB: false

-# Clear cache on update, setting to true reduces update speed
-# Also may require AlwaysUpdate set to true
-ClearCacheOnUpdate: false

-# Clear cache on player join always
-ClearCacheOnJoin: false
-
-# Clears cache for the player who voted only
-# Only effects if using mysql
-# Would recommend for some bungee setups
-ClearCacheOnVote: false
-
-# Clear cache when player leaves
-ClearCacheOnLeave: false
-
-ClearCacheOnVoteShopPurchase: true
-
-# --------------------
-# AllowUnJoined options
-# May need to set to true for bungee setup
-# --------------------
-
-# Let players who never joined before vote
-# Recommend: False (Will prevent creating random user data)
-AllowUnjoined: false
-
-# Use server lookup for when allowunjoined is set to false
-# Recommend leaving enabled unless you face issues
-AllowUnJoinedCheckServer: true
-
-# ------------------------------------------------
+###########################################
 # VoteReminding
-# ------------------------------------------------
+###########################################

 # Configuration for VoteReminding
 # By default this should be all setup to work
@@ -83,7 +50,7 @@ VoteReminding:
  # Requires VoteDelays to be setup properly
  # Use /vote next to see when you can be reminded
  # Players require the perm "VotingPlugin.Login.RemindVotes" or "VotingPlugin.Player"
-  # To remind if any votesite is available (rather than all) use the permission "VotingPlugin.Login.RemindVotes.Any"
+  # To remind if all votesites are available (rather than any) use the permission "VotingPlugin.Login.RemindVotes.All"
  Enabled: true

  # Will remind player on login if he can vote
@@ -103,7 +70,7 @@ VoteReminding:
  # This can also be edited via /av gui
  Rewards:
    Messages:
-      Player: '&aYou have %sitesavailable% to vote on still!'
+      Player: '&aYou have %sitesavailable% sites to vote on still!'
    Title:
      Enabled: false
      Title: '&cRemember to vote!'
@@ -115,9 +82,9 @@ VoteReminding:
      Message: '&cRemember to vote'
      Delay: 30
    
-# ------------------------------------------------
-# Format
-# ------------------------------------------------
+###########################################
+# Format options
+###########################################
    
 # Common PlacesHolders:
 # Special PlaceHolders will be commented where available
@@ -133,7 +100,11 @@ Format:

  # Broadcast vote message
  # Set to an empty message to disable
+  # Use %NewLine% for a new line
  BroadcastMsg: '&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %SiteName%'
+  # If true uses broadcast setting below for offline votes
+  OnlyOneOfflineBroadcast: false
+  OfflineBroadcast: '&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %numberofvotes% times!'
  
  # Broadcast only when player is online
  BroadcastWhenOnline: false
@@ -141,6 +112,8 @@ Format:
  # Broadcast every x number of minutes with number of players that voted
  AlternateBroadcast:
    Enabled: false
+    # Use %players% for all players names
+    # Use %numberofplayers% for number of players that voted
    Broadcast: '&6[&4Broadcast&6] &2%numberofplayers% voted in the last half hour! /vote'
    # Delay in minutes
    Delay: 30
@@ -156,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
@@ -199,6 +175,8 @@ Format:
        TimeFormat: '%amount% %TimeType%'
        LastVoted: '%times% ago'
        NeverVoted: 'Never voted'
+        # Whether or not to include seconds into last voted time
+        IncludeSeconds: true
        
      # Format for /vote total
      Total:
@@ -272,9 +250,23 @@ Format:
      # %Points% = player points
      Points: '&a%Player% currently has &a&l%Points%&a Points!'
      
+      # /vote givepoints command
+      # Transfer between players command
+      # Enable command below
+      GivePoints:
+        NotEnoughPoints: '&cNot enough points'
+        NotJoinedServer: '&c%player% has not joined the server'
+        NumberLowerThanZero: '&cNumber of points needs to be greater than 0'
+        TransferFrom: '&c%transfer% points given to %touser%'
+        TransferTo: '&cYou received %transfer% points from %fromuser%'
+      
      ToggleBroadcasts:
        Enabled: '&cYou will now see vote broadcasts'
        Disabled: '&cYou will no longer see vote broadcasts'
+        
+      ToggleReminders:
+        Enabled: '&cVote reminders enabled'
+        Disabled: '&cVote reminders disabled'
  
  # Msg on top voter award, will only send message if that place has a reward set
  # %place% = place - 1,2,3,etc
@@ -319,6 +311,7 @@ Format:
  # Shop messages when using the /vote shop
  ShopPurchase: '&aYou bought the %Identifier% for %Points% Points!'
  ShopFailed: '&cYou do not have %Points% points to purchase this!'
+  ShopNotPurchasable: '&cThis item is not buyable!'
  
  # User not exist message, from commands such as /vote next (player)
  UserNotExist: '&cUser does not exist: %player%'
@@ -343,11 +336,24 @@ Format:
    Weekly: 'Weekly'
    Monthly: 'Monthly'
    AllTime: 'AllTime'
+  
+  # Invalid command messages
+  InvalidCommand:
+    Vote: '&4No valid arguments, see /vote help!'
+    AdminVote: '&4No valid arguments, see /adminvote help!'
+    
+# Playernames to not be broadcasted when voting
+# case sensitive
+VotingBroadcastBlacklist: []

-# ------------------------------------------------
+# Playernames to not be broadcasted when broadcast comes from reward file
+# case sensitive
+BroadcastBlacklist: []
+
+###########################################
 # Top Voter
 # Top voter rewards available in specialrewards.yml
-# ------------------------------------------------
+###########################################

 # Top voter blacklist
 # Hide these names from top voter lists
@@ -375,7 +381,7 @@ LoadTopVoter:
  
 # Maxium number of players to show on top voter
 # Set to -1 for no limit
-MaxiumNumberOfTopVotersToLoad: -1
+MaxiumNumberOfTopVotersToLoad: 1000

 # When top voter awards are given (even if there are none listed) it will store top voters
 # Files will created in TopVoters folder.
@@ -383,109 +389,13 @@ MaxiumNumberOfTopVotersToLoad: -1
 StoreTopVoters:
  Weekly: false
  Daily: false
-    
-# ------------------------------------------------
-# Advanced
-# Most of these values can be left untouched for most setups
-# ------------------------------------------------
-
-# If true vanished players are treated as if they are offline
-TreatVanishAsOffline: false
-
-# If true, cooldown check is disabled
-DisableCoolDownCheck: false
-
-# If true, disable PlayerInteractEvent (for clicking signs and skulls)
-DisableInteractEvent: false
-
-# Delays login event, delays vote reminding and more
-# In ticks
-DelayLoginEvent: 0
-
-# If false, votestreaks will be disabled
-UseVoteStreaks: true
-
-# If false, storing best totals will be disabled
-UseHighestTotals: true
-
-# If true, /vote will open /vote gui by default
-UseVoteGUIMainCommand: false
-
-# Number of points to give on vote
-# Set to 0 to give no points
-PointsOnVote: 1
-
-# Set this to false to disable the plugin adding totals
-# Not really recommended
-AddTotals: true
-
-# If true, items given for rewards are dropped on the ground
-# If false, items will be given when there is space
-DropOnFullInv: true
-
-# If true, allsites will have an extra check to prevent duplicate allsites from being given
-ExtraAllSitesCheck: false
-
-# Click sound when using gui
-# Set to none for no sound
-ClickSound: 
-  Sound: 'UI_BUTTON_CLICK'
-  Volume: 1.0
-  Pitch: 1.0
-  
-# Playernames to not be broadcasted when voting
-# case sensitive
-VotingBroadcastBlacklist: []
-
-# When enabled, javascript will be parsed on placeholders (from placeholderapi)
-# allows more fancy placeholders with math for example
-UseJavascriptPlaceholders: false
  
 # Limit monthly votes to number of days of a month multipled by the number of sites
 LimitMonthlyVotes: false

-# This is an extra safe guard to prevent milestones 
-# from being executed more than once
-# Shoudn't be needed, but enable if you have trouble with milestones
-PreventRepeatMilestones: false
-
-# When enabled the command /vote setprimaryaccount (playername)
-# will be shown (after restart)
-# Primary account will be used instead of the players account to get
-# placeholder and other data such as vote reminding
-# Mainly to be used for alts and such
-UsePrimaryAccountForPlaceholders: false
-
-# Always force placeholders to return value if the value isn't cached
-# This should prevent server from crashing when pulling placeholders on main thread
-# Only affects placeholderapi placeholders
-AlwaysWaitForCachePlaceholders: false
-
-# If true, permissions will be handled differently
-MultiplePermissionsCheck: false
-
-AddCustomCommands: false
-
-# Injects custom command to /vote
-# Requires AddCustomCommand: true to be set
-CustomCommands:
-  # identifier, not specific name
-  command1:
-    Args:
-    - token
-    # Message to send on command
-    Message: 'token message'
-    # Permission for this command
-    Permission: 'votingplugin.commands.vote.token'
-    # help message
-    HelpMessage: 'See tokens'
-    # Forces player to run this command
-    Commands:
-    - tokencommand
-
-######################
+###########################################
 # Debug
-######################
+###########################################

 # Debug levels:
 # NONE
@@ -507,16 +417,86 @@ DebugInGame: false
 # Not recommended though
 LogVotesToFile: false

-# Only update in the background when needed when set to false
-AlwaysUpdate: false
+###########################################
+# Placeholderapi placeholders settings
+###########################################

-# Update in the background only if players are online
-UpdateWithPlayersOnlineOnly: false
+# When enabled the command /vote setprimaryaccount (playername)
+# will be shown (after restart)
+# Primary account will be used instead of the players account to get
+# placeholder and other data such as vote reminding
+# Mainly to be used for alts and such
+UsePrimaryAccountForPlaceholders: false

-# Delay between background updates like signs and more
-# Default: 3 Minutes
-# Longer times result in longer wait in stuff updating after a vote, like topvoter
-DelayBetweenUpdates: 3
+# Valid Options:
+# AUTOALL - Auto cache placeholders after they have been used and cache all players placeholder all the time
+# AUTO - Auto cache after they have been used and cache online players placeholders (Recommended)
+# SPECIFIC - Only cache certain placeholders for online players
+# SPECIFICALL - Only cache certain placeholders for all players
+# NONE - Don't cache any placeholders
+PlaceholderCacheLevel: AUTO
+
+# Placeholder controls
+# Add _process to end of placeholder to force a return value rather than . or .. if no cached value is ready
+# Add _nocache to end of placeholder to skip cache and retrive a live value, uses a direct mysql connection, do not use on main thread
+#
+
+# Set which placeholders to cache at all times
+# Use for placeholders to are pulled constantly or on the main thread
+# Mainly aimed for scoreboards that pull placeholders often
+# Placeholders may auto cache in certain conditions (if enabled above)
+# Will use additional memory, but not a lot
+# Still in early stages, please report bugs
+# Please remove VotingPlugin_ from the placeholder listed here
+CachedPlaceholders: []
+#- Total_AllTime
+
+# When enabled, javascript will be parsed on placeholders (from placeholderapi)
+# allows more fancy placeholders with math for example
+UseJavascriptPlaceholders: false
+
+# Custom placeholder returns
+# For the example below use %votingplugin_custom_enoughpoints_5%
+# DO NOT USE ON MAIN THREAD IF POSSIBLE
+# Keep everything lowercase
+# Example:
+#CustomPlaceholderReturns:
+#  'enoughpoints_5':
+#    'true': 'User has enough points'
+#    'false': 'User does not have enough points'
+CustomPlaceholderReturns: {}
+
+# Load votingplugin internal expansion
+LoadInteralExpansion: true
+
+###########################################
+# Login options
+###########################################
+
+# If true vanished players are treated as if they are offline
+TreatVanishAsOffline: false
+
+# Delays login event, delays vote reminding and more
+# In miliseconds, 1000 = 1 second
+DelayLoginEvent: 0
+
+# Wait until user is logged in with AuthMe
+# Requires AuthMe or LoginSecurity
+WaitUntilLoggedIn: true
+
+###########################################
+# Disable/Enable features
+###########################################
+
+# If true, cooldown check is disabled
+DisableCoolDownCheck: false
+
+# If true, disable PlayerInteractEvent (for clicking signs and skulls)
+DisableInteractEvent: false
+
+# Disable this on a hub server for example
+# Still processes rewards for offline rewards (just won't give any)
+ProcessRewards: true

 # Set to true to disable no service site message on voting
 # You should never have to touch this if everything is setup properly
@@ -527,6 +507,160 @@ DisableNoServiceSiteMessage: false
 # If true fake votes will give points and totals
 CountFakeVotes: true

+# Whether or not to disable update checks
+DisableUpdateChecking: false
+
+# Enable per site cooldown events, requires more resources to use
+# Requires restart
+PerSiteCoolDownEvents: false
+
+# Queue votes during a time change (doesn't apply to bungee voting)
+# Votes will be given when time change is completed
+QueueVotesDuringTimeChange: false
+
+# If true, plugin will automaticly generate votesites
+# Disable this if you experience issues with sites being created randomly
+# Most cases this will work all the time
+AutoCreateVoteSites: true
+
+# Experiemtental feature
+# Uses https://github.com/BenCodez/VotingPlugin/wiki/Minecraft-Server-Lists
+# Not all voting sites use the domain name as the service sites
+# This feature is an attempt to ease setup for new users by matching domain name to actual service site
+AdvancedServiceSiteHandling: false
+
+# Set this to false to disable the plugin adding totals
+# Not really recommended
+AddTotals: true
+
+# Disabling this prevents offline votes from adding totals to users
+AddTotalsOffline: true
+
+# If false, votestreaks will be disabled
+UseVoteStreaks: true
+
+# If false, storing best totals will be disabled
+UseHighestTotals: true
+
+# Geyser/Bedrock player support
+# Set prefix used for voting
+# Players should vote with prefix
+# https://github.com/BenCodez/VotingPlugin/wiki/Bedrock-Player-Support
+BedrockPlayerPrefix: '.'
+
+# Whether or not to create daily backups. (Only the most recent ones get kept)
+CreateBackups: true
+
+# Automaticly download the latest version
+# Will require a restart to actually update
+# Note: It takes 30-40 minutes before being able to download the latest build
+# You can also use /av download
+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
+# May improve performance
+#DisableCheckOnWorldChange: false
+
+# Disable javascript processing in messages/rewards
+DisableJavascript: false
+
+# If true, number of vote shop purchases will be tracked
+# Data will be tracked in serverdata.yml, may change in the future
+# No commands to view data currently 
+TrackShopPurchases: false
+
+# Limits about of offline votesites
+# Does not currently work with bungee votes from votingplugin
+OfflineVotesLimit:
+  # Enable or disable
+  Enabled: false
+  # 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 PreviousMonthstotals 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
+###########################################
+
+# 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
+PreloadSkulls: true
+
+# Number of miliseconds between skull caching
+# Default about 4 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: 4000
+
+# 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
+###########################################
+
+# If true, allsites will have an extra check to prevent duplicate allsites from being given
+ExtraAllSitesCheck: false
+
+# This is an extra safe guard to prevent milestones 
+# from being executed more than once
+# Shoudn't be needed, but enable if you have trouble with milestones
+PreventRepeatMilestones: false
+
+# Number of points to give on vote
+# Set to 0 to give no points
+PointsOnVote: 1
+
+# May need to enable this for bungee setups
+# Let players who never joined before vote
+# Recommend: False (Will prevent creating random user data)
+AllowUnjoined: false
+
+# Use server lookup for when allowunjoined is set to false
+# Recommend leaving enabled unless you face issues
+AllowUnJoinedCheckServer: true
+
+##############################################
+# Command/Permission settings
+##############################################
+
 # Give VotingPlugin.Player by default
 # Requires restart to take affect
 GiveDefaultPermission: true
@@ -535,57 +669,17 @@ GiveDefaultPermission: true
 # Permissions listed here will no be accessible with the default permission
 DisabledDefaultPermissions: []

-# Remove old player files
-# Happens on startup or /av purge
-PurgeOldData: false
-
-# Minimum number of days offline in order to purge
-PurgeMin: 90
-
-# Whether or not to create daily backups. (Only the most recent ones get kept)
-CreateBackups: true
-
-# If true, plugin will automaticly generate votesites
-# Disable this if you experience issues with sites being created randomly
-# Most cases this will work all the time
-AutoCreateVoteSites: true
-
-# Automaticly download the latest version
-# Will require a restart to actually update
-# Note: It takes 30-40 minutes before being able to download the latest build
-# You can also use /av download
-AutoDownload: false
-
-# Whether or not to disable update checks
-DisableUpdateChecking: false
-
-# Allow transfer of vote points between players
-AllowVotePointTransfers: false
-
-# Disable this on a hub server for example
-# Still processes rewards for offline rewards (just won't give any)
-ProcessRewards: true
+# If true, /vote will open /vote gui by default
+UseVoteGUIMainCommand: false

 # Disable checking permissions on tab complete
+# Could increase performance slightly, but probably not
 DisableAdvancedTab: false

 # Load command aliases, such as /avgui
 # Requires restart to take effect
 LoadCommandAliases: true

-# Wait until user is logged in with AuthMe
-# Requires AuthMe
-WaitUntilLoggedIn: true
-
-# Preload skulls to improve performance
-# If false, skulls will be cached as they are used
-# assuming loadskulls is enabled
-PreloadSkulls: false
-
-# 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
-
 # Use vault for permission checks
 # May not work on some plugins
 UseVaultPermissions: false
@@ -596,26 +690,115 @@ UseVaultPermissions: false
 # - PERMISSION
 DisabledCommands: []

-# Enable Geyser prefix support
-GeyserPrefixSupport: false
-GeyserPrefix: '*'
+# If true, permissions will be handled differently
+MultiplePermissionsCheck: false
+
+# Allow transfer of vote points between players
+# Requires restart for command to load
+# Command: /vote givepoints (player) (points)
+AllowVotePointTransfers: false
+
+AddCustomCommands: false
+
+# Injects custom command to /vote
+# Requires AddCustomCommand: true to be set
+CustomCommands:
+  # identifier, not specific name
+  command1:
+    Args:
+    - token
+    # Message to send on command
+    Message: 'token message'
+    # Permission for this command
+    Permission: 'votingplugin.commands.vote.token'
+    # help message
+    HelpMessage: 'See tokens'
+    # Forces player to run this command
+    Commands:
+    - tokencommand
+
+##############################################
+# Background task settings
+##############################################
+
+# Only update in the background when needed when set to false
+AlwaysUpdate: false
+
+# Update in the background only if players are online
+UpdateWithPlayersOnlineOnly: false
+
+# Delay between background updates like signs and more
+# Default: 3 Minutes
+# Longer times result in longer wait in stuff updating after a vote, like topvoter
+DelayBetweenUpdates: 3

 # Enable to true for extra player checks
+# Recommend leaving this to false
 ExtraBackgroundUpdate: false

+##########################################
+# Inventory controls
+##########################################
+
+# Click sound when using gui
+# Set to none for no sound
+ClickSound: 
+  Sound: 'ui.button.click'
+  Volume: 1.0
+  Pitch: 1.0
+
+# If true, items given for rewards are dropped on the ground
+# If false, items will be given when there is space
+DropOnFullInv: true
+
 # This will prevent spam clicking GUI's to prevent exploits
 # Number is time in between clicking in milliseconds
-SpamClickTime: 150
+SpamClickTime: 100
 # Message to send when inventory forced closed when spam clicking
 # Uncomment to use
 #SpamClickMessage: '&cDetected spam clicking GUI, closing to prevent exploits'

-# ###############################################################
-# Deprecated options, don't recommend using any of these
-
 # Will force GUI's to close on every click
 AlwaysCloseInventory: false

+# Close inventory on player vote
+# This is to prevent any possible exploits
+CloseInventoryOnVote: true
+
+# This will close GUI's if you shift click them rather than a regular
+# This can help prevent exploits
+CloseGUIOnShiftClick: false
+
+###########################################
+# Purge settings
+###########################################
+# Remove old player files
+# 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
+
+##########################################
+# Extra options
+# Options below don't need to be touched
+##########################################
+
+# If enabled, data is repulled from storage on vote shop purchase
+# This prevents possible exploits with vote shop
+ExtraVoteShopCheck: true
+
 # Options for request api
 # Current methods:
 # ANVIL
@@ -626,9 +809,3 @@ RequestAPI:
  DefaultMethod: 'Anvil'
  DisabledMethods: []

-# Shouldn't need to change this
-#AutoKillInvs: true
-
-# Disable checking on world change
-# May improve performance
-#DisableCheckOnWorldChange: false
@@ -12,6 +12,7 @@ GUIMethod:
  Last: CHEST #BOOK not available (future update?)
  Next: CHEST 
  Total: CHEST #BOOK not available (future update?)
+  # GUI for /vote
  URL: CHEST
  Best: CHEST #BOOK not available (future update?)
  Streak: CHEST #BOOK not available (future update?)
@@ -70,7 +71,7 @@ CHEST:
        Name: '&4Vote Shop'
        Lore:
        - '&aYou currently have %points% points'
-    # 'ExtraName' below is an identifier, can be whatever
+    # 'ExtraItem' below is an identifier, can be whatever
    # ExtraItem:
      # Item:
        # Material: 'DIRT'
@@ -78,8 +79,8 @@ CHEST:
        # Name: 'Extra item'
        ## Works on most GUI items
        # Slot: 10
-        ## Send rewards on click, run commands, check conditions, etc
-        # Rewards: []
+      ## Send rewards on click, run commands, check conditions, etc
+      # Rewards: []
        
  # GUI for /vote url, /vote
  VoteURL:
@@ -119,8 +120,10 @@ CHEST:
      Material: 'EMERALD_BLOCK'
      Data: 0
      Amount: 1
+    # URL when clicking item in /vote (GUI version)
    URLText: '%VoteUrl%'
    # #Add Extra items
+    # This extra item format works across other gui settings below
    # ExtraItems:
      # Item1:
        # Material: DIRT
@@ -136,9 +139,14 @@ CHEST:
    # %time% = time, using timeformat below
    # %timesince% = time since vote
    Line: '&6%timeSince%'
+    ClickableLinks: true
  VoteNext:
    Name: 'VoteNext: %player%'
    BackButton: true
+    # Extra customization for displaying site names in GUI only
+    #CustomSiteNamesDisplays:
+    #  Site1: site name display
+    LoreLine: '%time%'
  VoteToday:
    Name: 'VoteToday'
    Line: '&6%VoteSite% : %Time%'
@@ -158,11 +166,17 @@ CHEST:
      Lore: '&3&lVotes: &3%votes%'
    # Opens main GUI of the specific player that gets clicked
    OpenMainGUIOnClick: true
+    # Close GUI when clicking on a player item
+    CloseGUIOnClick: true
    SwitchItem:
      Name: '&3Switch TopVoter'
      Lore: '&bCurrently: %Top%'
      Material: 'OAK_SIGN'
      Amount: 1
+      # Top voters for the switch item to use
+      #TopVoters:
+      #- ALLTIME
+      #- MONTHLY
      # 8 Slots over from the bottom left
      # Bottom of GUI
      Slot: 7
@@ -173,6 +187,15 @@ CHEST:
    # Item for player in GUI if use skull is false
    PlayerItem:
      Material: 'PAPER'
+    Customization:
+      Enabled: false
+      # List of slots for top voter
+      PlayerSlots: []
+      # Add extra items
+      ExtraItems: {}
+      RemoveBottomBar: false
+      # Set slot for backbutton
+      BackButtonSlot: 0
  VoteTotal:
    Name: 'VoteTotal: %player%'
    BackButton: true
@@ -202,6 +225,7 @@ CHEST:
        Amount: 1
  VoteBest:
    Name: 'VoteBest: %player%'
+    BackButton: true
    DayBest:
      Item:
        Material: 'CLOCK'
@@ -263,7 +287,6 @@ CHEST:
    Name: 'VoteSite: %site%'
  VoteGUIName: '&cVoteGUI: &c&l%player%'
  VoteRewardName: 'VoteReward'
-  VoteShopName: 'VoteShop'
  
  BackButton:
    Material: 'BARRIER'
@@ -274,70 +297,10 @@ CHEST:
    OpenVoteURL: false
    # If true, backbutton will be the last slot of the GUI
    EndOfGUI: 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'
-  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: ''
-      # 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'
+    # If true, this item will become an exit button instead
+    Exit: false
+    
+  # VoteShop settings moved to Shop.yml for 6.17 (To be released)
    
            
 BOOK:
@@ -346,7 +309,11 @@ BOOK:
    CanVoteText: 'Click me'
    CanVoteColor: 'GREEN'
    AlreadyVotedText: 'Click me'
-    AlreadyVotedColor: 'RED' 
+    AlreadyVotedColor: 'RED'
+    # If true the layout below is the full book text 
+    Manual: false
+    # Only works if Manual is enabled
+    TopLayout: []
    Layout:
    - '&3&l%Sitename%'
    - '[UrlText]'
@@ -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'
+      
+      
@@ -13,14 +13,26 @@ FirstVote:
 FirstVoteToday: {}

 # All vote rewards
-# Reward for voting on all sites in one day
+# One time reward for voting on all sites in one day
+# Enable ExtraAllSitesCheck if you get double rewards
 AllSites: 
  Messages:
    Player: '&aYou voted on all sites in 1 day!'
+    
+# Give a reward for voting on all sites minus 1
+# Similar to allsites
+#AlmostAllSites:
+#  Messages:
+#    Player: '&aYou almost voted on all sites in 1 day!'

+
+# If true only cumulative reward at a time can be given
+# The cumulative rewards will go in order as listed under Cumulative, so if true
+# the first cumulative (in the order as listed) that can be given will, then will ignore the rest
+OnlyOneCumulative: false
 # NOTE: This is not a 1 time reward, that's what milestones are for!
 # If total votes (Can be changed) divided by cumulative amount 
-# and as no remainder (So divides perfectly)then a reward is given
+# and with no remainder (So divides perfectly) then a reward is given
 Cumulative:
  # Number of votes required
  # Allows multiple cumulative rewards
@@ -28,7 +40,7 @@ Cumulative:
  # Can have multiple listed here
  '20':
    Enabled: false
-    # Wether or not votes must be made in same day/week
+    # Whether or not votes must be made in same day/week
    # Useful if you want to require a certain number of voting sites to be voted on
    # for a daily/weekly reward instead of all of them
    # Valid options
@@ -37,6 +49,11 @@ Cumulative:
    # Weekly
    # Daily
    TotalToUse: AllTime
+    # Blacklist recurring votes
+    #BlackList:
+    #- 40
+    # Whether or not to gives cumulative reward for every x number of votes, default: true
+    #Recurring: true
    Rewards: 
      Messages:
        Player: '&aYou got %cumulative% cumulative votes!'
@@ -48,14 +65,14 @@ 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
  GiveAllPlayers: false
  # If true, give online players the vote party reward
  # Can also use RewardType: ONLINE if you wanted
-  GiveOnlinePlayersOnly: false
+  GiveOnlinePlayersOnly: true
  # If true, the vote count will reset each day
  ResetEachDay: false
  # If true, the vote count will reset each week
@@ -64,7 +81,11 @@ VoteParty:
  ResetMonthly: false
  # If true, will give voteparty only once per day
  OnlyOncePerDay: false
-  # Reset extra votes
+  # If true, will give voteparty once per week only
+  OnlyOncePerWeek: false
+  # Reset extra votes weekly
+  ResetExtraVotesWeekly: false
+  # Reset extra votes monthly
  ResetExtraVotesMonthly: false
  # Count votes from /av vote?
  CountFakeVotes: true
@@ -74,9 +95,16 @@ VoteParty:
  CountOfflineVotes: true
  # Broadcast when vote party reached
  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!'
+  # Send vote reminder at number of votes to go
+  VoteReminderAtVotes: []
  # List of commands to execute, these only execute once.
  # %player% does not work here
-  Commands: []
+  GlobalCommands: []
+  # List of commands to execute once
+  # Only run will run
+  GlobalRandomCommand: []
  # Rewards to give per player
  Rewards: 
    # Uncomment below for online players to be rewarded only
@@ -109,6 +137,7 @@ VoteStreak:
    # Number of days in a row
    # Each day requires one vote
    # Add a - to give a reward for every multiple (e.g. 2- = 2,4,6,8, and so on)
+    # This may not work perfectly on bungee setups at this time
    '2':
      # Enabled or not
      Enabled: false
@@ -145,8 +174,10 @@ VoteStreak:
    Week: 50
    Month: 50
    
-# Reward given when vote cooldown ended
-# Using this is a little memory intensive
+# Reward given when all votesites are available to vote on
+# Don't use this unless you really need it
+# Little performance intensive
+# Recommend add RewardType: ONLINE for it to only work online
 VoteCoolDownEndedReward: []

 # ONLY USE THIS FOR TITLES/SOUNDS AND OTHER EFFECTS
@@ -166,6 +197,11 @@ LogoutRewards: {}

 EnableMonthlyAwards: true

+# TopVoter Placeholders:
+#%place% - place in topvoter
+#%topvoter% - topvoter type
+#%votes% - current total votes related to top voter
+
 # Rewards to give
 MonthlyAwards:
  # Position. 1 is first in top voter, 2 is second, etc...
@@ -2,6 +2,7 @@ VoteSites:
  # VoteSite key
  # Used for saving data for votesites
  # Use a short name if you can
+  # No spaces or dots
  ExampleVoteSite:
    # Enable voteSite
    # If false, votesite will not be loaded by plugin
@@ -26,7 +27,7 @@ VoteSites:
    ServiceSite: 'PlanetMinecraft.com'

    # vote url for /vote
-    # Format for this can be set in Format.yml
+    # Format for this can be set in Config.yml
    # Do not include colors here
    # If you need to force a url set the url as this:
    # VoteURL: '[Text="ANY TEXT TO CLICK ON HERE",url="URLHERE"]'
@@ -37,6 +38,7 @@ VoteSites:
    VoteDelay: 24
    
    # Use to have a minute votedelay
+    # Must set a value on VoteDelay if you plan on only using this setting
    #VoteDelayMin: 30
    
    # Require waiting until votedelay time has pasted in order to accept vote
@@ -47,22 +49,35 @@ VoteSites:
    # Recommend: false
    VoteDelayDaily: false
    
-    #Offset time for /vote next caculations
-    #TimeOffSet: 0
+    # Replaces offset, set the exact hour based on server time
+    # Include server time offset when setting this
+    # 2 = 2 am server time
+    # Use 1-24
+    #VoteDelayDailyHour: 14
    
    # If true, rewards can be executed offline (requires ForceOffline to be true in the reward)
    # Setting this to true will execute the reward offline while the player is offline
    # 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:
      Material: 'DIAMOND'
      Amount: 1
+      
+    # Reward to run when cooldown ends for this votesite
+    # Enable PerSiteCoolDownEvents in Config.yml to use this
+    #CoolDownEndRewards:
+    #  Messages:
+    #    Player: '&aTime to go vote on site1'

    # Rewards to give
-    # https://github.com/Ben12345rocks/AdvancedCore/wiki/Rewards
+    # https://github.com/BenCodez/AdvancedCore/wiki/Rewards
    Rewards:
      # Execute console commands
      Commands:
@@ -74,7 +89,7 @@ VoteSites:
  Site2:
    Enabled: false
    Name: 'Site2'
-    ServiceSite: 'PlanetMinecraft.com'
+    ServiceSite: 'Crafty.gg'
    VoteURL: 'link to vote URL here, used in /vote'
    VoteDelay: 24
    DisplayItem:
@@ -108,7 +123,7 @@ VoteSites:
          Messages:
            Player: 'You got unlucky'
            
-      # Give 1 diamond
+      # Give 1 diamond regardless of above
      Items:
        item1:
          Material: DIAMOND
@@ -1,4 +1,6 @@
 name: ${project.name}
 version: ${project.version}
 main: com.bencodez.votingplugin.bungee.VotingPluginBungee
-author: BenCodez
+author: BenCodez
+softDepends:
+- RedisBungee
@@ -11,77 +11,253 @@ Username: ''
 Password: ''
 # Max number of connections
 MaxConnections: 1
-# Maxium size of caching mysql
-# -1 for no limit
-# Affecting this value may affect performance
-MaxSize: -1
 # Table name prefix, for use with mutliple servers
+# Don't use with PLUGINMESSAGING bungee setup
 Prefix: ''
 #UseSSL: true
 #PublicKeyRetrieval: false
+#Attempt to use mariadb driver
+#UseMariaDB: false
+
+
+####################################################################################
+# Global mysql data handle for between server commmunications
+# This is NOT required for bungee voting to work
+# This is still a WIP, use with caution
+# This will create a different table then from users storing server info to process
+#
+# If you use this you need to enable this on BungeeSettings.yml on each server with votingplugin
+# Make sure server name is set correctly in BungeeSettings.yml or this will not work correctly
+# 
+# Please use PLUGINMESSAGING for this, SOCKETS should work as well, but not fully tested
+#
+# This will make votes cache until time change has finished processing
+# In the event a server is offline or time change fails, the time change process
+# will continue after a set amount of time (in essense skipping a specific server)
+# This will also respect blocked servers
+GlobalData:
+  Enabled: false
+  # Use existing connection above
+  UseMainMySQL: true
+  # Mysql settings only used if above is false
+  Host: ''
+  # Default port is 3306
+  Port: 3306 
+  Database: ''
+  Username: ''
+  Password: ''
+  # Max number of connections
+  MaxConnections: 1
+  # Must be the same on all servers
+  Prefix: ''
+  #UseSSL: true
+  #PublicKeyRetrieval: false
+  #Attempt to use mariadb driver
+  #UseMariaDB: false
+  
+# Time offset for time changes
+# Must match on all servers
+TimeHourOffSet: 0
+
+####################################################################################

 Debug: false
 # Have a reward on each server
 # If false, will send to online server only
 SendVotesToAllServers: true
 # List of servers the plugin won't send the vote to
-# Uses names from bungeecoord config if not using SOCKETS method
+# Uses names from bungeecoord config, only needed for non SOCKETS setup
 BlockedServers:
 - hub

+
+# Similar to BlockServers
+# If a server is listed then blockedservers is ignored
+WhiteListedServers: []
+
 # What type of bungee setup
 # Requires restart and set on all servers
-# https://github.com/Ben12345rocks/VotingPlugin/wiki/Bungeecoord-Setups
+# https://github.com/BenCodez/VotingPlugin/wiki/Bungeecoord-Setups
 # Available:
 # SOCKETS 
-# PLUGINMESSAGING 
+# PLUGINMESSAGING (Recommended)
 # MYSQL
+# REDIS
 BungeeMethod: PLUGINMESSAGING

+# Default is vp:vp, can be changed to prevent potential exploits
+# Must match on all servers
+# This setting requires a restart
+PluginMessageChannel: "vp:vp"
+
+# Use this to encrypt the plugin messages
+# Must be set on all servers the same
+# Copy secretkey.key file to all servers (They all must match)
+# This setting requires a restart
+PluginMessageEncryption: false
+
+# Use Redis for between server communication, set BungeeMethod to REDIS to use this
+Redis:
+  Host: localhost
+  Port: 6379
+  Username: ''
+  Password: ''
+  # Set a prefix from an entire proxy network if using mutli-proxy setup below
+  Prefix: ''
+
 # If false, votes will be checked if user is a valid player that has joined to server
 # Works for PLUGINMESSAGING and SOCKETS methods only
 # This requires spigot servers AllowUnJoined to be set to true in Config.yml
 AllowUnJoined: false

+# Points to give on vote
 PointsOnVote: 1

 # If true, bungee will handle adding totals
 # If false, spigot servers will EACH set their own totals
-# If false, AllowUnJoined should false on bungee, spigot servers will handle that
-# Recommened to leave true, setting to false setups are currently unsupported
+# If false, AllowUnJoined should be enabled on bungee, spigot servers will handle that
+# Recommeneded to leave enabled, setups with this disabled are currently unsupported
 BungeeManageTotals: true

-# ----------------------------
-# PLUGINMESSAGING Settings
-# ----------------------------
-
-# Applies to PLUGINMESSAGING & when SendVotesToAllServers is true
-# Votes will be forwarded when specific player is online
-WaitForUserOnline: false
-
-# ----------------------------
-# SOCKET Settings, do not touch otherwise
-# ----------------------------
-
 # Tell servers to broadcast
-# For socket method
+# Set DisableBroadcast to true on spigot servers (BungeeSettings.yml) as well
 Broadcast: true

-# Server to send vote to if player is offline
-FallBackServer: factions
+# Geyser/bedrock player settings
+# https://github.com/BenCodez/VotingPlugin/wiki/Bedrock-Player-Support
+BedrockPlayerPrefix: '.'

-# Bungee communication, Add this to each spigot server
-# For socket method
-BungeeServer:
-  Host: '127.0.0.1'
-  Port: 1297
+# Time votes will be cached on proxy
+# -1 means no time limit
+# Time in days
+VoteCacheTime: -1
+
+# Maxium number of votes possible per day
+# Usually matches the amount of votesites
+# Will limit vote totals to match accordingly
+# Only applies for month total
+# 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
+  # Only runs rewards for online players
+  Enabled: false
+  # Votes required
+  VotesRequired: 100
+  # Increase amount required on each vote party
+  IncreaseVotesRequired: 0
+  # If false, will only send to servers listed below
+  SendToAllServers: true
+  # Servers to send to, if SendToAllServers is false
+  ServersToSend: []
+  # List of commands to run on bungee server
+  # Set spigot commands in BungeeSettings.yml
+  BungeeCommands: []
+  Broadcast: '&aVote party has been reached!'
  
-# Bungee communication, add each spigot server here
-# For socket method
-SpigotServers:
-  lobby:
-    Host: '127.0.0.1'
-    Port: 1298
-  factions:
-    Host: '127.0.0.1'
-    Port: 1999
+# 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
+##########################################
+
+# Applies to PLUGINMESSAGING only
+# Votes will be forwarded when specific player is online
+# If set to false, rewards should still reward when player logs in (by default)
+WaitForUserOnline: false
+
+
+##########################################
+# Multi-proxy setup
+# This is still a WIP, use with caution
+# Primary server needs votifier and config option enabled
+# Set socket host on each proxy and primary server set sub proxies
+# All servers should be on pluginmessaging or sockets setup
+##########################################
+
+# Support for multiple proxies
+MultiProxySupport: false
+
+# Enable on primary proxy server with votifier
+PrimaryServer: false
+
+# If enabled, player will only get 1 reward on a server on the network
+# Must be enabled on all proxies for this to work
+# Must also disable sendtoallservers
+MultiProxyOneGlobalReward: false
+
+# Multi-proxy available methods:
+#  SOCKET
+#  REDIS
+MultiProxyMethod: SOCKET
+
+##########################################
+# REDIS Settings
+##########################################
+
+# Set multiproxymethod to REDIS to use redis
+MultiProxyRedis:
+  # If true the plugin will use the exsiting connection set above
+  # Must be on REDIS method to use this setting
+  UseExistingConnection: false
+  Host: localhost
+  Port: 6379
+  Username: ''
+  Password: ''
+  
+# Set each server it's own proxy name here (can be anything)
+ProxyServerName: proxy1
+
+# Set names of other proxy servers
+# Must match what's set as the proxy server name above from other servers
+# On non primary proxy server just set the primary proxy server name here
+ProxyServers:
+- proxy2
+- proxy3
+
+##########################################
+# SOCKET settings for mutli-proxy
+##########################################
+
+# Set this for each proxy
+MultiProxySocketHost:
+  Host: 0.0.0.0
+  Port: 1234
+
+# Set other sub proxies here
+# On non primary proxy only set primary proxy
+MultiProxyServers:
+  secondproxy:
+    Host: 0.0.0.0
+    Port: 1235
@@ -1,261 +1,266 @@
-name: ${project.name}
-version: ${project.version}
-main: com.bencodez.votingplugin.VotingPluginMain
-description: Highly Customizable Voting Listener!
-website: https://www.spigotmc.org/resources/votingplugin.15358/
-author: BenCodez
-softdepend: [MVdWPlaceholders, Votifier, VotifierPlus, NuVotifier, CMI, Vault, PlaceholderAPI, ProtocolLib, MVdWPlaceholderAPI, AuthMe]
-loadbefore: [MCPerks]
-api-version: 1.13
-libraries:
-  - org.openjdk.nashorn:nashorn-core:15.2
-commands:
-  vote:
-    description: Vote command
-  adminvote:
-    description: Admin commands for VotingPlugin
-  av:
-    description: Admin commands for VotingPlugin
-  votehelp:
-    description: See access to a list of commands, Formated in Format.yml
-    aliases: vhelp
-  votetotal:
-    description: See totals of votes
-    aliases: vtotal
-  votelast:
-    description: See the last time you voted
-    aliases: vlast
-  votenext:
-    description: See when you can vote next
-    aliases: vnext
-  votetop:
-    description: See top voters
-    aliases: vtop
-  votetoday:
-    description: See who voted today
-    aliases: vtoday
-  votegui:
-    description: Open VoteGUI
-    aliases: vgui
-  voteurl:
-    description: Open VoteURL
-    aliases: vurl
-  votereward:
-    description: Open VoteReward GUI
-    aliases: vreward
-  vote?:
-    description: View Help
-    aliases: v?
-  voteparty:
-    description: A command
-    aliases: vparty
-  voteshop:
-    description: A command
-    aliases: vshop
-  votebest:
-    description: A command
-    aliases: vbest
-  votestreak:
-    description: A command
-    aliases: vstreak
-  votetogglebroadcast:
-    description: A command
-    aliases: vtogglebroadcast
-  votepoints:
-    description: A command
-    aliases: vpoints
-  votelist:
-    description: A command
-    aliases: vlist
-  voteall:
-    description: A command
-    aliases: vall
-  votechoices:
-    description: A command
-    alaises: vchoices
-  votegivepoints:
-    description: A command
-    alaises: vgivepoints
-  adminvotehelp:
-    description: Open adminvote help
-    aliases: avhelp
-  adminvote?:
-    description: Open adminvote help
-    aliases: av?
-  adminvotereport:
-    description: Command Alias
-    aliases: avreport
-  adminvoteperms:
-    description: Command Alias
-    aliases: avperms
-  adminvoteDownload:
-    description: Command Alias
-    aliases: avdownload
-  adminvotereload:
-    description: Command Alias
-    aliases: avreload
-  adminvotetestreward:
-    description: Command Alias
-    aliases: avtestreward
-  adminvoteversion:
-    description: Command Alias
-    aliases: avversion
-  adminvotesites:
-    description: Command Alias
-    aliases: avsites
-  adminvoterewards:
-    description: Command Alias
-    aliases: avrewards
-  adminvoteuuid:
-    description: Command Alias
-    aliases: avuuid
-  adminvotevotesite:
-    description: Command Alias
-    aliases: avvotesite
-  adminvoteconfig:
-    description: Command Alias
-    aliases: avconfig
-  adminvoteupdatecheck:
-    description: Command Alias
-    aliases: avupdatecheck
-  adminvotevote:
-    description: Command Alias
-    aliases: [avvote, fakevote]
-  adminvotegui:
-    description: Command Alias
-    aliases: avgui
-  adminvotegivereward:
-    description: Command Alias
-    aliases: avgivereward
-  adminvoteConvertFromData:
-    description: Command Alias
-    aliases: avConvertFromData
-  adminvoteClearTotal:
-    description: Command Alias
-  adminvoteBackgroundUpdate:
-    description: Command Alias
-    aliases: avBackgroundUpdate
-  adminvoteClearCache:
-    description: Command Alias
-    aliases: avClearCache
-  adminvoteServiceSites:
-    description: Command Alias
-    aliases: avServiceSites
-  adminvoteSetVotePartyCount:
-    description: Command Alias
-    aliases: avSetVotePartyCount
-  adminvoteChoices:
-    description: Command Alias
-    aliases: avChoices
-  adminvoteReloadAll:
-    description: Command Alias
-    aliases: avReloadAll
-  adminvotePermsPlayer:
-    description: Command Alias
-    aliases: avPermsPlayer
-  adminvoteResyncMilestonesAlreadyGiven:
-    description: Command Alias
-    aliases: avResyncMilestonesAlreadyGiven
-  voteSetPrimaryAccount:
-    description: Command Alias
-  adminvoteClearOfflineVotes:
-    description: Command Alias
-    aliases: avClearOfflineVotes
-  adminvoteGiveAll:
-    description: Command Alias
-    aliases: avGiveAll
-  adminvoteGiveAllOnline:
-    description: Command Alias
-    aliases: avGiveAllOnline
-  adminvoteForceTimeChanged:
-    description: Command Alias
-    aliases: avForceTimeChanged
-  adminvoteplayername:
-    description: Command Alias
-    aliases: avplayername
-  adminvoteResyncMilestones:
-    description: Command Alias
-    aliases: avResyncMilestones
-  adminvoteClearOfflineRewards:
-    description: Command Alias
-    aliases: avClearOfflineRewards
-  adminvoteUserRemove:
-    description: Command Alias
-    aliases: avUserRemove
-  adminvotePurge:
-    description: Command Alias
-    aliases: avPurge
-  adminvoteJavascript:
-    description: Command Alias
-    aliases: avJavascript
-  adminvoteStatus:
-    description: Command Alias
-    aliases: avStatus
-  adminvoteTest:
-    description: Command Alias
-    aliases: avTest
-  adminvotePlaceholders:
-    description: Command Alias
-    aliases: avPlaceholders
-  adminvoteDownloadJenkins:
-    description: Command Alias
-    aliases: avDownloadJenkins
-  adminvoteForceVoteParty:
-    description: Command Alias
-    aliases: avForceVoteParty
-  adminvoteSetRequestMethod:
-    description: Command Alias
-    aliases: avSetRequestMethod
-  adminvoteUser:
-    description: Command Alias
-    aliases: avUser
-  adminvoteCurrentPluginTime:
-    description: Command Alias
-    aliases: avCurrentPluginTime
-  adminvoteResetPoints:
-    description: Command Alias
-    aliases: avResetPoints
-  adminvoteVotePartyExtraRequired:
-    description: Command Alias
-    aliases: avVotePartyExtraRequired
-  adminvoteRunCMD:
-    description: Command Alias
-    aliases: avRunCMD
-  adminvoteuseruuidremove:
-    description: Command Alias
-    aliases: avuseruuidremove
-  adminvoteedit:
-    description: Command Alias
-    aliases: avedit
-  adminvoteResetMilestoneCount:
-    description: Command Alias
-    aliases: avResetMilestoneCount
-permissions:
-  VotingPlugin.Player:
-    description: Allows basic access player commands
-  VotingPlugin.Mod:
-    description: Allows mod commands
-  VotingPlugin.Admin:
-    description: Allows admincommands
-  VotingPlugin.Login.RemindVotes:
-    description: Allows players to get remined on login if they can vote
-    default: true
-  VotingPlugin.Admin.Debug:
-    description: Permission to view debug info ingame
-  VotingPlugin.Signs.Create:
-    description: Allows access to create signs
-  VotingPlugin.TopVoter.Ignore:
-    description: Allows you to be exempt from top voter
-  VotingPlugin.NoRemind:
-    description: Ignore vote reminding
-    default: false
-  VotingPlugin.Sign.Create:
-    description: Permission to create sign
-  VotingPlugin.Admin.GenerateServiceSite:
-    description: Permission for generating votesite message
-  VotingPlugin.Login.RemindVotes:
-    description: Permission to allow timed reminders
-  VotingPlugin.Login.RemindVotes.All:
-    description: Remind if player can vote on all votesites, rather than any
-    default: false
-  
+name: ${project.name}
+version: ${project.version}
+main: com.bencodez.votingplugin.VotingPluginMain
+description: Highly Customizable Voting Listener!
+website: https://www.spigotmc.org/resources/votingplugin.15358/
+author: BenCodez
+softdepend:
+- MVdWPlaceholders
+- Votifier
+- VotifierPlus
+- NuVotifier
+- Vault
+- PlaceholderAPI
+- ProtocolLib
+- MVdWPlaceholderAPI
+- AuthMe
+- SuperVanish
+- PremiumVanish
+- LuckPerms
+loadbefore:
+- MCPerks
+api-version: 1.13
+folia-supported: true
+libraries:
+- org.openjdk.nashorn:nashorn-core:15.3
+commands:
+  vote:
+    description: Vote command
+  adminvote:
+    description: Admin commands for VotingPlugin
+  av:
+    description: Admin commands for VotingPlugin
+  votehelp:
+    description: See access to a list of commands, Formated in Format.yml
+    aliases: vhelp
+  votetotal:
+    description: See totals of votes
+    aliases: vtotal
+  votelast:
+    description: See the last time you voted
+    aliases: vlast
+  votenext:
+    description: See when you can vote next
+    aliases: vnext
+  votetop:
+    description: See top voters
+    aliases: vtop
+  votetoday:
+    description: See who voted today
+    aliases: vtoday
+  votegui:
+    description: Open VoteGUI
+    aliases: vgui
+  voteurl:
+    description: Open VoteURL
+    aliases: vurl
+  voteparty:
+    description: A command
+    aliases: vparty
+  voteshop:
+    description: A command
+    aliases: vshop
+  votebest:
+    description: A command
+    aliases: vbest
+  votestreak:
+    description: A command
+    aliases: vstreak
+  votetogglebroadcast:
+    description: A command
+    aliases: vtogglebroadcast
+  votepoints:
+    description: A command
+    aliases: vpoints
+  votetogglereminders:
+    aliases:
+    - vtogglereminder
+    - vtoggle
+  votelist:
+    description: A command
+    aliases: vlist
+  voteall:
+    description: A command
+    aliases: vall
+  votechoices:
+    description: A command
+    alaises: vchoices
+  votegivepoints:
+    description: A command
+    alaises: vgivepoints
+  adminvotehelp:
+    description: Open adminvote help
+    aliases: avhelp
+  adminvote?:
+    description: Open adminvote help
+    aliases: av?
+  adminvotereport:
+    description: Command Alias
+    aliases: avreport
+  adminvoteperms:
+    description: Command Alias
+    aliases: avperms
+  adminvotereload:
+    description: Command Alias
+    aliases: avreload
+  adminvotetestreward:
+    description: Command Alias
+    aliases: avtestreward
+  adminvoteversion:
+    description: Command Alias
+    aliases: avversion
+  adminvotesites:
+    description: Command Alias
+    aliases: avsites
+  adminvoterewards:
+    description: Command Alias
+    aliases: avrewards
+  adminvoteuuid:
+    description: Command Alias
+    aliases: avuuid
+  adminvotevotesite:
+    description: Command Alias
+    aliases: avvotesite
+  adminvoteconfig:
+    description: Command Alias
+    aliases: avconfig
+  adminvoteupdatecheck:
+    description: Command Alias
+    aliases: avupdatecheck
+  adminvotevote:
+    description: Command Alias
+    aliases:
+    - avvote
+    - fakevote
+  adminvotegui:
+    description: Command Alias
+    aliases: avgui
+  adminvotegivereward:
+    description: Command Alias
+    aliases: avgivereward
+  adminvoteconvertfromdata:
+    description: Command Alias
+    aliases: avconvertfromdata
+  adminvoteonverttodata:
+    description: Command Alias
+    aliases: avconverttodata
+  adminvotecleartotal:
+    description: Command Alias
+  adminvotebackgroundupdate:
+    description: Command Alias
+    aliases: avbackgroundupdate
+  adminvoteclearcache:
+    description: Command Alias
+    aliases: avclearcache
+  adminvoteservicesites:
+    description: Command Alias
+    aliases: avservicesites
+  adminvotevoteparty:
+    description: Command Alias
+    aliases: avvoteparty
+  adminvotechoices:
+    description: Command Alias
+    aliases: avchoices
+  adminvotereloadall:
+    description: Command Alias
+    aliases: avreloadall
+  adminvotepermsplayer:
+    description: Command Alias
+    aliases: avpermsplayer
+  adminvoteresyncmilestonesalreadygiven:
+    description: Command Alias
+    aliases: avresyncmilestonesalreadygiven
+  votesetprimaryaccount:
+    description: Command Alias
+  adminvoteclearofflinevotes:
+    description: Command Alias
+    aliases: avclearofflinevotes
+  adminvotegiveall:
+    description: Command Alias
+    aliases: avgiveall
+  adminvotegiveallonline:
+    description: Command Alias
+    aliases: avgiveallonline
+  adminvoteforcetimechanged:
+    description: Command Alias
+    aliases: avforcetimechanged
+  adminvoteplayername:
+    description: Command Alias
+    aliases: avplayername
+  adminvoteresyncmilestones:
+    description: Command Alias
+    aliases: avresyncmilestones
+  adminvoteclearofflinerewards:
+    description: Command Alias
+    aliases: avclearofflinerewards
+  adminvoteuserremove:
+    description: Command Alias
+    aliases: avuserremove
+  adminvotepurge:
+    description: Command Alias
+    aliases: avpurge
+  adminvotejavascript:
+    description: Command Alias
+    aliases: avjavascript
+  adminvotestatus:
+    description: Command Alias
+    aliases: avstatus
+  adminvotetest:
+    description: Command Alias
+    aliases: avtest
+  adminvoteplaceholders:
+    description: Command Alias
+    aliases: avplaceholders
+  adminvotedownloadjenkins:
+    description: Command Alias
+    aliases: avdownloadjenkins
+  adminvotesetrequestmethod:
+    description: Command Alias
+    aliases: avsetrequestmethod
+  adminvoteuser:
+    description: Command Alias
+    aliases: avuser
+  adminvotecurrentplugintime:
+    description: Command Alias
+    aliases: avcurrentplugintime
+  adminvoteresetpoints:
+    description: Command Alias
+    aliases: avresetpoints
+  adminvoteruncmd:
+    description: Command Alias
+    aliases: avruncmd
+  adminvoteuseruuidremove:
+    description: Command Alias
+    aliases: avuseruuidremove
+  adminvoteedit:
+    description: Command Alias
+    aliases: avedit
+  adminvoteresetmilestonecount:
+    description: Command Alias
+    aliases: avresetmilestonecount
+permissions:
+  VotingPlugin.Player:
+    description: Allows basic access player commands
+  VotingPlugin.Mod:
+    description: Allows mod commands
+  VotingPlugin.Admin:
+    description: Allows admincommands
+  VotingPlugin.Admin.Debug:
+    description: Permission to view debug info ingame
+  VotingPlugin.TopVoter.Ignore:
+    description: Allows you to be exempt from top voter
+  VotingPlugin.NoRemind:
+    description: Ignore vote reminding
+    default: false
+  VotingPlugin.BypassWaitUntilVoteDelay:
+    description: Bypass WaitUntilVoteDelay
+    default: false
+  VotingPlugin.Sign.Create:
+    description: Permission to create sign
+  VotingPlugin.Admin.GenerateServiceSite:
+    description: Permission for generating votesite message
+  VotingPlugin.Login.RemindVotes:
+    description: Permission to allow timed reminders
+  VotingPlugin.Login.RemindVotes.All:
+    description: Remind if player can vote on all votesites, rather than any
+    default: false
@@ -1,2 +1,4 @@
 time: '${timestamp}'
-profile: ${build.profile.id}
+profile: '${build.profile.id}'
+version: '${project.version}'
+buildnumber: '${build.number}'
@@ -4,14 +4,15 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>votingplugin</artifactId>
-	<version>6.5</version>
+	<version>6.18.1</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
 		<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>
@@ -59,16 +60,6 @@
 			</plugins>
 		</pluginManagement>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.3.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>
@@ -91,7 +82,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.4.3</version>
+				<version>3.6.0</version>
 				<configuration>
 					<shadedArtifactAttached>false</shadedArtifactAttached>
 					<minimizeJar>true</minimizeJar>
@@ -104,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>
@@ -114,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>
@@ -142,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>
@@ -163,31 +172,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.1.0</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>
@@ -195,7 +179,6 @@
 			<id>spigot-repo</id>
 			<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
 		</repository>
-
 		<repository>
 			<id>maven-central</id>
 			<url>https://oss.sonatype.org/content/groups/public</url>
@@ -210,152 +193,156 @@
 		</repository>
 		<repository>
 			<id>bencodez repo</id>
-			<url>http://51.161.110.19:8081/repository/maven-releases/</url>
+			<url>https://nexus.bencodez.com/repository/maven-public/</url>
+		</repository>
+		<repository>
+			<id>papermc</id>
+			<url>https://repo.papermc.io/repository/maven-public/</url>
+		</repository>
+		<repository>
+			<id>placeholderapi</id>
+			<url>
+				https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
 		</repository>
 	</repositories>
 	<dependencies>
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.17.1-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.2</version>
+			<version>1.18.36</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.md-5</groupId>
 			<artifactId>bungeecord-api</artifactId>
-			<version>1.17-R0.1-SNAPSHOT</version>
+			<version>1.20-R0.3-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.vexsoftware</groupId>
 			<artifactId>nuvotifier-universal</artifactId>
 			<version>2.7.2</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/Jars/nuvotifier.jar</systemPath>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>be.maximvdw</groupId>
-			<artifactId>MVdWPlaceholderAPI</artifactId>
-			<version>LATEST</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/Jars/MVdWPlaceholderAPI.jar</systemPath>
+			<artifactId>mvdwplaceholderapi</artifactId>
+			<version>3.1.1</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.velocitypowered</groupId>
 			<artifactId>velocity-api</artifactId>
-			<version>1.1.5</version>
+			<version>3.1.2-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.bstats</groupId>
 			<artifactId>bstats-velocity</artifactId>
-			<version>2.2.1</version>
+			<version>3.1.0</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>me.clip</groupId>
+			<artifactId>placeholderapi</artifactId>
+			<version>2.11.6</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.bencodez</groupId>
+			<artifactId>advancedcore</artifactId>
+			<version>3.7.13</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
-			<id>prod</id>
+			<id>default</id>
 			<properties>
-				<build.profile.id>prod</build.profile.id>
+				<build.profile.id>default</build.profile.id>
 			</properties>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
-			<repositories>
-				<repository>
-					<id>jitpack.io</id>
-					<url>https://jitpack.io</url>
-				</repository>
-			</repositories>
-			<dependencies>
-				<dependency>
-					<groupId>com.github.bencodez</groupId>
-					<artifactId>advancedcore</artifactId>
-					<version>master-SNAPSHOT</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>prod2</id>
+			<id>deploy-snapshot</id>
 			<properties>
-				<build.profile.id>prod</build.profile.id>
+				<build.profile.id>dev-snapshot</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>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<repositories>
-				<repository>
-					<id>jitpack.io</id>
-					<url>https://jitpack.io</url>
-				</repository>
-			</repositories>
-			<dependencies>
-				<dependency>
-					<groupId>com.github.bencodez</groupId>
-					<artifactId>advancedcore</artifactId>
-					<version>master-SNAPSHOT</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>dev</id>
-			<properties>
-				<build.profile.id>dev</build.profile.id>
-			</properties>
-			<dependencies>
-				<dependency>
-					<groupId>com.bencodez</groupId>
-					<artifactId>advancedcore</artifactId>
-					<version>LATEST</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>deploy</id>
-			<properties>
-				<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>
-					<url>http://51.161.110.19:8081/repository/maven-snapshots/</url>
+					<url>https://nexus.bencodez.com/repository/maven-snapshots/</url>
 				</snapshotRepository>
 				<repository>
 					<id>nexus</id>
-					<url>http://51.161.110.19:8081/repository/maven-releases</url>
+					<url>https://nexus.bencodez.com/repository/maven-releases/</url>
 				</repository>
 			</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>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>2.10.4</version>
+						<version>3.11.2</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>
@@ -364,7 +351,8 @@
 								</goals>
 								<phase>deploy</phase>
 								<configuration>
-									<sourcepath>${project.basedir}/target/delombok</sourcepath>
+									<sourcepath>
+										${project.basedir}/target/delombok</sourcepath>
 								</configuration>
 							</execution>
 						</executions>
@@ -372,7 +360,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>3.0.0-M1</version>
+						<version>3.1.3</version>
 						<configuration>
 							<skip>true</skip>
 						</configuration>
@@ -380,7 +368,7 @@
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.5.1</version>
+						<version>1.7.0</version>
 						<executions>
 							<execution>
 								<id>default-deploy</id>
@@ -392,33 +380,76 @@
 						</executions>
 						<configuration>
 							<serverId>nexus</serverId>
-							<nexusUrl>http://51.161.110.19:8081/nexus/</nexusUrl>
+							<nexusUrl>https://nexus.bencodez.com/nexus/</nexusUrl>
 							<skipStaging>true</skipStaging>
 						</configuration>
 					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>javadoc</id>
+			<properties>
+				<build.profile.id>javadoc</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>
+			<build>
+				<plugins>
 					<plugin>
-						<groupId>com.github.github</groupId>
-						<artifactId>site-maven-plugin</artifactId>
-						<version>0.12</version>
+						<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.11.2</version>
 						<executions>
 							<execution>
-								<id>javadoc</id>
+								<id>attach-javadocs</id>
 								<goals>
-									<goal>site</goal>
+									<goal>jar</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>
+									<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>
@@ -426,5 +457,152 @@
 				</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>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>deploy</id>
+			<properties>
+				<build.profile.id>deploy</build.profile.id>
+			</properties>
+			<distributionManagement>
+				<snapshotRepository>
+					<id>nexus</id>
+					<url>https://nexus.bencodez.com/repository/maven-snapshots/</url>
+				</snapshotRepository>
+				<repository>
+					<id>nexus</id>
+					<url>https://nexus.bencodez.com/repository/maven-releases/</url>
+				</repository>
+			</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.11.2</version>
+						<executions>
+							<execution>
+								<id>attach-javadocs</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+								<phase>deploy</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.3</version>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<version>1.7.0</version>
+						<executions>
+							<execution>
+								<id>default-deploy</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>deploy</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<serverId>nexus</serverId>
+							<nexusUrl>https://nexus.bencodez.com/nexus/</nexusUrl>
+							<skipStaging>true</skipStaging>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 </project>
@@ -1,31 +0,0 @@
-package com.Ben12345rocks.VotingPlugin.Objects;
-
-import org.bukkit.entity.Player;
-
-import com.bencodez.votingplugin.user.UserManager;
-import com.bencodez.votingplugin.user.VotingPluginUser;
-
-@Deprecated
-public class User {
-	private VotingPluginUser user;
-
-	public User(Player p) {
-		user = UserManager.getInstance().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);
-	}
-}
@@ -1,24 +1,47 @@
 package com.bencodez.votingplugin;

 import java.io.File;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;

+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Listener;
+
+import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.misc.encryption.EncryptionHandler;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.advancedcore.api.time.TimeType;
+import com.bencodez.advancedcore.api.user.UserStorage;
+import com.bencodez.advancedcore.api.user.usercache.value.DataValue;
+import com.bencodez.advancedcore.api.user.usercache.value.DataValueBoolean;
+import com.bencodez.advancedcore.api.user.userstorage.mysql.api.config.MysqlConfigSpigot;
+import com.bencodez.advancedcore.bungeeapi.GlobalMessage.GlobalMessageHandler;
+import com.bencodez.advancedcore.bungeeapi.GlobalMessage.GlobalMessageListener;
+import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalDataHandler;
+import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalMySQL;
 import com.bencodez.advancedcore.bungeeapi.pluginmessage.PluginMessageHandler;
+import com.bencodez.advancedcore.bungeeapi.redis.RedisHandler;
+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;
 import com.bencodez.votingplugin.objects.VoteSite;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;

 import lombok.Getter;

-public class BungeeHandler {
+public class BungeeHandler implements Listener {
 	@Getter
 	private ClientHandler clientHandler;

@@ -29,16 +52,126 @@ public class BungeeHandler {

 	private VotingPluginMain plugin;

+	@Getter
+	private int bungeeVotePartyCurrent = -2;
+
+	@Getter
+	private int bungeeVotePartyRequired = -2;
+
 	@Getter
 	private SocketHandler socketHandler;

+	private GlobalDataHandler globalDataHandler;
+
+	@Getter
+	private ScheduledExecutorService timer;
+
+	@Getter
+	private RedisHandler redisHandler;
+
+	@Getter
+	private GlobalMessageHandler globalMessageHandler;
+
+	private Thread redisThread;
+
 	public BungeeHandler(VotingPluginMain plugin) {
 		this.plugin = plugin;
 	}

+	public void checkGlobalData() {
+		HashMap<String, DataValue> data = globalDataHandler.getExact(plugin.getBungeeSettings().getServer());
+		// plugin.debug(data.toString());
+
+		if (data.containsKey("ForceUpdate")) {
+			boolean b = checkGlobalDataTimeValue(data.get("ForceUpdate"));
+			if (b) {
+				if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
+					plugin.getMysql().clearCacheBasic();
+				}
+				plugin.getUserManager().getDataManager().clearCache();
+				plugin.setUpdate(true);
+				plugin.update();
+				globalDataHandler.setBoolean(plugin.getBungeeSettings().getServer(), "ForceUpdate", false);
+			}
+		}
+
+		boolean forceUpdate = false;
+
+		if (checkGlobalDataTime(TimeType.MONTH, data)) {
+			forceUpdate = true;
+		}
+		if (checkGlobalDataTime(TimeType.WEEK, data)) {
+			forceUpdate = true;
+		}
+		if (checkGlobalDataTime(TimeType.DAY, data)) {
+			forceUpdate = true;
+		}
+
+		if (forceUpdate) {
+			HashMap<String, DataValue> dataToSet = new HashMap<>();
+			dataToSet.put("FinishedProcessing", new DataValueBoolean(true));
+			dataToSet.put("Processing", new DataValueBoolean(false));
+			globalDataHandler.setData(plugin.getBungeeSettings().getServer(), dataToSet);
+		}
+	}
+
+	/*
+	 * @EventHandler public void onDateChange(DateChangedEvent event) { if
+	 * (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+	 * plugin.getPluginMessaging().sendPluginMessage("timeupdate",
+	 * plugin.getServerDataFile().getPrevMonth() + "//" +
+	 * plugin.getServerDataFile().getPrevDay() + "//" +
+	 * plugin.getServerDataFile().getPrevWeekDay()); } }
+	 */
+
+	public boolean checkGlobalDataTime(TimeType type, HashMap<String, DataValue> data) {
+		boolean isProcessing = false;
+		if (data.containsKey(type.toString())) {
+
+			DataValue value = data.get(type.toString());
+			boolean b = checkGlobalDataTimeValue(value);
+			if (b) {
+				long lastUpdated = Long.valueOf(data.get("LastUpdated").getString()).longValue();
+				plugin.debug("LastUpdated: " + lastUpdated);
+				if (LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli() - lastUpdated > 1000 * 60 * 60
+						* 2) {
+					plugin.getLogger().warning("Ignoring bungee time change since it was more than 2 hours ago");
+					globalDataHandler.setBoolean(plugin.getBungeeSettings().getServer(), type.toString(), false);
+					return false;
+				}
+
+				globalDataHandler.setBoolean(plugin.getBungeeSettings().getServer(), "Processing", true);
+				isProcessing = true;
+
+				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;
+	}
+
+	public boolean checkGlobalDataTimeValue(DataValue data) {
+		if (data.isBoolean()) {
+			return data.getBoolean();
+		}
+		return Boolean.valueOf(data.getString());
+	}
+
 	public void close() {
-		socketHandler.closeConnection();
-		clientHandler.stopConnection();
+		if (socketHandler != null) {
+			socketHandler.closeConnection();
+		}
+		if (clientHandler != null) {
+			clientHandler.stopConnection();
+		}
+		plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
+		plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
+		if (globalDataHandler != null) {
+			globalDataHandler.getGlobalMysql().close();
+		}
 	}

 	public void load() {
@@ -48,148 +181,449 @@ public class BungeeHandler {

 		plugin.getLogger().info("Using BungeeMethod: " + method.toString());

-		if (method.equals(BungeeMethod.MYSQL)) {
-			plugin.registerBungeeChannels("vp:vp");
-		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-			plugin.registerBungeeChannels("vp:vp");
+		loadGlobalMysql();

-			plugin.getPluginMessaging().add(new PluginMessageHandler("Vote") {
-				@Override
-				public void onRecieve(String subChannel, ArrayList<String> args) {
-					if (args.size() > 8) {
-						int bungeeVersion = Integer.parseInt(args.get(8));
-						if (bungeeVersion != BungeeVersion.getPluginMessageVersion()) {
-							plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
-							return;
-						}
+		globalMessageHandler = new GlobalMessageHandler() {

-						String player = args.get(0);
-						String uuid = args.get(1);
-						String service = args.get(2);
-						long time = Long.parseLong(args.get(3));
-						plugin.debug("pluginmessaging vote received from " + player + "/" + uuid + " on " + service);
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
-								player);
+			@Override
+			public void sendMessage(String subChannel, String... messageData) {
+				if (method.equals(BungeeMethod.MYSQL)) {
+					plugin.getPluginMessaging().sendPluginMessage(subChannel, messageData);
+				} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+					plugin.getPluginMessaging().sendPluginMessage(subChannel, messageData);
+				} else if (method.equals(BungeeMethod.SOCKETS)) {
+					ArrayList<String> list = new ArrayList<>();
+					list.add(subChannel);
+					list.addAll(ArrayUtils.convert(messageData));
+					sendData(ArrayUtils.convert(list));
+				} else if (method.equals(BungeeMethod.REDIS)) {
+					ArrayList<String> list = new ArrayList<>();
+					list.add(subChannel);
+					list.addAll(ArrayUtils.convert(messageData));
+					redisHandler.sendMessage(plugin.getBungeeSettings().getRedisPrefix() + "VotingPlugin",
+							ArrayUtils.convert(list));
+				}
+			}
+		};

-						boolean wasOnline = Boolean.valueOf(args.get(4));
+		globalMessageHandler.addListener(new GlobalMessageListener("Vote") {

-						BungeeMessageData text = new BungeeMessageData(args.get(6));
-
-						boolean setTotals = Boolean.valueOf(args.get(7));
-
-						user.clearCache();
-
-						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline);
-						if (plugin.getBungeeSettings().isPerServerPoints()) {
-							user.addPoints(plugin.getConfigFile().getPointsOnVote());
-						}
-
-						if (!plugin.getBungeeSettings().isBungeeBroadcast()) {
-							if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-								VoteSite site = plugin.getVoteSite(service);
-								if (site != null) {
-									site.broadcastVote(user, false);
-								} else {
-									plugin.getLogger().warning("No votesite for " + service);
-								}
-							}
-						}
-
-						if (Boolean.valueOf(args.get(5))) {
-							plugin.getServerData().addServiceSite(service);
-						}
-					} else {
-						plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				if (args.size() > 8) {
+					int bungeeVersion = Integer.parseInt(args.get(8));
+					if (bungeeVersion != BungeeVersion.getPluginMessageVersion()) {
+						plugin.getLogger().warning("Incompatible version with bungee, please update all servers"
+								+ bungeeVersion + ":" + BungeeVersion.getPluginMessageVersion());
+						return;
 					}

-				}
-			});
-
-			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteOnline") {
-				@Override
-				public void onRecieve(String subChannel, ArrayList<String> args) {
-					if (args.size() > 8) {
-						int bungeeVersion = Integer.parseInt(args.get(8));
-						if (bungeeVersion != BungeeVersion.getPluginMessageVersion()) {
-							plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
-							return;
-						}
-						String player = args.get(0);
-						String uuid = args.get(1);
-						String service = args.get(2);
-						long time = Long.parseLong(args.get(3));
-						BungeeMessageData text = new BungeeMessageData(args.get(6));
-						plugin.debug(
-								"pluginmessaging voteonline received from " + player + "/" + uuid + " on " + service);
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
-								player);
-						user.clearCache();
-
-						if (plugin.getBungeeSettings().isPerServerPoints()) {
-							user.addPoints(plugin.getConfigFile().getPointsOnVote());
-						}
-
-						boolean setTotals = Boolean.valueOf(args.get(7));
-
-						boolean wasOnline = Boolean.valueOf(args.get(4));
-
-						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline);
-
-						if (!plugin.getBungeeSettings().isBungeeBroadcast()) {
-							if (Boolean.valueOf(args.get(4)) || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-								VoteSite site = plugin.getVoteSite(service);
-								if (site != null) {
-									site.broadcastVote(user, false);
-								} else {
-									plugin.getLogger().warning("No votesite for " + service);
-								}
-							}
-						}
-
-						if (Boolean.valueOf(args.get(5))) {
-							plugin.getServerData().addServiceSite(service);
-						}
-					} else {
-						plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
-					}
-				}
-			});
-
-			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteUpdate") {
-				@Override
-				public void onRecieve(String subChannel, ArrayList<String> args) {
 					String player = args.get(0);
-					plugin.debug("pluginmessaging voteupdate received for " + player);
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(player));
-					user.clearCache();
+					String uuid = args.get(1);
+					String service = args.get(2);
+					long time = Long.parseLong(args.get(3));
+					plugin.debug("pluginmessaging vote received from " + player + "/" + uuid + " on " + service);
+					VotingPluginUser user = plugin.getVotingPluginUserManager()
+							.getVotingPluginUser(UUID.fromString(uuid), player);

-					user.offVote();
+					boolean wasOnline = Boolean.valueOf(args.get(4));

-					plugin.setUpdate(true);
+					BungeeMessageData text = new BungeeMessageData(args.get(6));
+
+					bungeeVotePartyCurrent = text.getVotePartyCurrent();
+					bungeeVotePartyRequired = text.getVotePartyRequired();
+					plugin.getPlaceholders().onBungeeVotePartyUpdate();
+					plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
+					plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
+
+					boolean setTotals = Boolean.valueOf(args.get(7));
+
+					user.cache();
+
+					boolean broadcast = true;
+					boolean bungeeBroadcast = false;
+
+					if (args.size() > 9) {
+						bungeeBroadcast = Boolean.valueOf(args.get(9));
+					}
+
+					int num = 1;
+					if (args.size() > 10) {
+						num = Integer.valueOf(args.get(10));
+					}
+					int numberOfVotes = 1;
+					if (args.size() > 11) {
+						numberOfVotes = Integer.valueOf(args.get(11));
+					}
+
+					if (!bungeeBroadcast) {
+						if (!plugin.getBungeeSettings().isBungeeBroadcast()
+								&& !plugin.getBungeeSettings().isDisableBroadcast()) {
+							if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
+								if (plugin.getConfigFile().isFormatOnlyOneOfflineBroadcast() && !wasOnline) {
+									if (num == 1) {
+										user.offlineBroadcast(user, plugin.getBungeeSettings().isUseBungeecoord(),
+												numberOfVotes);
+									}
+								} else {
+									VoteSite site = plugin.getVoteSite(service, true);
+									if (site != null) {
+										site.broadcastVote(user, false);
+										broadcast = false;
+									} else {
+										plugin.getLogger().warning("No votesite for " + service);
+									}
+								}
+
+							}
+						}
+					} else {
+						broadcast = false;
+					}
+
+					user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline, broadcast, num);
+					if (plugin.getBungeeSettings().isPerServerPoints()) {
+						user.addPoints(plugin.getConfigFile().getPointsOnVote());
+					}
+
+					plugin.getSpecialRewards().bungeeAllSitesCheck(user, numberOfVotes, num);
+
+					if (Boolean.valueOf(args.get(5))) {
+						plugin.getServerData().addServiceSite(service);
+					}
+				} else {
+					plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
 				}
-			});
+			}
+		});

-			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteBroadcast") {
-				@Override
-				public void onRecieve(String subChannel, ArrayList<String> args) {
+		globalMessageHandler.addListener(new GlobalMessageListener("VoteOnline") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				if (args.size() > 8) {
+					int bungeeVersion = Integer.parseInt(args.get(8));
+					if (bungeeVersion != BungeeVersion.getPluginMessageVersion()) {
+						plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
+						return;
+					}
+					String player = args.get(0);
+					String uuid = args.get(1);
+					String service = args.get(2);
+					long time = Long.parseLong(args.get(3));
+					BungeeMessageData text = new BungeeMessageData(args.get(6));
+
+					bungeeVotePartyCurrent = text.getVotePartyCurrent();
+					bungeeVotePartyRequired = text.getVotePartyRequired();
+					plugin.getPlaceholders().onBungeeVotePartyUpdate();
+					plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
+					plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
+
+					plugin.debug("pluginmessaging voteonline received from " + player + "/" + uuid + " on " + service);
+					VotingPluginUser user = plugin.getVotingPluginUserManager()
+							.getVotingPluginUser(UUID.fromString(uuid), player);
+					user.cache();
+
+					if (plugin.getBungeeSettings().isPerServerPoints()) {
+						user.addPoints(plugin.getConfigFile().getPointsOnVote());
+					}
+
+					boolean setTotals = Boolean.valueOf(args.get(7));
+
+					boolean wasOnline = Boolean.valueOf(args.get(4));
+
+					boolean broadcast = true;
+					boolean bungeeBroadcast = false;
+
+					if (args.size() > 9) {
+						bungeeBroadcast = Boolean.valueOf(args.get(9));
+					}
+
+					int num = 1;
+					if (args.size() > 10) {
+						num = Integer.valueOf(args.get(10));
+					}
+
+					int numberOfVotes = 1;
+					if (args.size() > 11) {
+						numberOfVotes = Integer.valueOf(args.get(11));
+					}
+
+					if (!bungeeBroadcast) {
+						if (!plugin.getBungeeSettings().isBungeeBroadcast()
+								&& !plugin.getBungeeSettings().isDisableBroadcast()) {
+							if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
+								if (plugin.getConfigFile().isFormatOnlyOneOfflineBroadcast() && !wasOnline) {
+									if (num == 1) {
+										user.offlineBroadcast(user, plugin.getBungeeSettings().isUseBungeecoord(),
+												numberOfVotes);
+									}
+								} else {
+									VoteSite site = plugin.getVoteSite(service, true);
+									if (site != null) {
+										site.broadcastVote(user, false);
+										broadcast = false;
+									} else {
+										plugin.getLogger().warning("No votesite for " + service);
+									}
+								}
+
+							}
+						}
+					} else {
+						broadcast = false;
+					}
+
+					user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline, broadcast, num);
+					if (plugin.getBungeeSettings().isPerServerPoints()) {
+						user.addPoints(plugin.getConfigFile().getPointsOnVote());
+					}
+
+					plugin.getSpecialRewards().bungeeAllSitesCheck(user, numberOfVotes, num);
+
+					if (Boolean.valueOf(args.get(5))) {
+						plugin.getServerData().addServiceSite(service);
+					}
+				} else {
+					plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
+				}
+
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener("VoteUpdate") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				String player = args.get(0);
+				plugin.debug("pluginmessaging voteupdate received for " + player);
+				VotingPluginUser user = plugin.getVotingPluginUserManager()
+						.getVotingPluginUser(UUID.fromString(player));
+				user.cache();
+
+				user.offVote();
+
+				if (args.size() > 3 && plugin.getBungeeSettings().isPerServerMilestones()) {
+					BungeeMessageData text = new BungeeMessageData(args.get(3));
+					plugin.getSpecialRewards().checkMilestone(user, text, true);
+				}
+
+				if (args.size() > 2) {
+					bungeeVotePartyCurrent = Integer.parseInt(args.get(1));
+					bungeeVotePartyRequired = Integer.parseInt(args.get(2));
+					plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
+					plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
+				}
+
+				plugin.setUpdate(true);
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener("BungeeTimeChange") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				checkGlobalData();
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener("VoteBroadcast") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				if (args.size() > 2) {
 					String uuid = args.get(0);
-					String service = args.get(1);
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
-					VoteSite site = plugin.getVoteSite(service);
+					String service = args.get(2);
+					VotingPluginUser user = plugin.getVotingPluginUserManager()
+							.getVotingPluginUser(UUID.fromString(uuid), args.get(1));
+					VoteSite site = plugin.getVoteSite(service, true);
 					if (site != null) {
 						site.broadcastVote(user, false);
 					} else {
 						plugin.getLogger().warning("No votesite for " + service);
 					}
 				}
+			}
+		});
+		globalMessageHandler.addListener(new GlobalMessageListener("VoteBroadcastOffline") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				if (args.size() > 2) {
+					String uuid = args.get(0);
+					String votes = args.get(2);
+					VotingPluginUser user = plugin.getVotingPluginUserManager()
+							.getVotingPluginUser(UUID.fromString(uuid), args.get(1));
+					user.offlineBroadcast(user, false, Integer.parseInt(votes));
+				}
+			}
+		});
+		globalMessageHandler.addListener(new GlobalMessageListener("Status") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				String server = args.get(0);
+				sendMessage(globalMessageHandler, "statusokay", server);
+			}
+		});
+		globalMessageHandler.addListener(new GlobalMessageListener("ServerName") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				String server = args.get(0);
+				if (!plugin.getOptions().getServer().equals(server)) {
+					plugin.getLogger().warning("Server name doesn't match in BungeeSettings.yml, should be " + server);
+				}
+			}
+		});
+		globalMessageHandler.addListener(new GlobalMessageListener("VotePartyBungee") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				for (final String cmd : plugin.getBungeeSettings().getBungeeVotePartyGlobalCommands()) {
+					plugin.getBukkitScheduler().runTask(plugin, new Runnable() {
+
+						@Override
+						public void run() {
+							Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), cmd);
+						}
+
+					});
+				}
+				for (Player p : Bukkit.getOnlinePlayers()) {
+					new RewardBuilder(plugin.getBungeeSettings().getData(), "BungeeVotePartyRewards").send(p);
+				}
+			}
+		});
+		globalMessageHandler.addListener(new GlobalMessageListener("VotePartyBroadcast") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				String broadcast = args.get(0);
+				MiscUtils.getInstance().broadcast(broadcast);
+			}
+		});
+
+		if (method.equals(BungeeMethod.MYSQL)) {
+			plugin.registerBungeeChannels(plugin.getBungeeSettings().getPluginMessagingChannel());
+		} else if (method.equals(BungeeMethod.REDIS)) {
+			redisHandler = new RedisHandler(plugin.getBungeeSettings().getRedisHost(),
+					plugin.getBungeeSettings().getRedisPort(), plugin.getBungeeSettings().getRedisUsername(),
+					plugin.getBungeeSettings().getRedisPassword()) {
+
+				@Override
+				public void debug(String message) {
+					if (plugin.getBungeeSettings().isBungeeDebug()) {
+						plugin.debug(message);
+					}
+				}
+
+				@Override
+				protected void onMessage(String channel, String[] message) {
+					plugin.getLogger().info(channel + ArrayUtils.makeStringList(ArrayUtils.convert(message)));
+					if (message.length > 0) {
+						ArrayList<String> list = new ArrayList<>();
+						for (int i = 1; i < message.length; i++) {
+							list.add(message[i]);
+						}
+						globalMessageHandler.onMessage(message[0], list);
+					}
+				}
+			};
+			redisThread = new Thread(new Runnable() {
+
+				@Override
+				public void run() {
+					if (plugin.isEnabled()) {
+						redisHandler.loadListener(
+								new RedisListener(redisHandler, plugin.getBungeeSettings().getRedisPrefix()
+										+ "VotingPlugin_" + plugin.getBungeeSettings().getServer()));
+					}
+				}
+			});
+			redisThread.start();
+
+		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			plugin.registerBungeeChannels(plugin.getBungeeSettings().getPluginMessagingChannel());
+
+			if (plugin.getBungeeSettings().isPluginMessageEncryption()) {
+				encryptionHandler = new EncryptionHandler(new File(plugin.getDataFolder(), "secretkey.key"));
+				plugin.getPluginMessaging().setEncryptionHandler(encryptionHandler);
+			}
+
+			bungeeVotePartyCurrent = plugin.getServerData().getBungeeVotePartyCurrent();
+			bungeeVotePartyRequired = plugin.getServerData().getBungeeVotePartyRequired();
+
+			plugin.getPluginMessaging().setDebug(plugin.getBungeeSettings().isBungeeDebug());
+
+			plugin.getPluginMessaging().add(new PluginMessageHandler("Vote") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					globalMessageHandler.onMessage("Vote", args);
+				}
+			});
+
+			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteOnline") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					globalMessageHandler.onMessage("VoteOnline", args);
+				}
+			});
+
+			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteUpdate") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					globalMessageHandler.onMessage("VoteUpdate", args);
+				}
+			});
+
+			plugin.getPluginMessaging().add(new PluginMessageHandler("BungeeTimeChange") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					globalMessageHandler.onMessage("BungeeTimeChange", args);
+
+				}
+			});
+
+			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteBroadcast") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					globalMessageHandler.onMessage("VoteBroadcast", args);
+				}
+			});
+
+			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteBroadcastOffline") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					globalMessageHandler.onMessage("VoteBroadcastOffline", args);
+				}
 			});

 			plugin.getPluginMessaging().add(new PluginMessageHandler("Status") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					String server = args.get(0);
-					plugin.getPluginMessaging().sendPluginMessage("statusokay", server);
+					globalMessageHandler.onMessage("Status", args);
+				}
+			});

+			plugin.getPluginMessaging().add(new PluginMessageHandler("ServerName") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					globalMessageHandler.onMessage("ServerName", args);
+				}
+			});
+
+			plugin.getPluginMessaging().add(new PluginMessageHandler("VotePartyBungee") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					globalMessageHandler.onMessage("VotePartyBungee", args);
+				}
+			});
+
+			plugin.getPluginMessaging().add(new PluginMessageHandler("VotePartyBroadcast") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					globalMessageHandler.onMessage("VotePartyBroadcast", args);
 				}
 			});

@@ -202,7 +636,13 @@ public class BungeeHandler {

 			socketHandler = new SocketHandler(plugin.getVersion(), plugin.getBungeeSettings().getSpigotServerHost(),
 					plugin.getBungeeSettings().getSpigotServerPort(), encryptionHandler,
-					plugin.getBungeeSettings().isBungeeDebug());
+					plugin.getBungeeSettings().isBungeeDebug()) {
+
+				@Override
+				public void log(String str) {
+					plugin.getLogger().info(str);
+				}
+			};

 			socketHandler.add(new SocketReceiver("bungeevote") {

@@ -213,12 +653,12 @@ public class BungeeHandler {
 						String uuid = data[1];
 						VotingPluginUser user = null;
 						if (!uuid.isEmpty()) {
-							user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+							user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid));
 						} else {
-							user = UserManager.getInstance().getVotingPluginUser(data[2]);
+							user = plugin.getVotingPluginUserManager().getVotingPluginUser(data[2]);
 						}

-						user.clearCache();
+						user.cache();

 						if (plugin.getBungeeSettings().isPerServerPoints()) {
 							user.addPoints(plugin.getConfigFile().getPointsOnVote());
@@ -229,6 +669,14 @@ public class BungeeHandler {
 				}
 			});

+			socketHandler.add(new SocketReceiver("BungeeTimeChange") {
+
+				@Override
+				public void onReceive(String[] data) {
+					checkGlobalData();
+				}
+			});
+
 			socketHandler.add(new SocketReceiver("bungeevoteonline") {

 				@Override
@@ -238,12 +686,12 @@ public class BungeeHandler {
 						String uuid = data[1];
 						VotingPluginUser user = null;
 						if (!uuid.isEmpty()) {
-							user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+							user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid));
 						} else {
-							user = UserManager.getInstance().getVotingPluginUser(data[2]);
+							user = plugin.getVotingPluginUserManager().getVotingPluginUser(data[2]);
 						}

-						user.clearCache();
+						user.cache();

 						if (plugin.getBungeeSettings().isPerServerPoints()) {
 							user.addPoints(plugin.getConfigFile().getPointsOnVote());
@@ -254,14 +702,44 @@ public class BungeeHandler {
 				}
 			});

+			socketHandler.add(new SocketReceiver("BroadcastOffline") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 2) {
+						String votes = data[0];
+						String p = data[1];
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
+						user.offlineBroadcast(user, false, Integer.parseInt(votes));
+					}
+				}
+			});
+
 			socketHandler.add(new SocketReceiver("BungeeBroadcast") {

 				@Override
 				public void onReceive(String[] data) {
 					if (data.length > 2) {
-						VoteSite site = plugin.getVoteSite(data[1]);
+						VoteSite site = plugin.getVoteSite(data[1], true);
 						String p = data[3];
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(p);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
+						if (site != null) {
+							site.broadcastVote(user, false);
+						} else {
+							plugin.getLogger().warning("No votesite for " + data[1]);
+						}
+					}
+				}
+			});
+
+			socketHandler.add(new SocketReceiver("Broadcast") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 2) {
+						VoteSite site = plugin.getVoteSite(data[1], true);
+						String p = data[2];
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
 						if (site != null) {
 							site.broadcastVote(user, false);
 						} else {
@@ -291,6 +769,25 @@ public class BungeeHandler {
 				}
 			});

+			socketHandler.add(new SocketReceiver("VotePartyBungee") {
+
+				@Override
+				public void onReceive(String[] data) {
+					for (Player p : Bukkit.getOnlinePlayers()) {
+						new RewardBuilder(plugin.getBungeeSettings().getData(), "BungeeVotePartyRewards").send(p);
+					}
+				}
+			});
+
+			socketHandler.add(new SocketReceiver("VotePartyBroadcast") {
+
+				@Override
+				public void onReceive(String[] data) {
+					String broadcast = data[0];
+					MiscUtils.getInstance().broadcast(broadcast);
+				}
+			});
+
 			if (plugin.getOptions().getServer().equalsIgnoreCase("pleaseset")) {
 				plugin.getLogger().warning("Server name for bungee voting is not set, please set it");
 			}
@@ -299,6 +796,109 @@ public class BungeeHandler {

 	}

+	public void loadGlobalMysql() {
+		if (plugin.getBungeeSettings().isGloblalDataEnabled()) {
+			if (timer != null) {
+				timer.shutdown();
+				try {
+					timer.awaitTermination(5, TimeUnit.SECONDS);
+				} catch (InterruptedException e) {
+					e.printStackTrace();
+				}
+				timer.shutdownNow();
+			}
+			timer = Executors.newScheduledThreadPool(1);
+			timer.scheduleWithFixedDelay(new Runnable() {
+
+				@Override
+				public void run() {
+					checkGlobalData();
+				}
+			}, 60, 10, TimeUnit.SECONDS);
+			timer.scheduleWithFixedDelay(new Runnable() {
+
+				@Override
+				public void run() {
+					globalDataHandler.setString(plugin.getBungeeSettings().getServer(), "LastOnline",
+							"" + LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli());
+				}
+			}, 1, 60, TimeUnit.MINUTES);
+			if (globalDataHandler != null) {
+				globalDataHandler.getGlobalMysql().close();
+			}
+			if (plugin.getBungeeSettings().isGloblalDataUseMainMySQL()
+					&& plugin.getStorageType().equals(UserStorage.MYSQL)) {
+				globalDataHandler = new GlobalDataHandler(
+						new GlobalMySQL("VotingPlugin_GlobalData", plugin.getMysql().getMysql()) {
+
+							@Override
+							public void debug(Exception e) {
+								plugin.debug(e);
+							}
+
+							@Override
+							public void debug(String text) {
+								plugin.debug(text);
+							}
+
+							@Override
+							public void info(String text) {
+								plugin.getLogger().info(text);
+							}
+
+							@Override
+							public void severe(String text) {
+								plugin.getLogger().severe(text);
+							}
+
+							@Override
+							public void warning(String text) {
+								plugin.getLogger().warning(text);
+							}
+						});
+			} else {
+				globalDataHandler = new GlobalDataHandler(
+						new GlobalMySQL("VotingPlugin_GlobalData", new MysqlConfigSpigot(
+								plugin.getBungeeSettings().getData().getConfigurationSection("GlobalData"))) {
+
+							@Override
+							public void debug(Exception e) {
+								plugin.debug(e);
+							}
+
+							@Override
+							public void debug(String text) {
+								plugin.debug(text);
+							}
+
+							@Override
+							public void info(String text) {
+								plugin.getLogger().info(text);
+							}
+
+							@Override
+							public void severe(String text) {
+								plugin.getLogger().severe(text);
+							}
+
+							@Override
+							public void warning(String text) {
+								plugin.getLogger().warning(text);
+							}
+						});
+			}
+			globalDataHandler.getGlobalMysql().alterColumnType("IgnoreTime", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("MONTH", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("WEEK", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("DAY", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("FinishedProcessing", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("Processing", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("LastUpdated", "MEDIUMTEXT");
+			globalDataHandler.getGlobalMysql().alterColumnType("ForceUpdate", "VARCHAR(5)");
+			plugin.getTimeChecker().setProcessingEnabled(false);
+		}
+	}
+
 	public void sendData(String... strings) {
 		clientHandler.sendMessage(strings);
 	}
@@ -2,7 +2,6 @@ package com.bencodez.votingplugin;

 import org.bukkit.entity.Player;

-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInject;
 import com.bencodez.advancedcore.api.rewards.injectedrequirement.RequirementInject;
 import com.bencodez.votingplugin.user.UserManager;
@@ -16,11 +15,11 @@ public class VotingPluginHooks {
 	}

 	public void addCustomRequirement(RequirementInject inject) {
-		RewardHandler.getInstance().addInjectedRequirements(inject);
+		getMainClass().getRewardHandler().addInjectedRequirements(inject);
 	}

 	public void addCustomReward(RewardInject inject) {
-		RewardHandler.getInstance().addInjectedReward(inject);
+		getMainClass().getRewardHandler().addInjectedReward(inject);
 	}

 	public void backgroundUpdate(Player player) {
@@ -34,7 +33,7 @@ public class VotingPluginHooks {
 	}

 	public UserManager getUserManager() {
-		return UserManager.getInstance();
+		return getMainClass().getVotingPluginUserManager();
 	}

 }
@@ -2,9 +2,7 @@ package com.bencodez.votingplugin;

 import java.util.concurrent.Callable;

-import com.bencodez.advancedcore.api.metrics.BStatsMetrics;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
-import com.bencodez.votingplugin.user.UserManager;
+import com.bencodez.simpleapi.metrics.BStatsMetrics;

 public class VotingPluginMetrics {

@@ -15,36 +13,33 @@ public class VotingPluginMetrics {

 			@Override
 			public String call() throws Exception {
-				if (RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+				if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 						plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath())) {
 					return "True";
-				} else {
-					return "False";
 				}
+				return "False";
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_everysite", new Callable<String>() {

 			@Override
 			public String call() throws Exception {
-				if (RewardHandler.getInstance().hasRewards(plugin.getConfigVoteSites().getData(),
+				if (plugin.getRewardHandler().hasRewards(plugin.getConfigVoteSites().getData(),
 						plugin.getConfigVoteSites().getEverySiteRewardPath())) {
 					return "True";
-				} else {
-					return "False";
 				}
+				return "False";
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_allsites", new Callable<String>() {

 			@Override
 			public String call() throws Exception {
-				if (RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+				if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 						plugin.getSpecialRewardsConfig().getAllSitesRewardPath())) {
 					return "True";
-				} else {
-					return "False";
 				}
+				return "False";
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_cumulative", new Callable<String>() {
@@ -53,25 +48,30 @@ public class VotingPluginMetrics {
 			public String call() throws Exception {
 				if (plugin.getSpecialRewardsConfig().getCumulativeVotes().size() == 0) {
 					return "False";
-				} else {
-					for (String cum : plugin.getSpecialRewardsConfig().getCumulativeVotes()) {
-						if (plugin.getSpecialRewardsConfig().getCumulativeRewardEnabled(Integer.parseInt(cum))) {
-							return "True";
-						}
-					}
-					return "False";
 				}
+				for (String cum : plugin.getSpecialRewardsConfig().getCumulativeVotes()) {
+					if (plugin.getSpecialRewardsConfig().getCumulativeRewardEnabled(Integer.parseInt(cum))) {
+						return "True";
+					}
+				}
+				return "False";
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_voteparty", new Callable<String>() {

 			@Override
 			public String call() throws Exception {
-				if (!plugin.getSpecialRewardsConfig().getVotePartyEnabled()) {
+				if (!plugin.getSpecialRewardsConfig().isVotePartyEnabled()) {
 					return "False";
-				} else {
-					return "True";
 				}
+				return "True";
+			}
+		}));
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("placeholder_cache_level", new Callable<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return plugin.getPlaceholders().getCacheLevel().toString();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_milestone", new Callable<String>() {
@@ -80,26 +80,24 @@ public class VotingPluginMetrics {
 			public String call() throws Exception {
 				if (plugin.getSpecialRewardsConfig().getMilestoneVotes().size() == 0) {
 					return "False";
-				} else {
-					for (String milestone : plugin.getSpecialRewardsConfig().getMilestoneVotes()) {
-						if (plugin.getSpecialRewardsConfig().getMilestoneRewardEnabled(Integer.parseInt(milestone))) {
-							return "True";
-						}
-					}
-					return "False";
 				}
+				for (String milestone : plugin.getSpecialRewardsConfig().getMilestoneVotes()) {
+					if (plugin.getSpecialRewardsConfig().getMilestoneRewardEnabled(Integer.parseInt(milestone))) {
+						return "True";
+					}
+				}
+				return "False";
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_anysitereward", new Callable<String>() {

 			@Override
 			public String call() throws Exception {
-				if (RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+				if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 						plugin.getSpecialRewardsConfig().getAnySiteRewardsPath())) {
 					return "True";
-				} else {
-					return "False";
 				}
+				return "False";
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_votestreakday", new Callable<String>() {
@@ -109,7 +107,7 @@ public class VotingPluginMetrics {
 				for (String s : plugin.getSpecialRewardsConfig().getVoteStreakVotes("Day")) {

 					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled("Day", s)
-							&& RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 									plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath("Day", s))) {
 						return "True";
 					}
@@ -126,7 +124,7 @@ public class VotingPluginMetrics {
 				for (String s : plugin.getSpecialRewardsConfig().getVoteStreakVotes("Week")) {

 					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled("Week", s)
-							&& RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 									plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath("Week", s))) {
 						return "True";
 					}
@@ -143,7 +141,7 @@ public class VotingPluginMetrics {
 				for (String s : plugin.getSpecialRewardsConfig().getVoteStreakVotes("Month")) {

 					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled("Month", s)
-							&& RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 									plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath("Month", s))) {
 						return "True";
 					}
@@ -156,14 +154,14 @@ public class VotingPluginMetrics {

 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getVoteSites().size();
+				return "" + plugin.getVoteSitesEnabled().size();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("numberofrewards", new Callable<String>() {

 			@Override
 			public String call() throws Exception {
-				return "" + RewardHandler.getInstance().getRewards().size();
+				return "" + plugin.getRewardHandler().getRewards().size();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("autocreatevotesites", new Callable<String>() {
@@ -178,16 +176,32 @@ public class VotingPluginMetrics {

 			@Override
 			public String call() throws Exception {
-				int total = UserManager.getInstance().getAllUUIDs().size();
-				if (total < 1000) {
-					return "<1000";
-				} else if (total > 10000) {
-					return ">10000";
-				} else {
-					return "1000-10000";
+				int total = plugin.getUserManager().getAllUUIDs().size();
+				if (total > 800000) {
+					return ">800000";
 				}
+				if (total > 700000) {
+					return "700000-800000";
+				}
+				if (total > 600000) {
+					return "600000-700000";
+				} else if (total > 500000) {
+					return "500000-600000";
+				} else if (total > 400000) {
+					return "400000-500000";
+				} else if (total > 300000) {
+					return "300000-400000";
+				} else if (total > 200000) {
+					return "200000-300000";
+				} else if (total > 100000) {
+					return "100000-200000";
+				} else if (total > 10000) {
+					return ">10000-100000";
+				}
+				return "<10000";
 			}
 		}));
+
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("data_storage", new Callable<String>() {

 			@Override
@@ -206,28 +220,28 @@ public class VotingPluginMetrics {

 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getConfigFile().getVoteRemindingEnabled();
+				return "" + plugin.getConfigFile().isVoteRemindingEnabled();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("LoadTopVoter_Monthly", new Callable<String>() {

 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getConfigFile().getLoadTopVoterMonthly();
+				return "" + plugin.getConfigFile().isLoadTopVoterMonthly();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("LoadTopVoter_Weekly", new Callable<String>() {

 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getConfigFile().getLoadTopVoterWeekly();
+				return "" + plugin.getConfigFile().isLoadTopVoterWeekly();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("LoadTopVoter_Daily", new Callable<String>() {

 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getConfigFile().getLoadTopVoterDaily();
+				return "" + plugin.getConfigFile().isLoadTopVoterDaily();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("bungeemethod", new Callable<String>() {
@@ -236,9 +250,8 @@ public class VotingPluginMetrics {
 			public String call() throws Exception {
 				if (plugin.getBungeeSettings().isUseBungeecoord()) {
 					return "" + plugin.getBungeeHandler().getMethod().toString();
-				} else {
-					return "Disabled";
 				}
+				return "Disabled";
 			}
 		}));
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
@@ -278,13 +291,38 @@ public class VotingPluginMetrics {
 					return "" + plugin.getBungeeSettings().isTriggerVotifierEvent();
 				}
 			}));
+
+			metrics.addCustomChart(new BStatsMetrics.SimplePie("globaldata_enabled", new Callable<String>() {
+
+				@Override
+				public String call() throws Exception {
+					return "" + plugin.getBungeeSettings().isGloblalDataEnabled();
+				}
+			}));
+			if (plugin.getBungeeSettings().isGloblalDataEnabled()) {
+				metrics.addCustomChart(new BStatsMetrics.SimplePie("globaldata_usemainmysql", new Callable<String>() {
+
+					@Override
+					public String call() throws Exception {
+						return "" + plugin.getBungeeSettings().isGloblalDataUseMainMySQL();
+					}
+				}));
+			}
 		}

-		metrics.addCustomChart(new BStatsMetrics.SimplePie("geyserprefixsupport", new Callable<String>() {
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("persitecooldownevents", new Callable<String>() {

 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getOptions().isGeyserPrefixSupport();
+				return "" + plugin.getConfigFile().isPerSiteCoolDownEvents();
+			}
+		}));
+
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("bedrockplayerprefix", new Callable<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return "" + plugin.getOptions().getBedrockPlayerPrefix();
 			}
 		}));

@@ -295,5 +333,40 @@ public class VotingPluginMetrics {
 				return "" + plugin.getProfile().contains("dev");
 			}
 		}));
+
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("votepointtransfering", new Callable<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return "" + plugin.getConfigFile().isAllowVotePointTransfers();
+			}
+		}));
+
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("votecooldown_check_enabled", new Callable<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return "" + (!plugin.getConfigFile().isDisableCoolDownCheck() && plugin.getRewardHandler()
+						.hasRewards(plugin.getSpecialRewardsConfig().getData(), "VoteCoolDownEndedReward"));
+			}
+		}));
+
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("background_task_time_taken", new Callable<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return "" + plugin.getLastBackgroundTaskTimeTaken();
+			}
+		}));
+
+		if (!plugin.getBuildNumber().equals("NOTSET")) {
+			metrics.addCustomChart(new BStatsMetrics.SimplePie("dev_build_number", new Callable<String>() {
+
+				@Override
+				public String call() throws Exception {
+					return "" + plugin.getBuildNumber();
+				}
+			}));
+		}
 	}
 }
@@ -2,26 +2,27 @@ package com.bencodez.votingplugin.broadcast;

 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+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;
-import com.bencodez.votingplugin.user.UserManager;

 public class BroadcastHandler {
 	private VotingPluginMain plugin;
-	private Timer timer;
-	ConcurrentLinkedQueue<String> votedPlayers = new ConcurrentLinkedQueue<String>();
+	private ScheduledExecutorService timer;
+	ConcurrentLinkedQueue<String> votedPlayers = new ConcurrentLinkedQueue<>();

 	public BroadcastHandler(VotingPluginMain plugin, int delay) {
 		this.plugin = plugin;
-		schelude(delay);
+		schedule(delay);
 	}

 	public void check() {
@@ -30,14 +31,21 @@ public class BroadcastHandler {
 			for (int i = 0; i < size; i++) {
 				votedPlayers.poll();
 			}
-			String bc = StringParser.getInstance()
-					.colorize(plugin.getConfigFile().getFormatAlternateBroadcastBroadcast());
-			HashMap<String, String> placeholders = new HashMap<String, String>();
+			String bc = MessageAPI.colorize(plugin.getConfigFile().getFormatAlternateBroadcastBroadcast());
+			String playersText = "";
+			while (!votedPlayers.isEmpty()) {
+				playersText += votedPlayers.remove();
+				if (!votedPlayers.isEmpty()) {
+					playersText += ", ";
+				}
+			}
+			HashMap<String, String> placeholders = new HashMap<>();
 			placeholders.put("numberofplayers", "" + size);
-			bc = StringParser.getInstance().replacePlaceHolder(bc, placeholders);
-			ArrayList<Player> players = new ArrayList<Player>();
+			placeholders.put("players", playersText);
+			bc = PlaceholderUtils.replacePlaceHolder(bc, placeholders);
+			ArrayList<Player> players = new ArrayList<>();
 			for (Player p : Bukkit.getOnlinePlayers()) {
-				if (!UserManager.getInstance().getVotingPluginUser(p).getDisableBroadcast()) {
+				if (!plugin.getVotingPluginUserManager().getVotingPluginUser(p).getDisableBroadcast()) {
 					players.add(p);
 				}
 			}
@@ -50,19 +58,19 @@ public class BroadcastHandler {
 		votedPlayers.add(player);
 	}

-	public void schelude(int delay) {
+	public void schedule(int delay) {
 		if (timer != null) {
-			timer.cancel();
-			timer = new Timer();
+			timer.shutdownNow();
+			timer = Executors.newScheduledThreadPool(1);
 		} else {
-			timer = new Timer();
+			timer = Executors.newScheduledThreadPool(1);
 		}
-		timer.schedule(new TimerTask() {
+		timer.scheduleWithFixedDelay(new Runnable() {

 			@Override
 			public void run() {
 				check();
 			}
-		}, 1000 * 60, 1000 * 60 * delay);
+		}, 60, 60 * delay, TimeUnit.SECONDS);
 	}
 }
@@ -3,33 +3,52 @@ package com.bencodez.votingplugin.bungee;
 import java.util.regex.Pattern;

 import lombok.Getter;
+import lombok.Setter;

 public class BungeeMessageData {

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

 	@Getter
+	@Setter
 	private int allTimeTotal = 0;
 	@Getter
+	@Setter
 	private int dailyTotal = 0;
 	@Getter
+	@Setter
 	private int milestoneCount = 0;
 	@Getter
+	@Setter
 	private int monthTotal = 0;
 	@Getter
+	@Setter
+	private int dateMonthTotal = 0;
+	@Getter
+	@Setter
 	private int points = 0;
 	@Getter
+	@Setter
 	private int weeklyTotal = 0;
+	@Getter
+	@Setter
+	private int votePartyCurrent = 0;
+	@Getter
+	@Setter
+	private int votePartyRequired = 0;

 	public BungeeMessageData(int allTimeTotal, int monthTotal, int weeklyTotal, int dailyTotal, int points,
-			int milestoneCount) {
+			int milestoneCount, int votePartyCurrent, int votePartyRequired, int dateMonthTotal) {
 		this.allTimeTotal = allTimeTotal;
 		this.monthTotal = monthTotal;
 		this.weeklyTotal = weeklyTotal;
 		this.dailyTotal = dailyTotal;
 		this.points = points;
 		this.milestoneCount = milestoneCount;
+		this.votePartyCurrent = votePartyCurrent;
+		this.votePartyRequired = votePartyRequired;
+		this.dateMonthTotal = dateMonthTotal;
 	}

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

 	@Override
 	public String toString() {
 		return allTimeTotal + "//" + monthTotal + "//" + weeklyTotal + "//" + dailyTotal + "//" + points + "//"
-				+ milestoneCount;
+				+ milestoneCount + "//" + votePartyCurrent + "//" + votePartyRequired;
 	}

 }
@@ -1,7 +1,7 @@
 package com.bencodez.votingplugin.bungee;

 public enum BungeeMethod {
-	MYSQL, PLUGINMESSAGING, SOCKETS;
+	MYSQL, PLUGINMESSAGING, SOCKETS, REDIS;

 	public static BungeeMethod getByName(String str) {
 		for (BungeeMethod method : values()) {
@@ -9,6 +9,6 @@ public enum BungeeMethod {
 				return method;
 			}
 		}
-		return SOCKETS;
+		return PLUGINMESSAGING;
 	}
 }
@@ -1,485 +0,0 @@
-package com.bencodez.votingplugin.bungee;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.bencodez.advancedcore.api.user.userstorage.mysql.api.queries.Query;
-import com.bencodez.advancedcore.api.user.userstorage.sql.Column;
-import com.bencodez.advancedcore.api.user.userstorage.sql.DataType;
-
-import net.md_5.bungee.config.Configuration;
-
-public class BungeeMySQL {
-	private List<String> columns = Collections.synchronizedList(new ArrayList<String>());
-
-	private List<String> intColumns = new ArrayList<String>();
-
-	// private HashMap<String, ArrayList<Column>> table;
-
-	// ConcurrentMap<String, ArrayList<Column>> table = new
-	// ConcurrentHashMap<String, ArrayList<Column>>();
-
-	private com.bencodez.advancedcore.api.user.userstorage.mysql.api.MySQL mysql;
-
-	private String name;
-
-	private Object object2 = new Object();
-
-	private Object object3 = new Object();
-
-	private Object object4 = new Object();
-
-	private Set<String> uuids = Collections.synchronizedSet(new HashSet<String>());
-
-	public BungeeMySQL(VotingPluginBungee bungee, String tableName, Configuration section) {
-		String tablePrefix = section.getString("Prefix");
-		String hostName = section.getString("Host");
-		int port = section.getInt("Port");
-		String user = section.getString("Username");
-		String pass = section.getString("Password");
-		String database = section.getString("Database");
-		long lifeTime = section.getLong("MaxLifeTime", -1);
-		int maxThreads = section.getInt("MaxConnections", 1);
-		String str = section.getString("Line", "");
-		if (maxThreads < 1) {
-			maxThreads = 1;
-		}
-		boolean useSSL = section.getBoolean("UseSSL", false);
-		boolean publicKeyRetrieval = section.getBoolean("PublicKeyRetrieval", false);
-		if (!section.getString("Name", "").isEmpty()) {
-			tableName = section.getString("Name", "");
-		}
-
-		name = tableName;
-		if (tablePrefix != null) {
-			name = tablePrefix + tableName;
-		}
-		mysql = new com.bencodez.advancedcore.api.user.userstorage.mysql.api.MySQL(maxThreads) {
-
-			@Override
-			public void debug(SQLException e) {
-				if (bungee.getConfig().getDebug()) {
-					e.printStackTrace();
-				}
-			}
-
-			@Override
-			public void severe(String string) {
-				bungee.getLogger().severe(string);
-			}
-		};
-		if (!mysql.connect(hostName, "" + port, user, pass, database, useSSL, lifeTime, str, publicKeyRetrieval)) {
-
-		}
-		try {
-			Query q = new Query(mysql, "USE " + database + ";");
-			q.executeUpdateAsync();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-		String sql = "CREATE TABLE IF NOT EXISTS " + getName() + " (";
-		sql += "uuid VARCHAR(37),";
-		sql += "PRIMARY KEY ( uuid )";
-		sql += ");";
-		Query query;
-		try {
-			query = new Query(mysql, sql);
-
-			query.executeUpdateAsync();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-
-		loadData();
-
-		// tempoary to improve performance from old tables
-		// addToQue("ALTER TABLE " + getName() + " MODIFY uuid VARCHAR(37);");
-		alterColumnType("uuid", "VARCHAR(37)");
-	}
-
-	public void addColumn(String column, DataType dataType) {
-		synchronized (object3) {
-			String sql = "ALTER TABLE " + getName() + " ADD COLUMN " + column + " text" + ";";
-			try {
-				Query query = new Query(mysql, sql);
-				query.executeUpdate();
-
-				getColumns().add(column);
-			} catch (SQLException e) {
-				e.printStackTrace();
-			}
-
-		}
-	}
-
-	public void alterColumnType(String column, String newType) {
-		checkColumn(column, DataType.STRING);
-		if (newType.contains("INT")) {
-			try {
-				new Query(mysql, "UPDATE " + getName() + " SET " + column + " = '0' where trim(coalesce(" + column
-						+ ", '')) = '';").executeUpdateAsync();
-			} catch (SQLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			;
-			if (!intColumns.contains(column)) {
-				intColumns.add(column);
-			}
-		}
-		try {
-			new Query(mysql, "ALTER TABLE " + getName() + " MODIFY " + column + " " + newType + ";")
-					.executeUpdateAsync();
-		} catch (SQLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public void checkColumn(String column, DataType dataType) {
-		synchronized (object4) {
-			if (!getColumns().contains(column)) {
-				if (!getColumnsQueury().contains(column)) {
-					addColumn(column, dataType);
-				}
-			}
-		}
-	}
-
-	public void clearCache() {
-		clearCacheBasic();
-	}
-
-	public void clearCacheBasic() {
-		columns.clear();
-		columns.addAll(getColumnsQueury());
-		uuids.clear();
-		uuids.addAll(getUuidsQuery());
-	}
-
-	public void close() {
-		mysql.disconnect();
-	}
-
-	public boolean containsKeyQuery(String index) {
-		String sqlStr = "SELECT uuid FROM " + getName() + ";";
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(sqlStr)) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query query = new Query(mysql, sql); ResultSet rs = query.executeQuery();
-			 */
-			while (rs.next()) {
-				if (rs.getString("uuid").equals(index)) {
-					rs.close();
-					return true;
-				}
-			}
-			rs.close();
-		} catch (SQLException ex) {
-			ex.printStackTrace();
-		}
-		return false;
-	}
-
-	public List<String> getColumns() {
-		if (columns == null || columns.size() == 0) {
-			loadData();
-		}
-		return columns;
-	}
-
-	public ArrayList<String> getColumnsQueury() {
-		ArrayList<String> columns = new ArrayList<String>();
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement("SELECT * FROM " + getName() + ";")) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query query = new Query(mysql, "SELECT * FROM " + getName() + ";"); ResultSet
-			 * rs = query.executeQuery();
-			 */
-
-			ResultSetMetaData metadata = rs.getMetaData();
-			int columnCount = 0;
-			if (metadata != null) {
-				columnCount = metadata.getColumnCount();
-
-				for (int i = 1; i <= columnCount; i++) {
-					String columnName = metadata.getColumnName(i);
-					columns.add(columnName);
-				}
-				rs.close();
-				return columns;
-			}
-			rs.close();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return columns;
-
-	}
-
-	public ArrayList<Column> getExactQuery(Column column) {
-		ArrayList<Column> result = new ArrayList<>();
-		String query = "SELECT * FROM " + getName() + " WHERE `" + column.getName() + "`='"
-				+ column.getValue().toString() + "';";
-
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(query)) {
-			ResultSet rs = sql.executeQuery();
-
-			/*
-			 * Query sql = new Query(mysql, query); sql.setParameter(1,
-			 * column.getValue().toString()); ResultSet rs = sql.executeQuery();
-			 */
-			if (rs.next()) {
-				for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
-					String columnName = rs.getMetaData().getColumnLabel(i);
-					Column rCol = null;
-					if (intColumns.contains(columnName)) {
-						rCol = new Column(columnName, DataType.INTEGER);
-					} else {
-						rCol = new Column(columnName, DataType.STRING);
-					}
-					// System.out.println(i + " " +
-					// rs.getMetaData().getColumnLabel(i));
-					rCol.setValue(rs.getString(i));
-					// System.out.println(rCol.getValue());
-					result.add(rCol);
-				}
-			}
-			rs.close();
-			return result;
-		} catch (SQLException e) {
-			e.printStackTrace();
-		} catch (ArrayIndexOutOfBoundsException e) {
-		}
-
-		for (String col : getColumns()) {
-			result.add(new Column(col, DataType.STRING));
-		}
-		return result;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public ArrayList<String> getNamesQuery() {
-		ArrayList<String> uuids = new ArrayList<String>();
-
-		checkColumn("PlayerName", DataType.STRING);
-		ArrayList<Column> rows = getRowsNameQuery();
-		if (rows != null) {
-			for (Column c : rows) {
-				uuids.add((String) c.getValue());
-			}
-		}
-
-		return uuids;
-	}
-
-	public ArrayList<Column> getRowsNameQuery() {
-		ArrayList<Column> result = new ArrayList<Column>();
-		String sqlStr = "SELECT PlayerName FROM " + getName() + ";";
-
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(sqlStr)) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query query = new Query(mysql, sql); ResultSet rs = query.executeQuery();
-			 */
-
-			while (rs.next()) {
-				Column rCol = new Column("PlayerName", rs.getString("PlayerName"), DataType.STRING);
-				result.add(rCol);
-			}
-			sql.close();
-			conn.close();
-		} catch (SQLException e) {
-		}
-
-		return result;
-	}
-
-	public ArrayList<Column> getRowsQuery() {
-		ArrayList<Column> result = new ArrayList<Column>();
-		String sqlStr = "SELECT uuid FROM " + getName() + ";";
-
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(sqlStr)) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query query = new Query(mysql, sql); ResultSet rs = query.executeQuery();
-			 */
-
-			while (rs.next()) {
-				Column rCol = new Column("uuid", rs.getString("uuid"), DataType.STRING);
-				result.add(rCol);
-			}
-			rs.close();
-		} catch (SQLException e) {
-			return null;
-		}
-
-		return result;
-	}
-
-	public String getUUID(String playerName) {
-		String query = "SELECT uuid FROM " + getName() + " WHERE " + "PlayerName" + "='" + playerName + "';";
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(query)) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query sql = new Query(mysql, query); ResultSet rs = sql.executeQuery();
-			 */
-			if (rs.next()) {
-				String uuid = rs.getString("uuid");
-				if (uuid != null && !uuid.isEmpty()) {
-					rs.close();
-					return uuid;
-				}
-			}
-			rs.close();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		} catch (ArrayIndexOutOfBoundsException e) {
-		}
-		return null;
-	}
-
-	public Set<String> getUuids() {
-		if (uuids == null || uuids.size() == 0) {
-			uuids.clear();
-			uuids.addAll(getUuidsQuery());
-			return uuids;
-		}
-		return uuids;
-	}
-
-	public ArrayList<String> getUuidsQuery() {
-		ArrayList<String> uuids = new ArrayList<String>();
-
-		ArrayList<Column> rows = getRowsQuery();
-		for (Column c : rows) {
-			uuids.add((String) c.getValue());
-		}
-
-		return uuids;
-	}
-
-	public void insert(String index, String column, Object value, DataType dataType) {
-		insertQuery(index, Arrays.asList(new Column(column, value, dataType)));
-	}
-
-	public void insertQuery(String index, List<Column> cols) {
-		String query = "INSERT IGNORE " + getName() + " ";
-
-		query += "set uuid='" + index + "', ";
-
-		for (int i = 0; i < cols.size(); i++) {
-			Column col = cols.get(i);
-			if (i == cols.size() - 1) {
-				query += col.getName() + "='" + col.getValue().toString() + "';";
-			} else {
-				query += col.getName() + "='" + col.getValue().toString() + "', ";
-			}
-
-		}
-
-		try {
-			uuids.add(index);
-			new Query(mysql, query).executeUpdateAsync();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	public boolean isIntColumn(String key) {
-		return intColumns.contains(key);
-	}
-
-	public void loadData() {
-		columns = getColumnsQueury();
-	}
-
-	public void update(String index, List<Column> cols, boolean queue) {
-		for (Column col : cols) {
-			checkColumn(col.getName(), col.getDataType());
-		}
-		if (getUuids().contains(index)) {
-			synchronized (object2) {
-
-				String query = "UPDATE " + getName() + " SET ";
-
-				for (int i = 0; i < cols.size(); i++) {
-					Column col = cols.get(i);
-					if (i == cols.size() - 1) {
-						if (col.getDataType().equals(DataType.STRING)) {
-							query += col.getName() + "='" + col.getValue().toString() + "';";
-						} else {
-							query += col.getName() + "=" + col.getValue().toString() + ";";
-						}
-					} else {
-						if (col.getDataType().equals(DataType.STRING)) {
-							query += col.getName() + "='" + col.getValue().toString() + "', ";
-						} else {
-							query += col.getName() + "=" + col.getValue().toString() + ", ";
-						}
-
-					}
-				}
-				query += " WHERE `uuid`=";
-				query += "'" + index + "';";
-
-				try {
-					Query q = new Query(mysql, query);
-					q.executeUpdateAsync();
-				} catch (SQLException e) {
-					e.printStackTrace();
-				}
-			}
-		} else {
-			insertQuery(index, cols);
-		}
-	}
-
-	public void update(String index, String column, Object value, DataType dataType) {
-		checkColumn(column, dataType);
-		if (getUuids().contains(index)) {
-			synchronized (object2) {
-				String query = "UPDATE " + getName() + " SET ";
-
-				if (dataType == DataType.STRING) {
-					query += column + "='" + value.toString() + "'";
-				} else {
-					query += column + "=" + value;
-
-				}
-				query += " WHERE `uuid`=";
-				query += "'" + index + "';";
-
-				try {
-					Query q = new Query(mysql, query);
-					q.executeUpdate();
-				} catch (SQLException e) {
-					e.printStackTrace();
-				}
-			}
-
-		} else {
-			insert(index, column, value, dataType);
-		}
-
-	}
-}
@@ -5,14 +5,18 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import com.bencodez.votingplugin.bungee.proxy.VotingPluginProxyConfig;

 import lombok.Getter;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.config.ConfigurationProvider;
 import net.md_5.bungee.config.YamlConfiguration;

-public class Config {
+public class Config implements VotingPluginProxyConfig {
 	private VotingPluginBungee bungee;
 	@Getter
 	private Configuration data;
@@ -21,10 +25,22 @@ public class Config {
 		this.bungee = bungee;
 	}

+	public Map<String, Object> configToMap(Configuration config) {
+		Map<String, Object> map = new HashMap<>();
+		if (config != null) {
+			config.getKeys().forEach(key -> map.put(key, config.get(key)));
+		}
+		return map;
+	}
+
 	public boolean getAllowUnJoined() {
 		return getData().getBoolean("AllowUnJoined", false);
 	}

+	public String getBedrockPlayerPrefix() {
+		return getData().getString("BedrockPlayerPrefix", ".");
+	}
+
 	public List<String> getBlockedServers() {
 		return getData().getStringList("BlockedServers");
 	}
@@ -57,26 +73,186 @@ public class Config {
 		return getData().getString("FallBackServer", "");
 	}

+	public boolean getGlobalDataEnabled() {
+		return getData().getBoolean("GlobalData.Enabled", false);
+	}
+
+	public boolean getGlobalDataUseMainMySQL() {
+		return getData().getBoolean("GlobalData.UseMainMySQL", true);
+	}
+
+	public int getLimitVotePoints() {
+		return getData().getInt("LimitVotePoints", -1);
+	}
+
+	public int getMaxAmountOfVotesPerDay() {
+		return getData().getInt("MaxAmountOfVotesPerDay", -1);
+	}
+
+	public String getMultiProxyMethod() {
+		return getData().getString("MultiProxyMethod", "SOCKET");
+	}
+
+	public boolean getMultiProxyOneGlobalReward() {
+		return getData().getBoolean("MultiProxyOneGlobalReward", false);
+	}
+
+	public String getMultiProxyRedisHost() {
+		return getData().getString("MultiProxyRedis.Host", "");
+	}
+
+	public String getMultiProxyRedisPassword() {
+		return getData().getString("MultiProxyRedis.Password", "");
+	}
+
+	public int getMultiProxyRedisPort() {
+		return getData().getInt("MultiProxyRedis.Port", 6379);
+	}
+
+	public boolean getMultiProxyRedisUseExistingConnection() {
+		return getData().getBoolean("MultiProxyRedis.UseExistingConnection", false);
+	}
+
+	public String getMultiProxyRedisUsername() {
+		return getData().getString("MultiProxyRedis.Username", "");
+	}
+
+	public Collection<String> getMultiProxyServers() {
+		return getData().getSection("MultiProxyServers").getKeys();
+	}
+
+	public Map<String, Object> getMultiProxyServersConfiguration(String s) {
+		return configToMap(getData().getSection("MultiProxyServers." + s));
+	}
+
+	public String getMultiProxySocketHostHost() {
+		return getData().getString("MultiProxySocketHost.Host", "");
+	}
+
+	public int getMultiProxySocketHostPort() {
+		return getData().getInt("MultiProxySocketHost.Port", 1297);
+	}
+
+	public boolean getMultiProxySupport() {
+		return getData().getBoolean("MultiProxySupport", false);
+	}
+
+	public boolean getOnlineMode() {
+		return getData().getBoolean("OnlineMode", true);
+	}
+
 	public int getPointsOnVote() {
 		return getData().getInt("PointsOnVote", 1);
 	}

+	public boolean getPrimaryServer() {
+		return getData().getBoolean("PrimaryServer", false);
+	}
+
+	public String getProxyServerName() {
+		return getData().getString("ProxyServerName", "SOCKET");
+	}
+
+	public List<String> getProxyServers() {
+		return getData().getStringList("ProxyServers");
+	}
+
+	public String getRedisHost() {
+		return getData().getString("Redis.Host", "");
+	}
+
+	public String getRedisPassword() {
+		return getData().getString("Redis.Password", "");
+	}
+
+	public int getRedisPort() {
+		return getData().getInt("Redis.Port", 6379);
+	}
+
+	public String getRedisPrefix() {
+		return getData().getString("Redis.Prefix", "");
+	}
+
+	public String getRedisUsername() {
+		return getData().getString("Redis.Username", "");
+	}
+
 	public boolean getSendVotesToAllServers() {
 		return getData().getBoolean("SendVotesToAllServers");
 	}

-	public Configuration getSpigotServerConfiguration(String s) {
-		return getData().getSection("SpigotServers." + s);
+	public Map<String, Object> getSpigotServerConfiguration(String s) {
+		return configToMap(getData().getSection("SpigotServers." + s));
 	}

 	public Collection<String> getSpigotServers() {
 		return getData().getSection("SpigotServers").getKeys();
 	}

+	public boolean getStoreMonthTotalsWithDate() {
+		return getData().getBoolean("StoreMonthTotalsWithDate", false);
+	}
+
+	public boolean getTimeChangeFailSafeBypass() {
+		return getData().getBoolean("TimeChangeFailSafeBypass", false);
+	}
+
+	public int getTimeHourOffSet() {
+		return getData().getInt("TimeHourOffSet");
+	}
+
+	public String getTimeZone() {
+		return getData().getString("TimeZone", "");
+	}
+
+	public boolean getUseMonthDateTotalsAsPrimaryTotal() {
+		return getData().getBoolean("UseMonthDateTotalsAsPrimaryTotal", false);
+	}
+
+	public boolean getUUIDLookup() {
+		return getData().getBoolean("UUIDLookup", true);
+	}
+
+	public int getVoteCacheTime() {
+		return getData().getInt("VoteCacheTime", -1);
+	}
+
+	public String getVotePartyBroadcast() {
+		return getData().getString("VoteParty.Broadcast", "");
+	}
+
+	public List<String> getVotePartyBungeeCommands() {
+		return getData().getStringList("VoteParty.BungeeCommands");
+	}
+
+	public boolean getVotePartyEnabled() {
+		return getData().getBoolean("VoteParty.Enabled", false);
+	}
+
+	public int getVotePartyIncreaseVotesRequired() {
+		return getData().getInt("VoteParty.IncreaseVotesRequired", 0);
+	}
+
+	public boolean getVotePartySendToAllServers() {
+		return getData().getBoolean("VoteParty.SendToAllServers", true);
+	}
+
+	public List<String> getVotePartyServersToSend() {
+		return getData().getStringList("VoteParty.ServersToSend");
+	}
+
+	public int getVotePartyVotesRequired() {
+		return getData().getInt("VoteParty.VotesRequired", 100);
+	}
+
 	public boolean getWaitForUserOnline() {
 		return getData().getBoolean("WaitForUserOnline", false);
 	}

+	public List<String> getWhiteListedServers() {
+		return getData().getStringList("WhiteListedServers");
+	}
+
 	public void load() {
 		if (!bungee.getDataFolder().exists()) {
 			bungee.getDataFolder().mkdir();
@@ -108,4 +284,14 @@ public class Config {
 		}
 	}

+	@Override
+	public String getPluginMessageChannel() {
+		return getData().getString("PluginMessageChannel", "vp:vp");
+	}
+
+	@Override
+	public boolean getPluginMessageEncryption() {
+		return getData().getBoolean("PluginMessageEncryption", false);
+	}
+
 }
@@ -7,6 +7,7 @@ import lombok.Getter;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.config.ConfigurationProvider;
+import net.md_5.bungee.config.JsonConfiguration;
 import net.md_5.bungee.config.YamlConfiguration;

 public class NonVotedPlayersCache {
@@ -19,14 +20,21 @@ public class NonVotedPlayersCache {
 	}

 	public void addPlayer(ProxiedPlayer proxiedPlayer) {
-		if (!bungee.getMysql().containsKeyQuery(proxiedPlayer.getUniqueId().toString())) {
+		if (!bungee.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(proxiedPlayer.getUniqueId().toString())) {
 			addPlayer(proxiedPlayer.getUniqueId().toString(), proxiedPlayer.getName());
 		}
 	}

-	private void addPlayer(String uuid, String playerName) {
+	public void addPlayer(String uuid, String playerName) {
 		getData().set("NonVotedPlayers." + playerName + ".UUID", uuid);
 		getData().set("NonVotedPlayers." + playerName + ".LastTime", System.currentTimeMillis());
+		save();
+	}
+
+	public void addPlayerCheck(String uuid, String playerName) {
+		if (!bungee.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(uuid)) {
+			addPlayer(uuid, playerName);
+		}
 	}

 	public void check() {
@@ -37,7 +45,7 @@ public class NonVotedPlayersCache {
 			} else {
 				String uuid = getData().getString("NonVotedPlayers." + player + ".UUID", "");
 				if (!uuid.isEmpty()) {
-					if (bungee.getMysql().containsKeyQuery(uuid)) {
+					if (bungee.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(uuid)) {
 						remove(player);
 					}
 				} else {
@@ -53,7 +61,8 @@ public class NonVotedPlayersCache {
 			bungee.getDataFolder().mkdir();
 		}

-		File file = new File(bungee.getDataFolder(), "nonvotedplayerscache.yml");
+		File yamlFile = new File(bungee.getDataFolder(), "nonvotedplayerscache.yml");
+		File file = new File(bungee.getDataFolder(), "nonvotedplayerscache.json");

 		if (!file.exists()) {
 			try {
@@ -62,9 +71,24 @@ public class NonVotedPlayersCache {
 				e.printStackTrace();
 			}
 		}
+
+		if (yamlFile.exists()) {
+			try {
+				data = ConfigurationProvider.getProvider(YamlConfiguration.class)
+						.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
+				yamlFile.renameTo(new File(bungee.getDataFolder(), "oldnonvotedplayerscache.yml"));
+				ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
+						new File(bungee.getDataFolder(), "oldnonvotedplayerscache.yml"));
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+
+			save();
+		}
+
 		try {
-			data = ConfigurationProvider.getProvider(YamlConfiguration.class)
-					.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
+			data = ConfigurationProvider.getProvider(JsonConfiguration.class)
+					.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.json"));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
@@ -84,8 +108,8 @@ public class NonVotedPlayersCache {

 	public void save() {
 		try {
-			ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
-					new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
+			ConfigurationProvider.getProvider(JsonConfiguration.class).save(data,
+					new File(bungee.getDataFolder(), "nonvotedplayerscache.json"));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
@@ -4,9 +4,12 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Collection;

+import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
+
 import lombok.Getter;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.config.ConfigurationProvider;
+import net.md_5.bungee.config.JsonConfiguration;
 import net.md_5.bungee.config.YamlConfiguration;

 public class VoteCache {
@@ -18,6 +21,13 @@ public class VoteCache {
 		this.bungee = bungee;
 	}

+	public void addTimedVote(int num, VoteTimeQueue voteTimedQueue) {
+		Configuration section = getData().getSection("TimedVoteCache." + num);
+		section.set("Name", voteTimedQueue.getName());
+		section.set("Service", voteTimedQueue.getService());
+		section.set("Time", voteTimedQueue.getTime());
+	}
+
 	public void addVote(String server, int num, OfflineBungeeVote voteData) {
 		Configuration section = getData().getSection("VoteCache." + server + "." + num);
 		section.set("Name", voteData.getPlayerName());
@@ -26,7 +36,6 @@ public class VoteCache {
 		section.set("Time", voteData.getTime());
 		section.set("Real", voteData.isRealVote());
 		section.set("Text", voteData.getText());
-		save();
 	}

 	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
@@ -37,12 +46,12 @@ public class VoteCache {
 		section.set("Time", voteData.getTime());
 		section.set("Real", voteData.isRealVote());
 		section.set("Text", voteData.getText());
-		save();
 	}

 	public void clearData() {
 		getData().set("VoteCache", null);
 		getData().set("OnlineCache", null);
+		getData().set("TimedVoteCache", null);
 		save();
 	}

@@ -70,12 +79,34 @@ public class VoteCache {
 		return getData().getSection("VoteCache." + server + "." + num);
 	}

+	public Collection<String> getTimedVoteCache() {
+		return getData().getSection("TimedVoteCache").getKeys();
+	}
+
+	public Configuration getTimedVoteCache(String key) {
+		return getData().getSection("TimedVoteCache." + key);
+	}
+
+	public int getVotePartyCache(String server) {
+		return getData().getInt("VoteParty.Cache." + server, 0);
+	}
+
+	public int getVotePartyCurrentVotes() {
+		return getData().getInt("VoteParty.CurrentVotes", 0);
+	}
+
+	public int getVotePartyInreaseVotesRequired() {
+		return getData().getInt("VoteParty.IncreaseVotes", 0);
+	}
+
 	public void load() {
 		if (!bungee.getDataFolder().exists()) {
 			bungee.getDataFolder().mkdir();
 		}

-		File file = new File(bungee.getDataFolder(), "votecache.yml");
+		File yamlFile = new File(bungee.getDataFolder(), "votecache.yml");
+
+		File file = new File(bungee.getDataFolder(), "votecache.json");

 		if (!file.exists()) {
 			try {
@@ -84,9 +115,23 @@ public class VoteCache {
 				e.printStackTrace();
 			}
 		}
+		if (yamlFile.exists()) {
+			try {
+				data = ConfigurationProvider.getProvider(YamlConfiguration.class)
+						.load(new File(bungee.getDataFolder(), "votecache.yml"));
+				yamlFile.renameTo(new File(bungee.getDataFolder(), "oldvotecache.yml"));
+				ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
+						new File(bungee.getDataFolder(), "oldvotecache.yml"));
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+
+			save();
+		}
+
 		try {
-			data = ConfigurationProvider.getProvider(YamlConfiguration.class)
-					.load(new File(bungee.getDataFolder(), "votecache.yml"));
+			data = ConfigurationProvider.getProvider(JsonConfiguration.class)
+					.load(new File(bungee.getDataFolder(), "votecache.json"));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
@@ -94,11 +139,23 @@ public class VoteCache {

 	public void save() {
 		try {
-			ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
-					new File(bungee.getDataFolder(), "votecache.yml"));
+			ConfigurationProvider.getProvider(JsonConfiguration.class).save(data,
+					new File(bungee.getDataFolder(), "votecache.json"));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
 	}

+	public void setVotePartyCache(String server, int amount) {
+		getData().set("VoteParty.Cache." + server, amount);
+	}
+
+	public void setVotePartyCurrentVotes(int amount) {
+		getData().set("VoteParty.CurrentVotes", amount);
+	}
+
+	public void setVotePartyInreaseVotesRequired(int amount) {
+		getData().set("VoteParty.IncreaseVotes", amount);
+	}
+
 }
@@ -14,10 +14,24 @@ public class VoteEventBungee implements net.md_5.bungee.api.plugin.Listener {

 	@EventHandler
 	public void onVote(VotifierEvent event) {
-		Vote vote = event.getVote();
-		plugin.getLogger().info("Vote received " + vote.getUsername() + " from service site " + vote.getServiceName());
+		plugin.getProxy().getScheduler().runAsync(plugin, new Runnable() {

-		plugin.vote(vote.getUsername(), vote.getServiceName(), true);
+			@SuppressWarnings("deprecation")
+			@Override
+			public void run() {
+				Vote vote = event.getVote();
+				String serviceSite = vote.getServiceName();
+				plugin.getLogger().info("Vote received " + vote.getUsername() + " from service site " + serviceSite);
+
+				if (serviceSite.isEmpty()) {
+					serviceSite = "Empty";
+					vote.setServiceName(serviceSite);
+				}
+
+				plugin.getVotingPluginProxy().vote(vote.getUsername(), serviceSite, true, true, 0, null, null);
+			}
+		});

 	}
+
 }
@@ -1,5 +1,7 @@
 package com.bencodez.votingplugin.bungee;

+import com.bencodez.votingplugin.bungee.proxy.VotingPluginProxyCommand;
+
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.plugin.Command;
@@ -15,48 +17,26 @@ public class VotingPluginBungeeCommand extends Command {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if (sender.hasPermission("votingplugin.admin")) {
-			if (args.length > 0) {
-				if (args[0].equalsIgnoreCase("reload")) {
-					bungee.reload(false);
-					sender.sendMessage(new TextComponent("&aReloading VotingPluginBungee"));
-				}
-				if (args[0].equalsIgnoreCase("reloadmysql")) {
-					bungee.reload(true);
-					sender.sendMessage(new TextComponent("&aReloading VotingPluginBungee with MySQL"));
-				}
-				if (args[0].equalsIgnoreCase("vote")) {
-					if (args.length >= 2) {
-						String user = args[1];
-						String site = args[2];
-						bungee.vote(user, site, false);
-						sender.sendMessage(new TextComponent("&aSending vote"));
-					}
-				}
-				if (args[0].equalsIgnoreCase("status")) {
-					if (bungee.getMethod().equals(BungeeMethod.SOCKETS)) {
-						sender.sendMessage(new TextComponent(
-								"&aChecking status, waiting for response, check console, method: sockets"));
-						bungee.status(sender);
-					} else if (bungee.getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
-						sender.sendMessage(new TextComponent(
-								"&aChecking status, waiting for response, check console, method: plugin messaging"));
-						bungee.status(sender);
-					} else {
-						sender.sendMessage(
-								new TextComponent("&aNot using socket/pluginmessage method, command unavailable"));
-					}
-				}
-				if (args[0].equalsIgnoreCase("help")) {
-					TextComponent[] msg = new TextComponent[4];
-					msg[0] = new TextComponent("&avotingpluginbungee reload - Reload plugin");
-					msg[1] = new TextComponent("&avotingpluginbungee reloadmysql - Reload plugin including mysql");
-					msg[2] = new TextComponent("&avotingpluginbungee vote (player) (servicesite) - Send bungee vote");
-					msg[3] = new TextComponent("&avotingpluginbungee status - Check socket connection status");
-					sender.sendMessage(msg);
-				}
+			String result = new VotingPluginProxyCommand(bungee.getVotingPluginProxy()).execute(args);
+			if (result != null) {
+				sender.sendMessage(new TextComponent(result.replace("&", "§")));
 			}
 		} else {
 			sender.sendMessage(new TextComponent("&cYou do not have permission to do this!"));
 		}
 	}
+
+	public boolean isInt(String st) {
+		if (st == null) {
+			return false;
+		}
+		try {
+			@SuppressWarnings("unused")
+			int num = Integer.parseInt(st);
+			return true;
+
+		} catch (NumberFormatException ex) {
+			return false;
+		}
+	}
 }
@@ -0,0 +1,226 @@
+package com.bencodez.votingplugin.bungee.global.multiproxy;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+
+import com.bencodez.advancedcore.api.misc.encryption.EncryptionHandler;
+import com.bencodez.advancedcore.bungeeapi.redis.RedisHandler;
+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.votingplugin.bungee.BungeeMessageData;
+
+import lombok.Getter;
+
+public abstract class MultiProxyHandler {
+	private HashMap<String, ClientHandler> multiproxyClientHandles;
+
+	private SocketHandler multiproxySocketHandler;
+
+	@Getter
+	private RedisHandler multiProxyRedis;
+
+	public MultiProxyHandler() {
+
+	}
+
+	public abstract void addNonVotedPlayerCache(String string, String string2);
+
+	public abstract void clearVote(String string);
+
+	public void close() {
+		if (multiproxySocketHandler != null) {
+			multiproxySocketHandler.closeConnection();
+			multiproxySocketHandler = null;
+		}
+		if (multiProxyRedis != null && !getMultiProxyRedisUseExistingConnection()) {
+			multiProxyRedis.close();
+		}
+	}
+
+	public abstract boolean getDebug();
+
+	public abstract EncryptionHandler getEncryptionHandler();
+
+	public abstract MultiProxyMethod getMultiProxyMethod();
+
+	public abstract String getMultiProxyPassword();
+
+	public abstract String getMultiProxyRedisHost();
+
+	public abstract int getMultiProxyRedisPort();
+
+	public abstract boolean getMultiProxyRedisUseExistingConnection();
+
+	public abstract String getMultiProxyServerName();
+
+	public abstract Collection<String> getMultiProxyServers();
+
+	public abstract MultiProxyServerSocketConfiguration getMultiProxyServersConfiguration(String s);
+
+	public abstract String getMultiProxySocketHostHost();
+
+	public abstract int getMultiProxySocketHostPort();
+
+	public abstract boolean getMultiProxySupportEnabled();
+
+	public abstract String getMultiProxyUsername();
+
+	public abstract File getPluginDataFolder();
+
+	public abstract boolean getPrimaryServer();
+
+	public abstract List<String> getProxyServers();
+
+	public abstract RedisHandler getRedisHandler();
+
+	public abstract String getVersion();
+
+	public void loadMultiProxySupport() {
+		if (getMultiProxySupportEnabled()) {
+			if (getMultiProxyMethod().equals(MultiProxyMethod.SOCKETS)) {
+				if (getEncryptionHandler() == null) {
+					setEncryptionHandler(new EncryptionHandler(new File(getPluginDataFolder(), "secretkey.key")));
+				}
+
+				if (multiproxySocketHandler != null) {
+					multiproxySocketHandler.closeConnection();
+					multiproxySocketHandler = null;
+				}
+				multiproxySocketHandler = new SocketHandler(getVersion(), getMultiProxySocketHostHost(),
+						getMultiProxySocketHostPort(), getEncryptionHandler(), getDebug()) {
+
+					@Override
+					public void log(String str) {
+						logInfo(str);
+					}
+				};
+
+				multiproxySocketHandler.add(new SocketReceiver() {
+
+					@Override
+					public void onReceive(String[] data) {
+						if (data.length > 0) {
+							if (data[0].equalsIgnoreCase("Status")) {
+								logInfo("Multi-proxy status message received");
+							} else if (data[0].equalsIgnoreCase("ClearVote")) {
+								clearVote(data[2]);
+								if (getPrimaryServer()) {
+									sendMultiProxyServerMessage("ClearVotePrimary", data[1], data[2]);
+								}
+							} else if (data[0].equalsIgnoreCase("ClearVotePrimary")) {
+								clearVote(data[2]);
+							} else if (data[0].equalsIgnoreCase("login")) {
+								addNonVotedPlayerCache(data[1], data[2]);
+								// nonVotedPlayersCache.addPlayer(data[1], data[2]);
+							}
+						}
+						if (data.length > 8) {
+							if (data[0].equalsIgnoreCase("Vote")) {
+								triggerVote(data[2], data[3], Boolean.valueOf(data[7]), true, 0,
+										new BungeeMessageData(data[8]), data[1]);
+							} else if (data[0].equalsIgnoreCase("VoteOnline")) {
+								triggerVote(data[2], data[3], Boolean.valueOf(data[7]), true, 0,
+										new BungeeMessageData(data[8]), data[1]);
+							}
+						}
+
+					}
+				});
+
+				multiproxyClientHandles = new HashMap<>();
+				for (String s : getMultiProxyServers()) {
+					MultiProxyServerSocketConfiguration d = getMultiProxyServersConfiguration(s);
+					multiproxyClientHandles.put(s,
+							new ClientHandler(d.getHost(), d.getPort(), getEncryptionHandler(), getDebug()));
+				}
+
+			} else {
+				if (getMultiProxyRedisUseExistingConnection() && getRedisHandler() != null) {
+					multiProxyRedis = getRedisHandler();
+				} else {
+					multiProxyRedis = new RedisHandler(getMultiProxyRedisHost(), getMultiProxyRedisPort(),
+							getMultiProxyUsername(), getMultiProxyPassword()) {
+
+						@Override
+						public void debug(String message) {
+							if (getDebug()) {
+								logInfo("MultiProxyRedis: " + message);
+							}
+						}
+
+						@Override
+						public void onMessage(String channel, String[] data) {
+							if (data.length > 0) {
+								if (data[0].equalsIgnoreCase("Status")) {
+									logInfo("Multi-proxy status message received");
+								} else if (data[0].equalsIgnoreCase("ClearVote")) {
+									clearVote(data[2]);
+									if (getPrimaryServer()) {
+										sendMultiProxyServerMessage("ClearVotePrimary", data[1], data[2]);
+									}
+								} else if (data[0].equalsIgnoreCase("ClearVotePrimary")) {
+									clearVote(data[2]);
+								} else if (data[0].equalsIgnoreCase("login")) {
+									addNonVotedPlayerCache(data[1], data[2]);
+									// nonVotedPlayersCache.addPlayer(data[1], data[2]);
+								}
+							}
+							if (data.length > 8) {
+								if (data[0].equalsIgnoreCase("Vote")) {
+									triggerVote(data[2], data[3], Boolean.valueOf(data[7]), true, 0,
+											new BungeeMessageData(data[8]), data[1]);
+								} else if (data[0].equalsIgnoreCase("VoteOnline")) {
+									triggerVote(data[2], data[3], Boolean.valueOf(data[7]), true, 0,
+											new BungeeMessageData(data[8]), data[1]);
+								}
+							}
+						}
+					};
+				}
+
+				runAsnc(new Runnable() {
+
+					@Override
+					public void run() {
+						multiProxyRedis.loadListener(
+								new RedisListener(multiProxyRedis, "VotingPluginProxy_" + getMultiProxyServerName()));
+					}
+				});
+
+			}
+			logInfo("Loaded multi-proxy support: " + getMultiProxyMethod().toString());
+		}
+	}
+
+	public void login(String uuid, String playerName) {
+		if (!getMultiProxySupportEnabled() || getPrimaryServer()) {
+			return;
+		}
+		sendMultiProxyServerMessage("Login", uuid, playerName);
+	}
+
+	public abstract void logInfo(String msg);
+
+	public abstract void runAsnc(Runnable runnable);
+
+	public void sendMultiProxyServerMessage(String... messageData) {
+		if (getMultiProxyMethod().equals(MultiProxyMethod.SOCKETS)) {
+			for (ClientHandler h : multiproxyClientHandles.values()) {
+				h.sendMessage(messageData);
+			}
+		} else if (getMultiProxyMethod().equals(MultiProxyMethod.REDIS)) {
+			for (String server : getProxyServers()) {
+				multiProxyRedis.sendMessage("VotingPluginProxy_" + server, messageData);
+			}
+		}
+	}
+
+	public abstract void setEncryptionHandler(EncryptionHandler encryptionHandler);
+
+	public abstract void triggerVote(String player, String service, boolean realVote, boolean timeQueue, long queueTime,
+			BungeeMessageData text, String uuid);
+}
@@ -0,0 +1,14 @@
+package com.bencodez.votingplugin.bungee.global.multiproxy;
+
+public enum MultiProxyMethod {
+	SOCKETS, REDIS;
+
+	public static MultiProxyMethod getByName(String str) {
+		for (MultiProxyMethod method : values()) {
+			if (method.toString().equalsIgnoreCase(str)) {
+				return method;
+			}
+		}
+		return MultiProxyMethod.SOCKETS;
+	}
+}
@@ -0,0 +1,9 @@
+package com.bencodez.votingplugin.bungee.global.multiproxy;
+
+public interface MultiProxyServerSocketConfiguration {
+	String getHost();
+
+	int getPort();
+
+	String getServerName();
+}
@@ -0,0 +1,37 @@
+package com.bencodez.votingplugin.bungee.global.multiproxy;
+
+import java.util.Map;
+
+public class MultiProxyServerSocketConfigurationBungee implements MultiProxyServerSocketConfiguration {
+	private String server;
+	private String host = "";
+	private int port;
+
+	public MultiProxyServerSocketConfigurationBungee(String s, Map<String, Object> config) {
+		server = s;
+		if (config.containsKey("Host")) {
+			host = (String) config.get("Host");
+		}
+		if (config.containsKey("Port")) {
+			port = (int) config.get("Port");
+		} else {
+			port = 1298;
+		}
+	}
+
+	@Override
+	public String getHost() {
+		return host;
+	}
+
+	@Override
+	public int getPort() {
+		return port;
+	}
+
+	@Override
+	public String getServerName() {
+		return server;
+	}
+
+}
@@ -0,0 +1,33 @@
+package com.bencodez.votingplugin.bungee.global.multiproxy;
+
+import ninja.leaping.configurate.ConfigurationNode;
+
+public class MultiProxyServerSocketConfigurationVelocity implements MultiProxyServerSocketConfiguration {
+
+	private String server;
+	private String host;
+	private int port;
+
+	public MultiProxyServerSocketConfigurationVelocity(String s, ConfigurationNode config) {
+		server = s;
+		host = config.getNode("Host").getString("0.0.0.0");
+		port = config.getNode("Port").getInt(1298);
+
+	}
+
+	@Override
+	public String getHost() {
+		return host;
+	}
+
+	@Override
+	public int getPort() {
+		return port;
+	}
+
+	@Override
+	public String getServerName() {
+		return server;
+	}
+
+}
@@ -0,0 +1,121 @@
+package com.bencodez.votingplugin.bungee.proxy;
+
+import com.bencodez.advancedcore.api.time.TimeType;
+import com.bencodez.votingplugin.bungee.BungeeMethod;
+
+public class VotingPluginProxyCommand {
+	private VotingPluginProxy plugin;
+
+	public VotingPluginProxyCommand(VotingPluginProxy plugin) {
+		this.plugin = plugin;
+	}
+
+	/**
+	 * Execute the command and return a message as a String.
+	 *
+	 * @param args Command arguments
+	 * @return The resulting message to send
+	 */
+	public String execute(String[] args) {
+		if (args.length == 0)
+			return "&cPlease provide a valid command. Use 'help' to view all commands.";
+
+		switch (args[0].toLowerCase()) {
+		case "reload":
+			plugin.reloadCore(false);
+			return "&aReloading VotingPlugin";
+
+		case "reloadmysql":
+			plugin.reloadCore(true);
+			return "&aReloading VotingPlugin including MySQL";
+
+		case "vote":
+			if (args.length >= 3) {
+				String user = args[1];
+				String site = args[2];
+				plugin.vote(user, site, false, true, 0, null, null);
+				return "&aVote sent for " + user + " on " + site;
+			}
+			return "&cUsage: vote <player> <site>";
+
+		case "forcetimechange":
+			if (args.length >= 2) {
+				plugin.getBungeeTimeChecker().forceChanged(TimeType.getTimeType(args[1]));
+				return "&aTriggered time change to " + args[1];
+			}
+			return "&cUsage: forcetimechange <TimeType>";
+
+		case "status":
+			return handleStatusCommand();
+
+		case "multiproxystatus":
+			plugin.getMultiProxyHandler().sendMultiProxyServerMessage("Status");
+			return "&aSent status message across multi-proxy";
+
+		case "help":
+			return getHelpMessage();
+
+		case "voteparty":
+			return handleVotePartyCommand(args);
+
+		default:
+			return "&cUnknown command. Use 'help' to view all commands.";
+		}
+	}
+
+	private String handleStatusCommand() {
+		BungeeMethod method = plugin.getMethod();
+		switch (method) {
+		case SOCKETS:
+			plugin.status();
+			return "&aChecking status via sockets. Check console for details.";
+
+		case PLUGINMESSAGING:
+		case REDIS:
+			plugin.status();
+			plugin.sendServerNameMessage();
+			return "&aChecking status with method: " + method.toString().toLowerCase();
+
+		default:
+			return "&cStatus command unavailable for the current connection method.";
+		}
+	}
+
+	private String handleVotePartyCommand(String[] args) {
+		if (args.length > 1) {
+			if ("force".equalsIgnoreCase(args[1])) {
+				plugin.setCurrentVotePartyVotes(plugin.getCurrentVotePartyVotesRequired());
+				plugin.checkVoteParty();
+				return "&aVote party forced";
+			} else if ("setvotecount".equalsIgnoreCase(args[1]) && args.length > 2 && isInt(args[2])) {
+				plugin.setCurrentVotePartyVotes(Integer.parseInt(args[2]));
+				return "&aSet current vote party votes to " + args[2];
+			} else {
+				return "&cInvalid usage. Use 'help' for correct syntax.";
+			}
+		}
+		return "&cUsage: voteparty <force/setvotecount>";
+	}
+
+	private String getHelpMessage() {
+		StringBuilder helpBuilder = new StringBuilder("&aVotingPlugin Commands:\n");
+		helpBuilder.append("/votingplugin reload - Reload the plugin\n");
+		helpBuilder.append("/votingplugin reloadmysql - Reload the plugin including MySQL\n");
+		helpBuilder.append("/votingplugin vote <player> <site> - Send a vote\n");
+		helpBuilder.append("/votingplugin forcetimechange <TimeType> - Force a time change\n");
+		helpBuilder.append("/votingplugin status - Check connection status\n");
+		helpBuilder.append("/votingplugin multiproxystatus - Send status message across proxies\n");
+		helpBuilder.append("/votingplugin voteparty <force/setvotecount> - Trigger or modify vote party\n");
+		return helpBuilder.toString();
+	}
+
+	private boolean isInt(String str) {
+		try {
+			Integer.parseInt(str);
+			return true;
+		} catch (NumberFormatException e) {
+			return false;
+		}
+	}
+
+}
@@ -0,0 +1,127 @@
+package com.bencodez.votingplugin.bungee.proxy;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+public interface VotingPluginProxyConfig {
+
+	public boolean getAllowUnJoined();
+
+	public String getBedrockPlayerPrefix();
+
+	public List<String> getBlockedServers();
+
+	public boolean getBroadcast();
+
+	public String getBungeeHost();
+
+	public boolean getBungeeManageTotals();
+
+	public String getBungeeMethod();
+
+	public int getBungeePort();
+
+	public String getPluginMessageChannel();
+
+	public boolean getPluginMessageEncryption();
+
+	public boolean getDebug();
+
+	public String getFallBack();
+
+	public boolean getGlobalDataEnabled();
+
+	public boolean getGlobalDataUseMainMySQL();
+
+	public int getLimitVotePoints();
+
+	public int getMaxAmountOfVotesPerDay();
+
+	public String getMultiProxyMethod();
+
+	public boolean getMultiProxyOneGlobalReward();
+
+	public String getMultiProxyRedisHost();
+
+	public String getMultiProxyRedisPassword();
+
+	public int getMultiProxyRedisPort();
+
+	public boolean getMultiProxyRedisUseExistingConnection();
+
+	public String getMultiProxyRedisUsername();
+
+	public Collection<String> getMultiProxyServers();
+
+	public Map<String, Object> getMultiProxyServersConfiguration(String s);
+
+	public String getMultiProxySocketHostHost();
+
+	public int getMultiProxySocketHostPort();
+
+	public boolean getMultiProxySupport();
+
+	public boolean getOnlineMode();
+
+	public int getPointsOnVote();
+
+	public boolean getPrimaryServer();
+
+	public String getProxyServerName();
+
+	public List<String> getProxyServers();
+
+	public String getRedisHost();
+
+	public String getRedisPassword();
+
+	public int getRedisPort();
+
+	public String getRedisPrefix();
+
+	public String getRedisUsername();
+
+	public boolean getSendVotesToAllServers();
+
+	public Map<String, Object> getSpigotServerConfiguration(String s);
+
+	public Collection<String> getSpigotServers();
+
+	public boolean getStoreMonthTotalsWithDate();
+
+	public boolean getTimeChangeFailSafeBypass();
+
+	public int getTimeHourOffSet();
+
+	public String getTimeZone();
+
+	public boolean getUseMonthDateTotalsAsPrimaryTotal();
+
+	public boolean getUUIDLookup();
+
+	public int getVoteCacheTime();
+
+	public String getVotePartyBroadcast();
+
+	public List<String> getVotePartyBungeeCommands();
+
+	public boolean getVotePartyEnabled();
+
+	public int getVotePartyIncreaseVotesRequired();
+
+	public boolean getVotePartySendToAllServers();
+
+	public List<String> getVotePartyServersToSend();
+
+	public int getVotePartyVotesRequired();
+
+	public boolean getWaitForUserOnline();
+
+	public List<String> getWhiteListedServers();
+
+	public void load();
+
+	public void save();
+
+}
@@ -1,483 +0,0 @@
-package com.bencodez.votingplugin.bungee.velocity;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.bencodez.advancedcore.api.user.userstorage.mysql.api.queries.Query;
-import com.bencodez.advancedcore.api.user.userstorage.sql.Column;
-import com.bencodez.advancedcore.api.user.userstorage.sql.DataType;
-
-public class BungeeMySQL {
-	private List<String> columns = Collections.synchronizedList(new ArrayList<String>());
-
-	private List<String> intColumns = new ArrayList<String>();
-
-	// private HashMap<String, ArrayList<Column>> table;
-
-	// ConcurrentMap<String, ArrayList<Column>> table = new
-	// ConcurrentHashMap<String, ArrayList<Column>>();
-
-	private com.bencodez.advancedcore.api.user.userstorage.mysql.api.MySQL mysql;
-
-	private String name;
-
-	private Object object2 = new Object();
-
-	private Object object3 = new Object();
-
-	private Object object4 = new Object();
-
-	private Set<String> uuids = Collections.synchronizedSet(new HashSet<String>());
-
-	public BungeeMySQL(VotingPluginVelocity plugin, String tableName, Config config) {
-		String tablePrefix = config.getString(config.getNode("Prefix"), "");
-		String hostName = config.getString(config.getNode("Host"), "");
-		int port = config.getInt(config.getNode("Port"), 0);
-		String user = config.getString(config.getNode("Username"), "");
-		String pass = config.getString(config.getNode("Password"), "");
-		String database = config.getString(config.getNode("Database"), "");
-		long lifeTime = config.getLong(config.getNode("MaxLifeTime"), -1);
-		int maxThreads = config.getInt(config.getNode("MaxConnections"), 1);
-		String str = config.getString(config.getNode("Line"), "");
-		if (maxThreads < 1) {
-			maxThreads = 1;
-		}
-		boolean useSSL = config.getBoolean(config.getNode("UseSSL"), false);
-		boolean publicKeyRetrieval = config.getBoolean(config.getNode("PublicKeyRetrieval"), false);
-		name = config.getString(config.getNode("Name"), "");
-		if (!name.isEmpty()) {
-			name = tableName;
-		}
-
-		if (tablePrefix != null) {
-			name = tablePrefix + tableName;
-		}
-		mysql = new com.bencodez.advancedcore.api.user.userstorage.mysql.api.MySQL(maxThreads) {
-
-			@Override
-			public void debug(SQLException e) {
-				if (plugin.getConfig().getDebug()) {
-					e.printStackTrace();
-				}
-			}
-
-			@Override
-			public void severe(String string) {
-				plugin.getLogger().error(string);
-			}
-		};
-		if (!mysql.connect(hostName, "" + port, user, pass, database, useSSL, lifeTime, str, publicKeyRetrieval)) {
-
-		}
-		try {
-			Query q = new Query(mysql, "USE " + database + ";");
-			q.executeUpdateAsync();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-		String sql = "CREATE TABLE IF NOT EXISTS " + getName() + " (";
-		sql += "uuid VARCHAR(37),";
-		sql += "PRIMARY KEY ( uuid )";
-		sql += ");";
-		Query query;
-		try {
-			query = new Query(mysql, sql);
-
-			query.executeUpdateAsync();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-
-		loadData();
-
-		// tempoary to improve performance from old tables
-		// addToQue("ALTER TABLE " + getName() + " MODIFY uuid VARCHAR(37);");
-		alterColumnType("uuid", "VARCHAR(37)");
-	}
-
-	public void addColumn(String column, DataType dataType) {
-		synchronized (object3) {
-			String sql = "ALTER TABLE " + getName() + " ADD COLUMN " + column + " text" + ";";
-			try {
-				Query query = new Query(mysql, sql);
-				query.executeUpdate();
-
-				getColumns().add(column);
-			} catch (SQLException e) {
-				e.printStackTrace();
-			}
-
-		}
-	}
-
-	public void alterColumnType(String column, String newType) {
-		checkColumn(column, DataType.STRING);
-		if (newType.contains("INT")) {
-			try {
-				new Query(mysql, "UPDATE " + getName() + " SET " + column + " = '0' where trim(coalesce(" + column
-						+ ", '')) = '';").executeUpdateAsync();
-			} catch (SQLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			;
-			if (!intColumns.contains(column)) {
-				intColumns.add(column);
-			}
-		}
-		try {
-			new Query(mysql, "ALTER TABLE " + getName() + " MODIFY " + column + " " + newType + ";")
-					.executeUpdateAsync();
-		} catch (SQLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public void checkColumn(String column, DataType dataType) {
-		synchronized (object4) {
-			if (!getColumns().contains(column)) {
-				if (!getColumnsQueury().contains(column)) {
-					addColumn(column, dataType);
-				}
-			}
-		}
-	}
-
-	public void clearCache() {
-		clearCacheBasic();
-	}
-
-	public void clearCacheBasic() {
-		columns.clear();
-		columns.addAll(getColumnsQueury());
-		uuids.clear();
-		uuids.addAll(getUuidsQuery());
-	}
-
-	public void close() {
-		mysql.disconnect();
-	}
-
-	public boolean containsKeyQuery(String index) {
-		String sqlStr = "SELECT uuid FROM " + getName() + ";";
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(sqlStr)) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query query = new Query(mysql, sql); ResultSet rs = query.executeQuery();
-			 */
-			while (rs.next()) {
-				if (rs.getString("uuid").equals(index)) {
-					rs.close();
-					return true;
-				}
-			}
-			rs.close();
-		} catch (SQLException ex) {
-			ex.printStackTrace();
-		}
-		return false;
-	}
-
-	public List<String> getColumns() {
-		if (columns == null || columns.size() == 0) {
-			loadData();
-		}
-		return columns;
-	}
-
-	public ArrayList<String> getColumnsQueury() {
-		ArrayList<String> columns = new ArrayList<String>();
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement("SELECT * FROM " + getName() + ";")) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query query = new Query(mysql, "SELECT * FROM " + getName() + ";"); ResultSet
-			 * rs = query.executeQuery();
-			 */
-
-			ResultSetMetaData metadata = rs.getMetaData();
-			int columnCount = 0;
-			if (metadata != null) {
-				columnCount = metadata.getColumnCount();
-
-				for (int i = 1; i <= columnCount; i++) {
-					String columnName = metadata.getColumnName(i);
-					columns.add(columnName);
-				}
-				rs.close();
-				return columns;
-			}
-			rs.close();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return columns;
-
-	}
-
-	public ArrayList<Column> getExactQuery(Column column) {
-		ArrayList<Column> result = new ArrayList<>();
-		String query = "SELECT * FROM " + getName() + " WHERE `" + column.getName() + "`='"
-				+ column.getValue().toString() + "';";
-
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(query)) {
-			ResultSet rs = sql.executeQuery();
-
-			/*
-			 * Query sql = new Query(mysql, query); sql.setParameter(1,
-			 * column.getValue().toString()); ResultSet rs = sql.executeQuery();
-			 */
-			if (rs.next()) {
-				for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
-					String columnName = rs.getMetaData().getColumnLabel(i);
-					Column rCol = null;
-					if (intColumns.contains(columnName)) {
-						rCol = new Column(columnName, DataType.INTEGER);
-					} else {
-						rCol = new Column(columnName, DataType.STRING);
-					}
-					// System.out.println(i + " " +
-					// rs.getMetaData().getColumnLabel(i));
-					rCol.setValue(rs.getString(i));
-					// System.out.println(rCol.getValue());
-					result.add(rCol);
-				}
-			}
-			rs.close();
-			return result;
-		} catch (SQLException e) {
-			e.printStackTrace();
-		} catch (ArrayIndexOutOfBoundsException e) {
-		}
-
-		for (String col : getColumns()) {
-			result.add(new Column(col, DataType.STRING));
-		}
-		return result;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public ArrayList<String> getNamesQuery() {
-		ArrayList<String> uuids = new ArrayList<String>();
-
-		checkColumn("PlayerName", DataType.STRING);
-		ArrayList<Column> rows = getRowsNameQuery();
-		if (rows != null) {
-			for (Column c : rows) {
-				uuids.add((String) c.getValue());
-			}
-		}
-
-		return uuids;
-	}
-
-	public ArrayList<Column> getRowsNameQuery() {
-		ArrayList<Column> result = new ArrayList<Column>();
-		String sqlStr = "SELECT PlayerName FROM " + getName() + ";";
-
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(sqlStr)) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query query = new Query(mysql, sql); ResultSet rs = query.executeQuery();
-			 */
-
-			while (rs.next()) {
-				Column rCol = new Column("PlayerName", rs.getString("PlayerName"), DataType.STRING);
-				result.add(rCol);
-			}
-			sql.close();
-			conn.close();
-		} catch (SQLException e) {
-		}
-
-		return result;
-	}
-
-	public ArrayList<Column> getRowsQuery() {
-		ArrayList<Column> result = new ArrayList<Column>();
-		String sqlStr = "SELECT uuid FROM " + getName() + ";";
-
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(sqlStr)) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query query = new Query(mysql, sql); ResultSet rs = query.executeQuery();
-			 */
-
-			while (rs.next()) {
-				Column rCol = new Column("uuid", rs.getString("uuid"), DataType.STRING);
-				result.add(rCol);
-			}
-			rs.close();
-		} catch (SQLException e) {
-			return null;
-		}
-
-		return result;
-	}
-
-	public String getUUID(String playerName) {
-		String query = "SELECT uuid FROM " + getName() + " WHERE " + "PlayerName" + "='" + playerName + "';";
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(query)) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query sql = new Query(mysql, query); ResultSet rs = sql.executeQuery();
-			 */
-			if (rs.next()) {
-				String uuid = rs.getString("uuid");
-				if (uuid != null && !uuid.isEmpty()) {
-					rs.close();
-					return uuid;
-				}
-			}
-			rs.close();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		} catch (ArrayIndexOutOfBoundsException e) {
-		}
-		return null;
-	}
-
-	public Set<String> getUuids() {
-		if (uuids == null || uuids.size() == 0) {
-			uuids.clear();
-			uuids.addAll(getUuidsQuery());
-			return uuids;
-		}
-		return uuids;
-	}
-
-	public ArrayList<String> getUuidsQuery() {
-		ArrayList<String> uuids = new ArrayList<String>();
-
-		ArrayList<Column> rows = getRowsQuery();
-		for (Column c : rows) {
-			uuids.add((String) c.getValue());
-		}
-
-		return uuids;
-	}
-
-	public void insert(String index, String column, Object value, DataType dataType) {
-		insertQuery(index, Arrays.asList(new Column(column, value, dataType)));
-	}
-
-	public void insertQuery(String index, List<Column> cols) {
-		String query = "INSERT IGNORE " + getName() + " ";
-
-		query += "set uuid='" + index + "', ";
-
-		for (int i = 0; i < cols.size(); i++) {
-			Column col = cols.get(i);
-			if (i == cols.size() - 1) {
-				query += col.getName() + "='" + col.getValue().toString() + "';";
-			} else {
-				query += col.getName() + "='" + col.getValue().toString() + "', ";
-			}
-
-		}
-
-		try {
-			uuids.add(index);
-			new Query(mysql, query).executeUpdateAsync();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	public boolean isIntColumn(String key) {
-		return intColumns.contains(key);
-	}
-
-	public void loadData() {
-		columns = getColumnsQueury();
-	}
-
-	public void update(String index, List<Column> cols, boolean queue) {
-		for (Column col : cols) {
-			checkColumn(col.getName(), col.getDataType());
-		}
-		if (getUuids().contains(index)) {
-			synchronized (object2) {
-
-				String query = "UPDATE " + getName() + " SET ";
-
-				for (int i = 0; i < cols.size(); i++) {
-					Column col = cols.get(i);
-					if (i == cols.size() - 1) {
-						if (col.getDataType().equals(DataType.STRING)) {
-							query += col.getName() + "='" + col.getValue().toString() + "';";
-						} else {
-							query += col.getName() + "=" + col.getValue().toString() + ";";
-						}
-					} else {
-						if (col.getDataType().equals(DataType.STRING)) {
-							query += col.getName() + "='" + col.getValue().toString() + "', ";
-						} else {
-							query += col.getName() + "=" + col.getValue().toString() + ", ";
-						}
-
-					}
-				}
-				query += " WHERE `uuid`=";
-				query += "'" + index + "';";
-
-				try {
-					Query q = new Query(mysql, query);
-					q.executeUpdateAsync();
-				} catch (SQLException e) {
-					e.printStackTrace();
-				}
-			}
-		} else {
-			insertQuery(index, cols);
-		}
-	}
-
-	public void update(String index, String column, Object value, DataType dataType) {
-		checkColumn(column, dataType);
-		if (getUuids().contains(index)) {
-			synchronized (object2) {
-				String query = "UPDATE " + getName() + " SET ";
-
-				if (dataType == DataType.STRING) {
-					query += column + "='" + value.toString() + "'";
-				} else {
-					query += column + "=" + value;
-
-				}
-				query += " WHERE `uuid`=";
-				query += "'" + index + "';";
-
-				try {
-					Query q = new Query(mysql, query);
-					q.executeUpdate();
-				} catch (SQLException e) {
-					e.printStackTrace();
-				}
-			}
-
-		} else {
-			insert(index, column, value, dataType);
-		}
-
-	}
-}
@@ -2,12 +2,18 @@ package com.bencodez.votingplugin.bungee.velocity;

 import java.io.File;
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+import com.bencodez.simpleapi.file.velocity.VelocityYMLFile;
+import com.bencodez.votingplugin.bungee.proxy.VotingPluginProxyConfig;

 import ninja.leaping.configurate.ConfigurationNode;

-public class Config extends VelocityYMLFile {
+public class Config extends VelocityYMLFile implements VotingPluginProxyConfig {

 	public Config(File file) {
 		super(file);
@@ -17,8 +23,12 @@ public class Config extends VelocityYMLFile {
 		return getBoolean(getNode("AllowUnJoined"), false);
 	}

+	public String getBedrockPlayerPrefix() {
+		return getString(getNode("BedrockPlayerPrefix"), ".");
+	}
+
 	public List<String> getBlockedServers() {
-		return getStringList(getNode("BlockedServers"), new ArrayList<String>());
+		return getStringList(getNode("BlockedServers"), new ArrayList<>());
 	}

 	public boolean getBroadcast() {
@@ -49,35 +59,230 @@ public class Config extends VelocityYMLFile {
 		return getString(getNode("FallBackServer"), "");
 	}

-	public long getLong(ConfigurationNode node, long def) {
-		return node.getLong(def);
+	public boolean getGlobalDataEnabled() {
+		return getBoolean(getNode("GlobalData", "Enabled"), false);
+	}
+
+	public boolean getGlobalDataUseMainMySQL() {
+		return getBoolean(getNode("GlobalData", "UseMainMySQL"), true);
+	}
+
+	public int getLimitVotePoints() {
+		return getInt(getNode("LimitVotePoints"), -1);
+	}
+
+	public int getMaxAmountOfVotesPerDay() {
+		return getInt(getNode("MaxAmountOfVotesPerDay"), -1);
+	}
+
+	public String getMultiProxyMethod() {
+		return getString(getNode("MultiProxyMethod"), "SOCKET");
+	}
+
+	public boolean getMultiProxyOneGlobalReward() {
+		return getBoolean(getNode("MultiProxyOneGlobalReward"), false);
+	}
+
+	public String getMultiProxyRedisHost() {
+		return getString(getNode("MultiProxyRedis", "Host"), "");
+	}
+
+	public String getMultiProxyRedisPassword() {
+		return getString(getNode("MultiProxyRedis", "Password"), "");
+	}
+
+	public int getMultiProxyRedisPort() {
+		return getInt(getNode("MultiProxyRedis", "Port"), 6379);
+	}
+
+	public boolean getMultiProxyRedisUseExistingConnection() {
+		return getBoolean(getNode("MultiProxyRedis", "UseExistingConnection"), false);
+	}
+
+	public String getMultiProxyRedisUsername() {
+		return getString(getNode("MultiProxyRedis", "Username"), "");
+	}
+
+	public @NonNull List<String> getMultiProxyServers() {
+		return getChildrenAsList(getNode("MultiProxyServers"));
+	}
+
+	public List<String> getChildrenAsList(ConfigurationNode config) {
+		List<String> children = new ArrayList<>();
+		if (config != null) {
+			for (Map.Entry<Object, ? extends ConfigurationNode> entry : config.getChildrenMap().entrySet()) {
+				children.add(entry.getKey().toString());
+			}
+		}
+		return children;
+	}
+
+	public Map<String, Object> getMultiProxyServersConfiguration(String s) {
+		return configToMap(getNode("MultiProxyServers", s));
+	}
+
+	public String getMultiProxySocketHostHost() {
+		return getString(getNode("MultiProxySocketHost", "Host"), "");
+	}
+
+	public int getMultiProxySocketHostPort() {
+		return getInt(getNode("MultiProxySocketHost", "Port"), 1297);
+	}
+
+	public boolean getMultiProxySupport() {
+		return getBoolean(getNode("MultiProxySupport"), false);
 	}

 	public ConfigurationNode getMysqlNode() {
 		return getNode("MySQL");
 	}

+	public boolean getOnlineMode() {
+		return getBoolean(getNode("OnlineMode"), true);
+	}
+
 	public int getPointsOnVote() {
 		return getInt(getNode("PointsOnVote"), 1);
 	}

+	public boolean getPrimaryServer() {
+		return getBoolean(getNode("PrimaryServer"), false);
+	}
+
+	public String getProxyServerName() {
+		return getString(getNode("ProxyServerName"), "SOCKET");
+	}
+
+	public List<String> getProxyServers() {
+		return getStringList(getNode("ProxyServers"), new ArrayList<>());
+	}
+
+	public String getRedisHost() {
+		return getString(getNode("Redis", "Host"), "");
+	}
+
+	public String getRedisPassword() {
+		return getString(getNode("Redis", "Password"), "");
+	}
+
+	public int getRedisPort() {
+		return getInt(getNode("Redis", "Port"), 6379);
+	}
+
+	public String getRedisPrefix() {
+		return getString(getNode("Redis", "Prefix"), "");
+	}
+
+	public String getRedisUsername() {
+		return getString(getNode("Redis", "Username"), "");
+	}
+
 	public boolean getSendVotesToAllServers() {
 		return getBoolean(getNode("SendVotesToAllServers"), true);
 	}

-	public ConfigurationNode getSpigotServerConfiguration(String s) {
-		return getNode("SpigotServers", s);
+	public Map<String, Object> getSpigotServerConfiguration(String s) {
+		return configToMap(getNode("SpigotServers", s));
 	}

-	public Collection<String> getSpigotServers() {
-		ArrayList<String> list = new ArrayList<String>();
-		for (ConfigurationNode conf : getNode("SpigotServers").getChildrenList()) {
-			list.add(conf.getKey().toString());
+	public Map<String, Object> configToMap(ConfigurationNode config) {
+		Map<String, Object> map = new HashMap<>();
+		if (config != null) {
+			for (Map.Entry<Object, ? extends ConfigurationNode> entry : config.getChildrenMap().entrySet()) {
+				map.put(entry.getKey().toString(), entry.getValue().getValue());
+			}
 		}
-		return list;
+		return map;
+	}
+
+	public @NonNull List<String> getSpigotServers() {
+		return getChildrenAsList(getNode("SpigotServers"));
+	}
+
+	public boolean getStoreMonthTotalsWithDate() {
+		return getBoolean(getNode("StoreMonthTotalsWithDate"), false);
+	}
+
+	public boolean getTimeChangeFailSafeBypass() {
+		return getBoolean(getNode("TimeChangeFailSafeBypass"), false);
+	}
+
+	public boolean getUseMonthDateTotalsAsPrimaryTotal() {
+		return getBoolean(getNode("UseMonthDateTotalsAsPrimaryTotal"), false);
+	}
+
+	public boolean getUUIDLookup() {
+		return getBoolean(getNode("UUIDLookup"), true);
+	}
+
+	public int getVoteCacheTime() {
+		return getInt(getNode("VoteCacheTime"), -1);
+	}
+
+	public String getVotePartyBroadcast() {
+		return getString(getVotePartyNode().getNode("Broadcast"), "");
+	}
+
+	public List<String> getVotePartyBungeeCommands() {
+		return getStringList(getVotePartyNode().getNode("BungeeCommands"), new ArrayList<>());
+	}
+
+	public boolean getVotePartyEnabled() {
+		return getBoolean(getVotePartyNode().getNode("Enabled"), false);
+	}
+
+	public int getVotePartyIncreaseVotesRequired() {
+		return getInt(getVotePartyNode().getNode("IncreaseVotesRequired"), 0);
+	}
+
+	public ConfigurationNode getVotePartyNode() {
+		return getNode("VoteParty");
+	}
+
+	public boolean getVotePartySendToAllServers() {
+		return getBoolean(getVotePartyNode().getNode("SendToAllServers"), false);
+	}
+
+	public List<String> getVotePartyServersToSend() {
+		return getStringList(getVotePartyNode().getNode("ServersToSend"), new ArrayList<>());
+	}
+
+	public int getVotePartyVotesRequired() {
+		return getInt(getVotePartyNode().getNode("VotesRequired"), 100);
 	}

 	public boolean getWaitForUserOnline() {
 		return getBoolean(getNode("WaitForUserOnline"), false);
 	}
+
+	public List<String> getWhiteListedServers() {
+		return getStringList(getNode("WhiteListedServers"), new ArrayList<>());
+	}
+
+	@Override
+	public int getTimeHourOffSet() {
+		return getInt(getNode("TimeHourOffSet"), 0);
+	}
+
+	@Override
+	public String getTimeZone() {
+		return getString(getNode("TimeZone"), "");
+	}
+
+	@Override
+	public void load() {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public String getPluginMessageChannel() {
+		return getString(getNode("PluginMessageChannel"), "vp:vp");
+	}
+
+	@Override
+	public boolean getPluginMessageEncryption() {
+		return getBoolean(getNode("PluginMessageEncryption"), false);
+	}
+
 }
@@ -2,9 +2,10 @@ package com.bencodez.votingplugin.bungee.velocity;

 import java.io.File;

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

-public class NonVotedPlayersCache extends VelocityYMLFile {
+public class NonVotedPlayersCache extends VelocityJSONFile {

 	private VotingPluginVelocity plugin;

@@ -14,17 +15,23 @@ public class NonVotedPlayersCache extends VelocityYMLFile {
 	}

 	public void addPlayer(Player player) {
-		if (!plugin.getMysql().containsKeyQuery(player.getUniqueId().toString())) {
+		if (!plugin.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(player.getUniqueId().toString())) {
 			addPlayer(player.getUniqueId().toString(), player.getUsername());
 		}
 	}

-	private void addPlayer(String uuid, String playerName) {
+	public void addPlayer(String uuid, String playerName) {
 		getNode("NonVotedPlayers", playerName, "UUID").setValue(uuid);
 		getNode("NonVotedPlayers", playerName, "LastTime").setValue(System.currentTimeMillis());
 		save();
 	}

+	public void addPlayerCheck(String uuid, String playerName) {
+		if (!plugin.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(uuid)) {
+			addPlayer(uuid, playerName);
+		}
+	}
+
 	public void check() {
 		for (String player : getKeys(getNode("NonVotedPlayers"))) {
 			long time = getNode("NonVotedPlayers", player, "LastTime").getLong(0);
@@ -33,7 +40,7 @@ public class NonVotedPlayersCache extends VelocityYMLFile {
 			} else {
 				String uuid = getNode("NonVotedPlayers", player, "UUID").getString("");
 				if (!uuid.isEmpty()) {
-					if (plugin.getMysql().containsKeyQuery(uuid)) {
+					if (plugin.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(uuid)) {
 						remove(player);
 					}
 				} else {
@@ -1,98 +0,0 @@
-package com.bencodez.votingplugin.bungee.velocity;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.google.common.reflect.TypeToken;
-
-import lombok.Getter;
-import ninja.leaping.configurate.ConfigurationNode;
-import ninja.leaping.configurate.objectmapping.ObjectMappingException;
-import ninja.leaping.configurate.yaml.YAMLConfigurationLoader;
-
-public class VelocityYMLFile {
-	@Getter
-	private ConfigurationNode conf;
-	@Getter
-	private File file;
-	private YAMLConfigurationLoader loader;
-
-	public VelocityYMLFile(File file) {
-
-		this.file = file;
-		if (!file.exists()) {
-			try {
-				file.getParentFile().mkdirs();
-				file.createNewFile();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		loader = YAMLConfigurationLoader.builder().setPath(file.toPath()).build();
-
-		try {
-			conf = loader.load();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	public boolean getBoolean(ConfigurationNode node, boolean def) {
-		return node.getBoolean(def);
-	}
-
-	public ConfigurationNode getData() {
-		return conf;
-	}
-
-	public int getInt(ConfigurationNode node, int def) {
-		return node.getInt(def);
-	}
-
-	public ArrayList<String> getKeys(ConfigurationNode node) {
-		ArrayList<String> keys = new ArrayList<String>();
-		for (ConfigurationNode key : node.getChildrenList()) {
-			keys.add(key.getKey().toString());
-		}
-		return keys;
-	}
-
-	public ConfigurationNode getNode(Object... path) {
-		return getData().getNode(path);
-	}
-
-	public String getString(ConfigurationNode node, String def) {
-		return node.getString(def);
-	}
-
-	public List<String> getStringList(ConfigurationNode node, ArrayList<String> def) {
-		try {
-			return node.getList(TypeToken.of(String.class), def);
-		} catch (ObjectMappingException e) {
-			e.printStackTrace();
-			return def;
-		}
-	}
-
-	public void reload() {
-		loader = YAMLConfigurationLoader.builder().setPath(file.toPath()).build();
-
-		try {
-			conf = loader.load();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void save() {
-		try {
-			loader.save(conf);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-}
@@ -3,45 +3,48 @@ package com.bencodez.votingplugin.bungee.velocity;
 import java.io.File;
 import java.util.Collection;

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

 import ninja.leaping.configurate.ConfigurationNode;

-public class VoteCache extends VelocityYMLFile {
+public class VoteCache extends VelocityJSONFile {

 	public VoteCache(File file) {
 		super(file);
 	}

+	public void addTimedVote(int num, VoteTimeQueue voteTimedQueue) {
+		getNode("TimedVoteCache", "" + num, "Name").setValue(voteTimedQueue.getName());
+		getNode("TimedVoteCache", "" + num, "Service").setValue(voteTimedQueue.getService());
+		getNode("TimedVoteCache", "" + num, "Time").setValue(voteTimedQueue.getTime());
+	}
+
 	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());
-
-		save();
+		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 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());
-
-		save();
+		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() {
 		getNode("VoteCache").setValue(null);
 		getNode("OnlineCache").setValue(null);
+		getNode("TimedVoteCache").setValue(null);
 		save();
 	}

@@ -62,11 +65,43 @@ public class VoteCache extends VelocityYMLFile {
 	}

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

 	public ConfigurationNode getServerVotes(String server, String num) {
 		return getNode("VoteCache", server, num);
 	}

+	public Collection<String> getTimedVoteCache() {
+		return getKeys(getNode("TimedVoteCache"));
+	}
+
+	public ConfigurationNode getTimedVoteCache(String name) {
+		return getNode("TimedVoteCache", name);
+	}
+
+	public int getVotePartyCache(String server) {
+		return getNode("VoteParty").getNode("Cache").getNode(server).getInt(0);
+	}
+
+	public int getVotePartyCurrentVotes() {
+		return getInt(getNode("VoteParty").getNode("CurrentVotes"), 0);
+	}
+
+	public int getVotePartyInreaseVotesRequired() {
+		return getInt(getNode("VoteParty").getNode("IncreaseVotes"), 0);
+	}
+
+	public void setVotePartyCache(String server, int amount) {
+		getNode("VoteParty").getNode("Cache").getNode(server).setValue(amount);
+	}
+
+	public void setVotePartyCurrentVotes(int amount) {
+		getNode("VoteParty").getNode("CurrentVotes").setValue(amount);
+	}
+
+	public void setVotePartyInreaseVotesRequired(int amount) {
+		getNode("VoteParty").getNode("IncreaseVotes").setValue(amount);
+	}
+
 }
@@ -0,0 +1,32 @@
+package com.bencodez.votingplugin.bungee.velocity;
+
+import com.velocitypowered.api.event.Subscribe;
+import com.vexsoftware.votifier.velocity.event.VotifierEvent;
+
+public class VoteEventVelocity {
+	private VotingPluginVelocity plugin;
+
+	public VoteEventVelocity(VotingPluginVelocity plugin) {
+		this.plugin = plugin;
+	}
+
+	@Subscribe
+	public void onVotifierEvent(VotifierEvent event) {
+		final String serviceSiteVote = event.getVote().getServiceName();
+		final String name = event.getVote().getUsername();
+		plugin.getTimer().execute(new Runnable() {
+
+			@Override
+			public void run() {
+				String serviceSite = serviceSiteVote;
+				plugin.getLogger().info("Vote received " + name + " from service site " + serviceSite);
+				if (serviceSite.isEmpty()) {
+					serviceSite = "Empty";
+				}
+
+				plugin.getVotingPluginProxy().vote(name, serviceSite, true, false, 0, null, null);
+			}
+		});
+
+	}
+}
@@ -1,11 +1,10 @@
 package com.bencodez.votingplugin.bungee.velocity;

-import com.bencodez.votingplugin.bungee.BungeeMethod;
+import com.bencodez.votingplugin.bungee.proxy.VotingPluginProxyCommand;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.command.SimpleCommand;

 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;

 public class VotingPluginVelocityCommand implements SimpleCommand {
 	private VotingPluginVelocity plugin;
@@ -20,55 +19,29 @@ public class VotingPluginVelocityCommand implements SimpleCommand {
 		// Get the arguments after the command alias
 		String[] args = invocation.arguments();

-		if (args.length > 0) {
-			if (args[0].equalsIgnoreCase("reload")) {
-				plugin.reload(false);
-				source.sendMessage(Component.text("Reloading VotingPluginBungee").color(NamedTextColor.AQUA));
-			}
-			if (args[0].equalsIgnoreCase("reloadmysql")) {
-				plugin.reload(true);
-				source.sendMessage(Component.text("Reloading VotingPluginBungee MySQL").color(NamedTextColor.AQUA));
-			}
-			if (args[0].equalsIgnoreCase("vote")) {
-				if (args.length >= 2) {
-					String user = args[1];
-					String site = args[2];
-					plugin.vote(user, site, false);
-					source.sendMessage(Component.text("Sending vote").color(NamedTextColor.AQUA));
-				}
-			}
-			if (args[0].equalsIgnoreCase("status")) {
-				if (plugin.getMethod().equals(BungeeMethod.SOCKETS)) {
-					source.sendMessage(
-							Component.text("Checking status, waiting for response, check console, method: sockets")
-									.color(NamedTextColor.AQUA));
-					plugin.status();
-				} else if (plugin.getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
-					source.sendMessage(Component
-							.text("Checking status, waiting for response, check console, method: pluginmessaging")
-							.color(NamedTextColor.AQUA));
-					plugin.status();
-				} else {
-					source.sendMessage(Component.text("Not using socket/pluginmessage method, command unavailable")
-							.color(NamedTextColor.AQUA));
-				}
-			}
-			if (args[0].equalsIgnoreCase("help")) {
-				String[] msg = new String[4];
-				msg[0] = "votingpluginbungee reload - Reload plugin";
-				msg[1] = "votingpluginbungee reloadmysql - Reload plugin including mysql";
-				msg[2] = "votingpluginbungee vote (player) (servicesite) - Send bungee vote";
-				msg[3] = "votingpluginbungee status - Check socket connection status";
-				for (String m : msg) {
-					source.sendMessage(Component.text(m).color(NamedTextColor.AQUA));
-				}
-
-			}
+		String result = new VotingPluginProxyCommand(plugin.getVotingPluginProxy()).execute(args);
+		if (result != null) {
+			source.sendMessage(Component.text(result));
 		}
+
 	}

 	@Override
 	public boolean hasPermission(final Invocation invocation) {
 		return invocation.source().hasPermission("votingpluginbungee.admin");
 	}
+
+	public boolean isInt(String st) {
+		if (st == null) {
+			return false;
+		}
+		try {
+			@SuppressWarnings("unused")
+			int num = Integer.parseInt(st);
+			return true;
+
+		} catch (NumberFormatException ex) {
+			return false;
+		}
+	}
 }
@@ -1,11 +1,11 @@
 package com.bencodez.votingplugin.commands.executers;

-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

 import com.bencodez.advancedcore.api.command.CommandHandler;
+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(ChatColor.RED + "No valid arguments, see /adminvote help!");
+		sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));

 		return true;
 	}
@@ -2,13 +2,13 @@ package com.bencodez.votingplugin.commands.executers;

 import java.util.ArrayList;

-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

 import com.bencodez.advancedcore.api.command.CommandHandler;
-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
@@ -40,15 +40,15 @@ public class CommandAliases implements CommandExecutor {
 	@Override
 	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {

-		ArrayList<String> argsNew = new ArrayList<String>();
+		ArrayList<String> argsNew = new ArrayList<>();
 		argsNew.add(cmdHandle.getArgs()[0]);
 		for (String arg : args) {
 			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>();
+		ArrayList<CommandHandler> handles = new ArrayList<>();
 		if (adminCommand) {
 			handles.addAll(plugin.getAdminVoteCommand());
 		} else {
@@ -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;
 							}
@@ -91,9 +91,9 @@ public class CommandAliases implements CommandExecutor {

 		// invalid command
 		if (adminCommand) {
-			sender.sendMessage(ChatColor.RED + "No valid arguments, see /adminvote help!");
+			sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));
 		} else {
-			sender.sendMessage(ChatColor.RED + "No valid arguments, see /vote help!");
+			sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
 		}
 		return true;
 	}
@@ -1,11 +1,11 @@
 package com.bencodez.votingplugin.commands.executers;

-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

 import com.bencodez.advancedcore.api.command.CommandHandler;
+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(ChatColor.RED + "No valid arguments, see /vote help!");
+		sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
 		return true;
 	}

@@ -19,16 +19,15 @@ 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.rewards.RewardHandler;
 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.AdminVoteBungeeSettings;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVoteVoteParty;
 import com.bencodez.votingplugin.commands.gui.admin.cumulative.AdminVoteCumulative;
 import com.bencodez.votingplugin.commands.gui.admin.milestones.AdminVoteMilestones;
@@ -50,7 +49,7 @@ public class AdminGUI {
 	 * @return ArrayList of buttons
 	 */
 	public ArrayList<BInventoryButton> adminGUIButtons() {
-		ArrayList<BInventoryButton> buttons = new ArrayList<BInventoryButton>();
+		ArrayList<BInventoryButton> buttons = new ArrayList<>();
 		buttons.add(new BInventoryButton("&cVoteSites",
 				new String[] { "&cOnly enabled sites are listed in this section", "&cMiddle Click to create" },
 				new ItemStack(Material.STONE)) {
@@ -66,6 +65,7 @@ public class AdminGUI {
 							plugin.getConfigVoteSites().generateVoteSite(value);
 							player.sendMessage("Generated site");
 							plugin.reload();
+							openAdminGUIVoteSiteSite(player, plugin.getVoteSite(value, true));
 						}
 					});
 				} else {
@@ -110,7 +110,7 @@ public class AdminGUI {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("FirstVote"));
+						plugin.getRewardHandler().getDirectlyDefined("FirstVote"));
 			}
 		});
 		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit FirstVoteToday reward")) {
@@ -118,7 +118,7 @@ public class AdminGUI {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("FirstVoteToday"));
+						plugin.getRewardHandler().getDirectlyDefined("FirstVoteToday"));
 			}
 		});

@@ -127,7 +127,16 @@ public class AdminGUI {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("AllSites"));
+						plugin.getRewardHandler().getDirectlyDefined("AllSites"));
+			}
+		});
+
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit AlmostAllSites reward")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+						plugin.getRewardHandler().getDirectlyDefined("AlmostAllSites"));
 			}
 		});

@@ -136,7 +145,7 @@ public class AdminGUI {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("AnySiteRewards"));
+						plugin.getRewardHandler().getDirectlyDefined("AnySiteRewards"));
 			}
 		});

@@ -145,15 +154,53 @@ public class AdminGUI {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("EverySiteReward"));
+						plugin.getRewardHandler().getDirectlyDefined("EverySiteReward"));
 			}
 		});

-		buttons.add(new BInventoryButton(new ItemBuilder("GRASS_BLOCK").setName("&cEdit BungeeSettings.yml")) {
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit BungeeVotePartyRewards")) {

 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				new AdminVoteBungeeSettings(plugin, clickEvent.getPlayer()).open();
+				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+						plugin.getRewardHandler().getDirectlyDefined("BungeeVotePartyRewards"));
+			}
+		});
+
+		buttons.add(new BInventoryButton(
+				new ItemBuilder("GRASS_BLOCK").setName("&cEdit BungeeSettings.yml").addLoreLine("&aCurrently WIP")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ConfigEditor(plugin, plugin.getBungeeSettings()).open(clickEvent.getPlayer());
+			}
+		});
+
+		buttons.add(new BInventoryButton(
+				new ItemBuilder("GRASS_BLOCK").setName("&cEdit Config.yml").addLoreLine("&aCurrently WIP")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ConfigEditor(plugin, plugin.getConfigFile(), plugin.getOptions().getYmlConfig(),
+						plugin.getOptions().getClass()).open(clickEvent.getPlayer());
+			}
+		});
+
+		buttons.add(new BInventoryButton(
+				new ItemBuilder(Material.CHEST).setName("&cEdit GUI.yml").addLoreLine("&aCurrently WIP")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ConfigEditor(plugin, plugin.getGui()).open(clickEvent.getPlayer());
+			}
+		});
+
+		buttons.add(new BInventoryButton(
+				new ItemBuilder("GRASS_BLOCK").setName("&cEdit SpecialRewards.yml").addLoreLine("&aCurrently WIP")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ConfigEditor(plugin, plugin.getSpecialRewardsConfig()).open(clickEvent.getPlayer());
 			}
 		});

@@ -165,6 +212,17 @@ public class AdminGUI {
 			}

 		});
+
+		buttons.add(new BInventoryButton(
+				new ItemBuilder(Material.STONE, 1).setName("&cBackground task time").addLoreLine("&aClick to see")) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				event.getPlayer().sendMessage("Last background task time: " + plugin.getLastBackgroundTaskTimeTaken());
+			}
+
+		});
+
 		return buttons;
 	}

@@ -183,25 +241,27 @@ public class AdminGUI {
 		BInventory inv = new BInventory("VoteSites");
 		int count = 0;
 		for (VoteSite voteSite : plugin.getVoteSites()) {
-			ArrayList<String> lore = new ArrayList<String>();
+			ArrayList<String> lore = new ArrayList<>();
+			lore.add("Enabled: " + voteSite.isEnabled());
 			lore.add("Priority: " + voteSite.getPriority());
+
 			lore.add("Name: " + voteSite.getDisplayName());
 			lore.add("ServiceSite: " + voteSite.getServiceSite());
 			lore.add("VoteURL: " + voteSite.getVoteURL());
 			lore.add("VoteDelay: " + voteSite.getVoteDelay());
 			lore.add("VoteDelayMin: " + voteSite.getVoteDelayMin());

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

-				@Override
-				public void onClick(ClickEvent event) {
+						@Override
+						public void onClick(ClickEvent event) {

-					Player player = event.getWhoClicked();
-					openAdminGUIVoteSiteSite(player, voteSite);
+							Player player = event.getWhoClicked();
+							openAdminGUIVoteSiteSite(player, voteSite);

-				}
-			});
+						}
+					});
 			count++;
 		}
 		inv.openInventory(player);
@@ -221,7 +281,7 @@ public class AdminGUI {

 			@Override
 			public void onClick(ClickEvent event) {
-				ArrayList<String> playerNames = new ArrayList<String>();
+				ArrayList<String> playerNames = new ArrayList<>();
 				for (Player p : Bukkit.getOnlinePlayers()) {
 					playerNames.add(p.getName());
 				}
@@ -229,15 +289,21 @@ 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);
-							plugin.getServer().getPluginManager().callEvent(voteEvent);
+							plugin.getVoteTimer().submit(new Runnable() {
+
+								@Override
+								public void run() {
+									plugin.getServer().getPluginManager().callEvent(voteEvent);
+								}
+							});
 						}
 					}
-				}, ArrayUtils.getInstance().convert(playerNames)).usingMethod(InputMethod.INVENTORY)
-						.allowCustomOption(true).request(event.getWhoClicked());
+				}, ArrayUtils.convert(playerNames)).usingMethod(InputMethod.INVENTORY).allowCustomOption(true)
+						.request(event.getWhoClicked());
 			}
 		});

@@ -305,6 +371,17 @@ public class AdminGUI {
 			}
 		}));

+		inv.addButton(new EditGUIButton(new EditGUIValueNumber("VoteDelayDailyHour", voteSite.getVoteDelayDailyHour()) {
+
+			@Override
+			public void setValue(Player player, Number num) {
+				VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
+				String siteName = voteSite.getKey();
+				plugin.getConfigVoteSites().setVoteDelay(siteName, num.intValue());
+				plugin.reload();
+			}
+		}));
+
 		inv.addButton(new EditGUIButton(new EditGUIValueBoolean("Enabled", voteSite.isEnabled()) {

 			@Override
@@ -355,12 +432,35 @@ public class AdminGUI {

 				@Override
 				public void onClick(ClickEvent clickEvent) {
-					RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(), RewardHandler.getInstance()
+					RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(), plugin.getRewardHandler()
 							.getDirectlyDefined("VoteSites." + voteSite.getKey() + ".Rewards"));
 				}
 			});
 		}

+		if (voteSite.getSiteData().isList("CoolDownEndRewards")) {
+
+			inv.addButton(new EditGUIButton(new EditGUIValueList("CoolDownEndRewards",
+					voteSite.getSiteData().getStringList("CoolDownEndRewards")) {
+
+				@Override
+				public void setValue(Player p, ArrayList<String> rewards) {
+					VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
+					plugin.getConfigVoteSites().set(voteSite.getKey(), "CoolDownEndRewards", rewards);
+					plugin.reload();
+				}
+			}));
+		} else {
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.DISPENSER, 1).setName("&cCoolDownEndRewards")) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(), plugin.getRewardHandler()
+							.getDirectlyDefined("VoteSites." + voteSite.getKey() + ".CoolDownEndRewards"));
+				}
+			});
+		}
+
 		inv.openInventory(player);
 	}
 }
@@ -1,138 +0,0 @@
-package com.bencodez.votingplugin.commands.gui.admin;
-
-import java.util.ArrayList;
-
-import org.bukkit.command.CommandSender;
-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.editgui.EditGUI;
-import com.bencodez.advancedcore.api.inventory.editgui.EditGUIButton;
-import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueBoolean;
-import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueString;
-import com.bencodez.votingplugin.VotingPluginMain;
-
-public class AdminVoteBungeeSettings extends GUIHandler {
-
-	private VotingPluginMain plugin;
-
-	public AdminVoteBungeeSettings(VotingPluginMain plugin, CommandSender player) {
-		super(player);
-		this.plugin = plugin;
-	}
-
-	@Override
-	public ArrayList<String> getChat(CommandSender sender) {
-		return null;
-	}
-
-	@Override
-	public void onBook(Player player) {
-	}
-
-	@Override
-	public void onChat(CommandSender sender) {
-
-	}
-
-	@Override
-	public void onChest(Player player) {
-		EditGUI inv = new EditGUI("Edit BungeeSettings");
-		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.BungeeSettings");
-
-		inv.addButton(new EditGUIButton(
-				new EditGUIValueBoolean("UseBungeecord", plugin.getBungeeSettings().isUseBungeecoord()) {
-
-					@Override
-					public void setValue(Player player, boolean value) {
-						setPathData(getKey(), value);
-					}
-				}));
-
-		inv.addButton(
-				new EditGUIButton(new EditGUIValueString("BungeeMethod", plugin.getBungeeSettings().getBungeeMethod()) {
-
-					@Override
-					public void setValue(Player player, String value) {
-						setPathData(getKey(), value);
-					}
-				}).addOptions("PLUGINMESSAGING", "SOCKETS", "MYSQL"));
-
-		inv.addButton(
-				new EditGUIButton(new EditGUIValueBoolean("BungeeDebug", plugin.getBungeeSettings().isBungeeDebug()) {
-
-					@Override
-					public void setValue(Player player, boolean value) {
-						setPathData(getKey(), value);
-					}
-				}));
-
-		inv.addButton(new EditGUIButton(
-				new EditGUIValueBoolean("BungeeBroadcast", plugin.getBungeeSettings().isBungeeBroadcast()) {
-
-					@Override
-					public void setValue(Player player, boolean value) {
-						setPathData(getKey(), value);
-					}
-				}.addLore("Triggers a broadcast for the entire network, most cases it is best for this to be false")));
-
-		inv.addButton(new EditGUIButton(
-				new EditGUIValueBoolean("BungeeBroadcastAlways", plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-
-					@Override
-					public void setValue(Player player, boolean value) {
-						setPathData(getKey(), value);
-					}
-				}.addLore("Whether or not to broadcast on cached votes").addLore("PLUGINMESSAGING ONLY")));
-
-		inv.addButton(new EditGUIButton(
-				new EditGUIValueBoolean("PerServerRewards", plugin.getBungeeSettings().isPerServerRewards()) {
-
-					@Override
-					public void setValue(Player player, boolean value) {
-						setPathData(getKey(), value);
-					}
-				}));
-
-		inv.addButton(new EditGUIButton(
-				new EditGUIValueBoolean("PerServerPoints", plugin.getBungeeSettings().isPerServerPoints()) {
-
-					@Override
-					public void setValue(Player player, boolean value) {
-						setPathData(getKey(), value);
-					}
-				}));
-
-		inv.addButton(new EditGUIButton(
-				new EditGUIValueBoolean("TriggerVotifierEvent", plugin.getBungeeSettings().isTriggerVotifierEvent()) {
-
-					@Override
-					public void setValue(Player player, boolean value) {
-						setPathData(getKey(), value);
-					}
-				}));
-
-		inv.addButton(new EditGUIButton(new EditGUIValueString("Server", plugin.getBungeeSettings().getServer()) {
-
-			@Override
-			public void setValue(Player player, String value) {
-				setPathData(getKey(), value);
-			}
-		}.addLore("Server name as stated in proxy")));
-
-		inv.openInventory(player);
-	}
-
-	@Override
-	public void open() {
-		open(GUIMethod.CHEST);
-	}
-
-	private void setPathData(String path, Object value) {
-		plugin.getBungeeSettings().getData().set(path, value);
-		plugin.getBungeeSettings().saveData();
-		plugin.reload();
-	}
-
-}
@@ -21,7 +21,7 @@ public abstract class AdminVoteConfirmation extends GUIHandler {
 	private String title;

 	public AdminVoteConfirmation(VotingPluginMain plugin, CommandSender player, String title) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.title = title;
 	}
@@ -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;
@@ -21,7 +21,7 @@ public class AdminVoteHelp extends GUIHandler {
 	private VotingPluginMain plugin;

 	public AdminVoteHelp(VotingPluginMain plugin, CommandSender player, int page) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.page = page;
 	}
@@ -35,7 +35,7 @@ public class AdminVoteHelp extends GUIHandler {
 	 */
 	public ArrayList<TextComponent> adminHelp(CommandSender sender, int page) {
 		int pagesize = plugin.getConfigFile().getFormatPageSize();
-		ArrayList<TextComponent> msg = new ArrayList<TextComponent>();
+		ArrayList<TextComponent> msg = new ArrayList<>();
 		ArrayList<TextComponent> text = adminHelpText(sender);

 		int maxPage = text.size() / pagesize;
@@ -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));
@@ -61,17 +61,17 @@ public class AdminVoteHelp extends GUIHandler {
 	 * @return the array list
 	 */
 	public ArrayList<TextComponent> adminHelpText(CommandSender sender) {
-		ArrayList<TextComponent> msg = new ArrayList<TextComponent>();
-		HashMap<String, TextComponent> unsorted = new HashMap<String, TextComponent>();
+		ArrayList<TextComponent> msg = new ArrayList<>();
+		HashMap<String, TextComponent> unsorted = new HashMap<>();

-		boolean requirePerms = plugin.getConfigFile().getFormatCommandsVoteHelpRequirePermission();
+		boolean requirePerms = plugin.getConfigFile().isFormatCommandsVoteHelpRequirePermission();

 		for (CommandHandler cmdHandle : plugin.getAdminVoteCommand()) {
 			if (!requirePerms || cmdHandle.hasPerm(sender)) {
 				unsorted.put(cmdHandle.getHelpLineCommand("/adminvote"), cmdHandle.getHelpLine("/adminvote"));
 			}
 		}
-		ArrayList<String> unsortedList = new ArrayList<String>();
+		ArrayList<String> unsortedList = new ArrayList<>();
 		unsortedList.addAll(unsorted.keySet());
 		Collections.sort(unsortedList, String.CASE_INSENSITIVE_ORDER);
 		for (String cmd : unsortedList) {
@@ -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 {
@@ -22,13 +22,13 @@ public class AdminVotePerms extends GUIHandler {
 	private VotingPluginMain plugin;

 	public AdminVotePerms(VotingPluginMain plugin, CommandSender player, int page) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.page = page;
 	}

 	public AdminVotePerms(VotingPluginMain plugin, CommandSender player, int page, String playerName) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.page = page;
 		this.playerName = playerName;
@@ -40,7 +40,7 @@ public class AdminVotePerms extends GUIHandler {
 	}

 	public String[] listPerms(CommandSender sender) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();

 		for (CommandHandler handle : plugin.getVoteCommand()) {
 			if (sender instanceof Player) {
@@ -100,7 +100,7 @@ public class AdminVotePerms extends GUIHandler {
 			maxPage++;
 		}

-		ArrayList<String> text = new ArrayList<String>();
+		ArrayList<String> text = new ArrayList<>();

 		text.add("&c&lCommand : Permissions " + page + "/" + maxPage);

@@ -108,17 +108,17 @@ 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) {
 		Player p = Bukkit.getPlayer(player);
-		ArrayList<String> text = new ArrayList<String>();
+		ArrayList<String> text = new ArrayList<>();
 		if (p != null) {

-			ArrayList<String> msg = new ArrayList<String>();
+			ArrayList<String> msg = new ArrayList<>();

 			for (CommandHandler handle : plugin.getVoteCommand()) {
 				if (handle.hasPerm(p)) {
@@ -158,7 +158,7 @@ public class AdminVotePerms extends GUIHandler {
 				}
 			}

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

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

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

 	}

 	public String[] listPermsDev(CommandSender sender) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 		msg.add("Command");
 		msg.add("  Permissions (seperated by |");
 		msg.add("  Help messasge");
@@ -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
@@ -11,6 +11,7 @@ import com.bencodez.advancedcore.api.bookgui.BookWrapper;
 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.placeholder.NonPlayerPlaceHolder;
 import com.bencodez.advancedcore.api.placeholder.PlaceHolder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -19,11 +20,10 @@ import xyz.upperlevel.spigot.book.BookUtil;

 public class AdminVotePlaceholders extends GUIHandler {

-	@SuppressWarnings("unused")
 	private VotingPluginMain plugin;

 	public AdminVotePlaceholders(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}

@@ -38,35 +38,35 @@ public class AdminVotePlaceholders extends GUIHandler {

 		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getPlaceholders()) {
 			String msg = "";
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg = "VotingPlugin_" + identifier + " - " + placeholder.getDescription();
+				msg = "votingplugin_" + identifier + " - " + placeholder.getDescription();
 			} else {
-				msg = "VotingPlugin_" + identifier + "";
+				msg = "votingplugin_" + identifier + "";
 			}

-			Layout layout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
+			Layout layout = new Layout(new ArrayList<>(Arrays.asList("[Json]")));
 			layout.replaceTextComponent("[Json]", BookUtil.TextBuilder.of(identifier).color(ChatColor.AQUA)
 					.onHover(BookUtil.HoverAction.showText(msg)).build());
 			book.addLayout(layout);
 		}

-		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getNonPlayerPlaceholders()) {
+		for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getNonPlayerPlaceholders()) {
 			String msg = "";
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg = "VotingPlugin_" + identifier + " - " + placeholder.getDescription();
+				msg = "votingplugin_" + identifier + " - " + placeholder.getDescription();
 			} else {
-				msg = "VotingPlugin_" + identifier + "";
+				msg = "votingplugin_" + identifier + "";
 			}

-			Layout layout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
+			Layout layout = new Layout(new ArrayList<>(Arrays.asList("[Json]")));
 			layout.replaceTextComponent("[Json]", BookUtil.TextBuilder.of(identifier).color(ChatColor.AQUA)
 					.onHover(BookUtil.HoverAction.showText(msg)).build());
 			book.addLayout(layout);
@@ -79,29 +79,29 @@ public class AdminVotePlaceholders extends GUIHandler {

 	@Override
 	public void onChat(CommandSender sender) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 		msg.add("&cPlaceholders:");
 		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getPlaceholders()) {
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg.add("VotingPlugin_" + identifier + " - " + placeholder.getDescription());
+				msg.add("votingplugin_" + identifier + " - " + placeholder.getDescription());
 			} else {
-				msg.add("VotingPlugin_" + identifier + "");
+				msg.add("votingplugin_" + identifier + "");
 			}
 		}

-		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getNonPlayerPlaceholders()) {
-			String identifier = placeholder.getIdentifier();
+		for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getNonPlayerPlaceholders()) {
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg.add("VotingPlugin_" + identifier + " - " + placeholder.getDescription());
+				msg.add("votingplugin_" + identifier + " - " + placeholder.getDescription());
 			} else {
-				msg.add("VotingPlugin_" + identifier + "");
+				msg.add("votingplugin_" + identifier + "");
 			}
 		}

@@ -11,21 +11,20 @@ import com.bencodez.advancedcore.api.bookgui.BookWrapper;
 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.placeholder.NonPlayerPlaceHolder;
 import com.bencodez.advancedcore.api.placeholder.PlaceHolder;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;

 import xyz.upperlevel.spigot.book.BookUtil;

 public class AdminVotePlaceholdersPlayer extends GUIHandler {

-	@SuppressWarnings("unused")
 	private VotingPluginMain plugin;
 	private VotingPluginUser user;

 	public AdminVotePlaceholdersPlayer(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}
@@ -40,28 +39,28 @@ public class AdminVotePlaceholdersPlayer extends GUIHandler {
 		BookWrapper book = new BookWrapper("Placeholders");

 		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getPlaceholders()) {
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "1";
 			}
-			String value = placeholder.placeholderRequest(user.getOfflinePlayer(), user, identifier);
+			String value = placeholder.placeholderRequest(user, identifier);
 			String msg = identifier + " = " + value;
-			Layout layout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
+			Layout layout = new Layout(new ArrayList<>(Arrays.asList("[Json]")));
 			layout.replaceTextComponent("[Json]", BookUtil.TextBuilder.of(msg).color(ChatColor.AQUA)
 					.onHover(BookUtil.HoverAction.showText(value)).build());
 			book.addLayout(layout);
 		}

-		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getNonPlayerPlaceholders()) {
+		for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getNonPlayerPlaceholders()) {

-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "1";
 			}
-			String value = placeholder.placeholderRequest(user.getOfflinePlayer(), user, identifier);
+			String value = placeholder.placeholderRequest(identifier);
 			String msg = identifier + " = " + value;

-			Layout layout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
+			Layout layout = new Layout(new ArrayList<>(Arrays.asList("[Json]")));
 			layout.replaceTextComponent("[Json]", BookUtil.TextBuilder.of(msg).color(ChatColor.AQUA)
 					.onHover(BookUtil.HoverAction.showText(value)).build());
 			book.addLayout(layout);
@@ -71,29 +70,27 @@ public class AdminVotePlaceholdersPlayer extends GUIHandler {

 	@Override
 	public void onChat(CommandSender sender) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 		msg.add("&cPlaceholders:");
 		VotingPluginUser placeholderUser = user;
 		if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
-			placeholderUser = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
+			placeholderUser = plugin.getVotingPluginUserManager().getVotingPluginUser(user.getPrimaryAccount());
 		}
 		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getPlaceholders()) {
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "1";
 			}
-			msg.add("VotingPlugin_" + identifier + " = "
-					+ placeholder.placeholderRequest(user.getOfflinePlayer(), placeholderUser, identifier));
+			msg.add("votingplugin_" + identifier + " = " + placeholder.placeholderRequest(placeholderUser, identifier));
 		}

-		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getNonPlayerPlaceholders()) {
-			String identifier = placeholder.getIdentifier();
+		for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getNonPlayerPlaceholders()) {
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "1";
 			}

-			msg.add("VotingPlugin_" + identifier + " = "
-					+ placeholder.placeholderRequest(user.getOfflinePlayer(), placeholderUser, identifier));
+			msg.add("votingplugin_" + identifier + " = " + placeholder.placeholderRequest(identifier));
 		}
 		sendMessage(msg);
 	}
@@ -17,7 +17,6 @@ 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.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
 import com.bencodez.advancedcore.api.valuerequest.listeners.NumberListener;
 import com.bencodez.advancedcore.command.gui.RewardEditGUI;
@@ -28,7 +27,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 	private VotingPluginMain plugin;

 	public AdminVoteVoteParty(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}

@@ -53,7 +52,7 @@ public class AdminVoteVoteParty extends GUIHandler {

 		// to add
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
-				new EditGUIValueBoolean("Enabled", plugin.getSpecialRewardsConfig().getVotePartyEnabled()) {
+				new EditGUIValueBoolean("Enabled", plugin.getSpecialRewardsConfig().isVotePartyEnabled()) {

 					@Override
 					public void setValue(Player player, boolean name) {
@@ -71,7 +70,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 				}));

 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.LADDER, 1), new EditGUIValueNumber(
-				"IncreaseVotesRquired", plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRquired()) {
+				"IncreaseVotesRquired", plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRequired()) {

 			@Override
 			public void setValue(Player player, Number num) {
@@ -93,7 +92,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 				}, new Number[] { 0, 10, 50, 100 })
 						.currentValue("" + plugin.getServerData().getVotePartyExtraRequired()).allowCustomOption(true)
 						.request(clickEvent.getPlayer());
-				;
+
 			}
 		});

@@ -107,7 +106,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 		}));

 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("GiveAllPlayers",
-				plugin.getSpecialRewardsConfig().getVotePartyGiveAllPlayers()) {
+				plugin.getSpecialRewardsConfig().isVotePartyGiveAllPlayers()) {

 			@Override
 			public void setValue(Player player, boolean name) {
@@ -125,7 +124,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 		}));

 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
-				new EditGUIValueBoolean("ResetEachDay", plugin.getSpecialRewardsConfig().getVotePartyResetEachDay()) {
+				new EditGUIValueBoolean("ResetEachDay", plugin.getSpecialRewardsConfig().isVotePartyResetEachDay()) {

 					@Override
 					public void setValue(Player player, boolean name) {
@@ -134,7 +133,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 				}));

 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
-				new EditGUIValueBoolean("ResetWeekly", plugin.getSpecialRewardsConfig().getVotePartyResetWeekly()) {
+				new EditGUIValueBoolean("ResetWeekly", plugin.getSpecialRewardsConfig().isVotePartyResetWeekly()) {

 					@Override
 					public void setValue(Player player, boolean name) {
@@ -143,7 +142,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 				}));

 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
-				new EditGUIValueBoolean("ResetMonthly", plugin.getSpecialRewardsConfig().getVotePartyResetMontly()) {
+				new EditGUIValueBoolean("ResetMonthly", plugin.getSpecialRewardsConfig().isVotePartyResetMonthly()) {

 					@Override
 					public void setValue(Player player, boolean name) {
@@ -152,7 +151,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 				}));

 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("OnlyOncePerDay",
-				plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerDay()) {
+				plugin.getSpecialRewardsConfig().isVotePartyOnlyOncePerDay()) {

 			@Override
 			public void setValue(Player player, boolean name) {
@@ -170,7 +169,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 		}));

 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("CountFakeVotes",
-				plugin.getSpecialRewardsConfig().getVotePartyCountFakeVotes()) {
+				plugin.getSpecialRewardsConfig().isVotePartyCountFakeVotes()) {

 			@Override
 			public void setValue(Player player, boolean name) {
@@ -179,7 +178,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 		}));

 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("CountOfflineVotes",
-				plugin.getSpecialRewardsConfig().getVotePartyCountOfflineVotes()) {
+				plugin.getSpecialRewardsConfig().isVotePartyCountOfflineVotes()) {

 			@Override
 			public void setValue(Player player, boolean name) {
@@ -197,7 +196,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 				}));

 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
-				new EditGUIValueList("Commands", plugin.getSpecialRewardsConfig().getVotePartyCommands()) {
+				new EditGUIValueList("Commands", plugin.getSpecialRewardsConfig().getVotePartyGlobalCommands()) {

 					@Override
 					public void setValue(Player player, ArrayList<String> value) {
@@ -212,7 +211,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("VoteParty.Rewards"));
+						plugin.getRewardHandler().getDirectlyDefined("VoteParty.Rewards"));
 			}
 		});

@@ -20,7 +20,7 @@ public class AdminVoteVotePlayer extends GUIHandler {
 	private VotingPluginMain plugin;

 	public AdminVoteVotePlayer(VotingPluginMain plugin, CommandSender player, String playerName) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.playerName = playerName;
 	}
@@ -44,7 +44,7 @@ public class AdminVoteVotePlayer extends GUIHandler {
 		EditGUI inv = new EditGUI("Trigger vote for " + playerName);
 		inv.requirePermission("VotingPlugin.Commands.AdminVote.Vote|VotingPlugin.Admin");

-		for (VoteSite site : plugin.getVoteSites()) {
+		for (VoteSite site : plugin.getVoteSitesEnabled()) {
 			inv.addButton(new BInventoryButton(site.getItem().setName(site.getKey())) {

 				@Override
@@ -12,13 +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.rewards.RewardHandler;
 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 {
@@ -26,7 +25,7 @@ public class AdminVoteCumulative extends GUIHandler {
 	private VotingPluginMain plugin;

 	public AdminVoteCumulative(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}

@@ -53,9 +52,9 @@ public class AdminVoteCumulative extends GUIHandler {

 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						ArrayList<Integer> nums = new ArrayList<Integer>();
+						ArrayList<Integer> nums = new ArrayList<>();
 						for (String num : plugin.getSpecialRewardsConfig().getCumulativeVotes()) {
-							if (StringParser.getInstance().isInt(num)) {
+							if (MessageAPI.isInt(num)) {
 								nums.add(Integer.parseInt(num));
 							}
 						}
@@ -68,12 +67,12 @@ public class AdminVoteCumulative extends GUIHandler {
 							@Override
 							public void onInput(Player player, Number value) {
 								RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-										RewardHandler.getInstance()
+										plugin.getRewardHandler()
 												.getDirectlyDefined("Cumulative." + value.intValue() + ".Rewards"));
 							}
 						}, options).allowCustomOption(false).usingMethod(InputMethod.INVENTORY)
 								.request(clickEvent.getPlayer());
-						;
+
 					}
 				});

@@ -20,7 +20,7 @@ public class AdminVoteCumulativeRemove extends GUIHandler {
 	private VotingPluginMain plugin;

 	public AdminVoteCumulativeRemove(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}

@@ -62,7 +62,6 @@ public class AdminVoteCumulativeRemove extends GUIHandler {
 							new AdminVoteCumulative(plugin, p);
 						}
 					}.open();
-					;

 				}
 			});
@@ -20,7 +20,7 @@ public class AdminVoteMilestoneRemove extends GUIHandler {
 	private VotingPluginMain plugin;

 	public AdminVoteMilestoneRemove(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}

@@ -62,7 +62,6 @@ public class AdminVoteMilestoneRemove extends GUIHandler {
 							new AdminVoteMilestones(plugin, p);
 						}
 					}.open();
-					;

 				}
 			});
@@ -12,13 +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.rewards.RewardHandler;
 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 {
@@ -26,7 +25,7 @@ public class AdminVoteMilestones extends GUIHandler {
 	private VotingPluginMain plugin;

 	public AdminVoteMilestones(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}

@@ -53,9 +52,9 @@ public class AdminVoteMilestones extends GUIHandler {

 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						ArrayList<Integer> nums = new ArrayList<Integer>();
+						ArrayList<Integer> nums = new ArrayList<>();
 						for (String num : plugin.getSpecialRewardsConfig().getMilestoneVotes()) {
-							if (StringParser.getInstance().isInt(num)) {
+							if (MessageAPI.isInt(num)) {
 								nums.add(Integer.parseInt(num));
 							}
 						}
@@ -68,12 +67,12 @@ public class AdminVoteMilestones extends GUIHandler {
 							@Override
 							public void onInput(Player player, Number value) {
 								RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-										RewardHandler.getInstance()
+										plugin.getRewardHandler()
 												.getDirectlyDefined("MileStones." + value.intValue() + ".Rewards"));
 							}
 						}, options).allowCustomOption(false).usingMethod(InputMethod.INVENTORY)
 								.request(clickEvent.getPlayer());
-						;
+
 					}
 				});

@@ -21,7 +21,7 @@ public class AdminVoteVoteShop extends GUIHandler {
 	private VotingPluginMain plugin;

 	public AdminVoteVoteShop(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}

@@ -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();
 					}
 				});
@@ -1,6 +1,8 @@
 package com.bencodez.votingplugin.commands.gui.admin.voteshop;

 import java.util.ArrayList;
+import java.util.Map;
+import java.util.Map.Entry;

 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
@@ -17,7 +19,6 @@ 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.rewards.RewardHandler;
 import com.bencodez.advancedcore.command.gui.RewardEditGUI;
 import com.bencodez.votingplugin.VotingPluginMain;

@@ -27,7 +28,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 	private VotingPluginMain plugin;

 	public AdminVoteVoteShopItem(VotingPluginMain plugin, CommandSender player, String identifier) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.identifier = identifier;
 	}
@@ -52,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) {
@@ -60,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) {
@@ -68,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) {
@@ -76,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) {
@@ -85,8 +86,8 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 				}));

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

 					@Override
@@ -110,12 +111,37 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 						setPathData(getKey(), value);
 					}
 				}));
+		inv.addButton(new BInventoryButton(
+				new ItemBuilder(player.getInventory().getItemInMainHand().clone()).addLoreLine("&cClick to add")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				ItemBuilder item = new ItemBuilder(clickEvent.getPlayer().getInventory().getItemInMainHand().clone());
+				Map<String, Object> map = item.getConfiguration(false);
+				for (Entry<String, Object> entry : map.entrySet()) {
+					setPathData(entry.getKey(), entry.getValue());
+				}
+			}
+		});
+		inv.addButton(new BInventoryButton(new ItemBuilder(player.getInventory().getItemInMainHand().clone())
+				.addLoreLine("&cClick to add with exact data")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				ItemBuilder item = new ItemBuilder(clickEvent.getPlayer().getInventory().getItemInMainHand().clone());
+				Map<String, Object> map = item.getConfiguration(true);
+				for (Entry<String, Object> entry : map.entrySet()) {
+					setPathData("ItemStack." + entry.getKey(), entry.getValue());
+				}
+			}
+		});
+
 		inv.addButton(new BInventoryButton(new ItemBuilder(Material.DISPENSER, 1).setName("&cRewards")) {

 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("CHEST.Shop." + identifier + ".Rewards"));
+						plugin.getRewardHandler().getDirectlyDefined("Shop." + identifier + ".Rewards"));
 			}
 		});

@@ -130,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();
 	}

@@ -19,7 +19,7 @@ public class AdminVoteVoteShopItemRemove extends GUIHandler {
 	private VotingPluginMain plugin;

 	public AdminVoteVoteShopItemRemove(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}

@@ -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();
 								}
@@ -64,7 +64,6 @@ public class AdminVoteVoteShopItemRemove extends GUIHandler {
 									new AdminVoteVoteShop(plugin, p).open();
 								}
 							}.open();
-							;

 						}
 					}.addData("ident", identifier));
@@ -18,7 +18,7 @@ public class AdminVoteVoteShopItems extends GUIHandler {
 	private VotingPluginMain plugin;

 	public AdminVoteVoteShopItems(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}

@@ -41,15 +41,15 @@ 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) {
 							new AdminVoteVoteShopItem(plugin, clickEvent.getPlayer(), (String) getData("ident"))
 									.open(GUIMethod.CHEST);
-							;
+
 						}
 					}.addData("ident", identifier));
 		}
@@ -12,38 +12,39 @@ 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;

 public class VoteBest extends GUIHandler {

-	@SuppressWarnings("unused")
 	private VotingPluginMain plugin;
 	private VotingPluginUser user;

 	public VoteBest(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}

 	@Override
 	public ArrayList<String> getChat(CommandSender sender) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 		msg.add(plugin.getConfigFile().getFormatCommandsVoteBestTitle());
 		msg.addAll(plugin.getConfigFile().getFormatCommandsVoteBestLines());

-		HashMap<String, String> placeholders = new HashMap<String, String>();
+		HashMap<String, String> placeholders = new HashMap<>();
 		placeholders.put("HighestDailyTotal", "" + user.getHighestDailyTotal());
 		placeholders.put("HighestWeeklyTotal", "" + user.getHighestWeeklyTotal());
 		placeholders.put("HighestMonthlyTotal", "" + user.getHighestMonthlyTotal());

 		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
@@ -88,6 +89,26 @@ public class VoteBest extends GUIHandler {
 			}
 		});

+		if (plugin.getGui().isChestVoteBestBackButton()) {
+			inv.addButton(plugin.getCommandLoader().getBackButton(user));
+		}
+
+		String guiPath = "VoteBest";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
 		inv.openInventory(player);
 	}

@@ -9,14 +9,14 @@ 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.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
+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.topvoter.TopVoter;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;

 public class VoteGUI extends GUIHandler {
@@ -25,7 +25,7 @@ public class VoteGUI extends GUIHandler {
 	private VotingPluginUser user;

 	public VoteGUI(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}
@@ -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 (slot.equalsIgnoreCase("url")) {
+			if (MessageAPI.startsWithIgnoreCase(slot, "url")) {
 				lore = new String[] { "&aClick me" };
-			} else if (slot.equalsIgnoreCase("next")) {
-				lore = ArrayUtils.getInstance().convert(new VoteNext(plugin, player, user).getChat(player));
-			} else if (slot.equalsIgnoreCase("last")) {
-				lore = ArrayUtils.getInstance().convert(new VoteLast(plugin, player, user).getChat(player));
-			} else if (slot.equalsIgnoreCase("total")) {
-				lore = ArrayUtils.getInstance().convert(new VoteTotal(plugin, player, user).getChat(player));
-			} else if (slot.equalsIgnoreCase("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);
@@ -64,18 +64,18 @@ public class VoteGUI extends GUIHandler {
 				}
 			} else if (slot.equalsIgnoreCase("today")) {
 				String[] today = new VoteToday(plugin, player, user, 1).voteTodayGUI();
-				ArrayList<String> list = new ArrayList<String>();
+				ArrayList<String> list = new ArrayList<>();
 				if (today.length > 0) {
 					for (int i = today.length - 1; i < today.length && list.size() < 10 && i >= 0; i--) {
 						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;
 	}

@@ -121,21 +121,28 @@ public class VoteGUI extends GUIHandler {
 	@Override
 	public void onChest(Player player) {
 		if (this.user == null) {
-			user = UserManager.getInstance().getVotingPluginUser(player);
+			user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
 		}
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteGUIName());
 		if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
 			inv.dontClose();
 		}

+		if (player.getUniqueId().toString().equals(user.getUUID())) {
+			inv.requirePermission("VotingPlugin.Commands.Vote.GUI");
+		} else {
+			inv.requirePermission("VotingPlugin.Commands.Vote.GUI.Other");
+		}
+
 		inv.addPlaceholder("points", "" + user.getPoints());
 		inv.addPlaceholder("player", user.getPlayerName());
 		inv.addPlaceholder("top", plugin.getConfigFile().getVoteTopDefault());
+		inv.addPlaceholder("sitesavailable", "" + user.getSitesNotVotedOn());

-		for (String slot : plugin.getGui().getChestVoteGUISlots()) {
+		for (final String slot : plugin.getGui().getChestVoteGUISlots()) {
 			ItemBuilder builder = getItemSlot(slot, player);

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

 				@Override
 				public void onClick(ClickEvent event) {
@@ -144,7 +151,8 @@ public class VoteGUI extends GUIHandler {
 					String cmd = plugin.getGui().getChestVoteGUISlotCommand(slot);
 					if (cmd.equalsIgnoreCase("none")) {
 						return;
-					} else if (!cmd.equals("")) {
+					}
+					if (!cmd.equals("")) {
 						event.runSync(new Runnable() {

 							@Override
@@ -153,31 +161,21 @@ public class VoteGUI extends GUIHandler {
 							}
 						});
 					} else {
-						if (slot.equalsIgnoreCase("url")) {
-							new VoteURL(plugin, player, user, true).open();
-						} else if (slot.equalsIgnoreCase("next")) {
-							new VoteNext(plugin, player, user).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("last")) {
-							new VoteLast(plugin, player, user).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("total")) {
-							new VoteTotal(plugin, player, user).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("top")) {
-							new VoteTopVoter(plugin, player, user, TopVoter.getDefault(), 1).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("today")) {
-							new VoteToday(plugin, player, user, 1).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("help")) {
-							player.performCommand("vote help");
-						} else if (slot.equalsIgnoreCase("shop")) {
-							new VoteShop(plugin, player, user).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("lastmonth")) {
-							new VoteTopVoterLastMonth(plugin, player, user).open(GUIMethod.CHEST);
-						}
+						plugin.getCommandLoader().processSlotClick(player, user, slot);
+					}
+					String prefix = "";
+					if (event.getButton().getBuilder().isConditional()) {
+						prefix = "Item.";
 					}

-					if (RewardHandler.getInstance().hasRewards(plugin.getGui().getData(),
-							plugin.getGui().getChestVoteGUISlotRewardsPath(slot))) {
-						RewardHandler.getInstance().giveReward(UserManager.getInstance().getVotingPluginUser(player),
-								plugin.getGui().getData(), plugin.getGui().getChestVoteGUISlotRewardsPath(slot),
+					if (plugin.getRewardHandler().hasRewards(plugin.getGui().getData(),
+							plugin.getGui().getChestVoteGUISlotRewardsPath(slot,
+									prefix + event.getButton().getLastRewardsPath(player)))) {
+						plugin.getRewardHandler().giveReward(
+								plugin.getVotingPluginUserManager().getVotingPluginUser(player),
+								plugin.getGui().getData(),
+								plugin.getGui().getChestVoteGUISlotRewardsPath(slot,
+										prefix + event.getButton().getLastRewardsPath(player)),
 								new RewardOptions().addPlaceholder("identifier", slot));
 					}
 				}
@@ -185,16 +183,33 @@ public class VoteGUI extends GUIHandler {
 				@Override
 				public ItemBuilder onUpdate(Player player) {
 					ItemBuilder item = getItemSlot(slot, player);
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
+					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
 					item.addPlaceholder("points", "" + user.getPoints());
 					item.addPlaceholder("player", user.getPlayerName());
 					item.addPlaceholder("top", plugin.getConfigFile().getVoteTopDefault());
+					item.addPlaceholder("sitesavailable", "" + user.getSitesNotVotedOn());
 					return item;
 				}

 			});
 		}

+		String guiPath = "VoteGUI";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
 		inv.openInventory(player);
 	}

@@ -10,7 +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.simpleapi.messages.MessageAPI;
+import com.bencodez.simpleapi.nms.NMSManager;
 import com.bencodez.votingplugin.VotingPluginMain;

 import net.md_5.bungee.api.ChatColor;
@@ -22,7 +23,7 @@ public class VoteHelp extends GUIHandler {
 	private VotingPluginMain plugin;

 	public VoteHelp(VotingPluginMain plugin, CommandSender player, int page) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.page = page;
 	}
@@ -33,10 +34,10 @@ public class VoteHelp extends GUIHandler {
 	}

 	public ArrayList<TextComponent> helpText(CommandSender sender) {
-		ArrayList<TextComponent> msg = new ArrayList<TextComponent>();
-		HashMap<String, TextComponent> unsorted = new HashMap<String, TextComponent>();
+		ArrayList<TextComponent> msg = new ArrayList<>();
+		HashMap<String, TextComponent> unsorted = new HashMap<>();

-		boolean requirePerms = plugin.getConfigFile().getFormatCommandsVoteHelpRequirePermission();
+		boolean requirePerms = plugin.getConfigFile().isFormatCommandsVoteHelpRequirePermission();

 		String colorStr = plugin.getConfigFile().getFormatCommandsVoteHelpHoverColor();
 		ChatColor hoverColor = null;
@@ -53,7 +54,29 @@ public class VoteHelp extends GUIHandler {
 						plugin.getConfigFile().getFormatCommandsVoteHelpLine(), hoverColor));
 			}
 		}
-		ArrayList<String> unsortedList = new ArrayList<String>();
+		ArrayList<String> unsortedList = new ArrayList<>();
+		unsortedList.addAll(unsorted.keySet());
+		Collections.sort(unsortedList, String.CASE_INSENSITIVE_ORDER);
+		for (String cmd : unsortedList) {
+			msg.add(unsorted.get(cmd));
+		}
+
+		return msg;
+	}
+
+	public ArrayList<TextComponent> helpTextLegacy(CommandSender sender) {
+		ArrayList<TextComponent> msg = new ArrayList<>();
+		HashMap<String, TextComponent> unsorted = new HashMap<>();
+
+		boolean requirePerms = plugin.getConfigFile().isFormatCommandsVoteHelpRequirePermission();
+
+		for (CommandHandler cmdHandle : plugin.getVoteCommand()) {
+			if (!requirePerms || cmdHandle.hasPerm(sender)) {
+				unsorted.put(cmdHandle.getHelpLineCommand("/vote"),
+						cmdHandle.getHelpLine("/vote", plugin.getConfigFile().getFormatCommandsVoteHelpLine()));
+			}
+		}
+		ArrayList<String> unsortedList = new ArrayList<>();
 		unsortedList.addAll(unsorted.keySet());
 		Collections.sort(unsortedList, String.CASE_INSENSITIVE_ORDER);
 		for (String cmd : unsortedList) {
@@ -85,15 +108,20 @@ public class VoteHelp extends GUIHandler {

 	public ArrayList<TextComponent> voteHelpText(CommandSender sender) {
 		int pagesize = plugin.getConfigFile().getFormatPageSize();
-		ArrayList<TextComponent> msg = new ArrayList<TextComponent>();
-		ArrayList<TextComponent> text = helpText(sender);
+		ArrayList<TextComponent> msg = new ArrayList<>();
+		ArrayList<TextComponent> text = new ArrayList<>();
+		if (NMSManager.getInstance().isVersion("1.12")) {
+			text = helpTextLegacy(sender);
+		} else {
+			text = helpText(sender);
+		}

 		int maxPage = text.size() / pagesize;
 		if ((text.size() % pagesize) != 0) {
 			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++) {
@@ -9,10 +9,13 @@ 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.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;
@@ -23,27 +26,27 @@ public class VoteLast extends GUIHandler {
 	private VotingPluginUser user;

 	public VoteLast(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}

 	@Override
 	public ArrayList<String> getChat(CommandSender sender) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();

 		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.getVoteSites()) {
+		for (VoteSite voteSite : plugin.getVoteSitesEnabled()) {
 			if (!voteSite.isHidden()) {
 				msg.add(user.voteCommandLastLine(voteSite));
 			}
 		}

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

 	@Override
@@ -60,15 +63,32 @@ public class VoteLast extends GUIHandler {
 	public void onChest(Player player) {
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteLastName());
 		inv.addPlaceholder("player", user.getPlayerName());
-		for (VoteSite site : plugin.getVoteSites()) {
+		for (VoteSite site : plugin.getVoteSitesEnabled()) {
 			if (!site.isHidden()) {
 				inv.addButton(inv.getNextSlot(),
-						new UpdatingBInventoryButton(site.getItem().setName(site.getDisplayName())
+						new UpdatingBInventoryButton(plugin, site.getItem().setName(site.getDisplayName())
 								.setLore(user.voteCommandLastGUILine(site)).setAmountNone(1), 1000, 1000) {

 							@Override
-							public void onClick(ClickEvent clickEvent) {
+							public void onClick(ClickEvent event) {
+								if (plugin.getGui().isChestVoteLastClickableLinks()) {
+									Player player = event.getPlayer();
+									if (player != null) {
+										VotingPluginUser user = plugin.getVotingPluginUserManager()
+												.getVotingPluginUser(player);
+										user.sendMessage(
+												PlaceholderUtils
+														.replacePlaceHolder(
+																PlaceholderUtils.replacePlaceHolder(
+																		PlaceholderUtils.replacePlaceHolder(
+																				plugin.getGui()
+																						.getChestVoteURLURLText(),
+																				"voteurl", site.getVoteURL()),
+																		"sitename", site.getDisplayName()),
+																"player", player.getName()));

+									}
+								}
 							}

 							@Override
@@ -80,7 +100,23 @@ public class VoteLast extends GUIHandler {
 			}
 		}

-		if (plugin.getGui().getChestVoteLastBackButton()) {
+		String guiPath = "VoteLast";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
+		if (plugin.getGui().isChestVoteLastBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}

@@ -12,9 +12,12 @@ 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.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;
@@ -27,30 +30,28 @@ public class VoteNext extends GUIHandler {
 	private VotingPluginUser user;

 	public VoteNext(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}

 	@Override
 	public ArrayList<String> getChat(CommandSender sender) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();

 		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.getVoteSites()) {
+		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;
@@ -61,9 +62,9 @@ public class VoteNext extends GUIHandler {
 		BookWrapper book = new BookWrapper(plugin.getGui().getBookVoteURLBookGUITitle());

 		// add colors/config options
-		for (VoteSite site : plugin.getVoteSites()) {
+		for (VoteSite site : plugin.getVoteSitesEnabled()) {
 			if (!site.isHidden()) {
-				Layout nextLayout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
+				Layout nextLayout = new Layout(new ArrayList<>(Arrays.asList("[Json]")));
 				nextLayout.replaceTextComponent("[Json]",
 						BookUtil.TextBuilder.of(book.colorize(site.getDisplayName()))
 								.onClick(BookUtil.ClickAction.openUrl(site.getVoteURLJsonStrip()))
@@ -85,11 +86,20 @@ public class VoteNext extends GUIHandler {
 	public void onChest(Player player) {
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteNextName());
 		inv.addPlaceholder("player", user.getPlayerName());
-		for (VoteSite site : plugin.getVoteSites()) {
+		for (VoteSite site : plugin.getVoteSitesEnabled()) {
 			if (!site.isHidden()) {
+				String siteNameDisplay = plugin.getGui().getChestVoteNextCustomSiteNamesDisplays(site.getKey());
+				if (siteNameDisplay.isEmpty()) {
+					siteNameDisplay = site.getDisplayName();
+				}
 				inv.addButton(inv.getNextSlot(),
-						new UpdatingBInventoryButton(site.getItem().setName(site.getDisplayName())
-								.setLore(user.voteCommandNextInfo(site)).setAmountNone(1), 1000, 1000) {
+						new UpdatingBInventoryButton(plugin,
+								site.getItem().setName(siteNameDisplay)
+										.setLore(PlaceholderUtils.replacePlaceHolder(
+												plugin.getGui().getChestVoteNextLine(), "time",
+												user.voteCommandNextInfo(site)))
+										.setAmountNone(1),
+								1000, 1000) {

 							@Override
 							public void onClick(ClickEvent clickEvent) {
@@ -106,7 +116,23 @@ public class VoteNext extends GUIHandler {
 			}
 		}

-		if (plugin.getGui().getChestVoteNextBackButton()) {
+		String guiPath = "VoteNext";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
+		if (plugin.getGui().isChestVoteNextBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 		inv.openInventory(player);
@@ -12,11 +12,11 @@ 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.rewards.RewardHandler;
+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.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;

 public class VoteShop extends GUIHandler {
@@ -25,7 +25,7 @@ public class VoteShop extends GUIHandler {
 	private VotingPluginUser user;

 	public VoteShop(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}
@@ -46,37 +46,57 @@ public class VoteShop extends GUIHandler {

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

-		BInventory inv = new BInventory(plugin.getGui().getChestVoteShopName());
+		if (this.user == null) {
+			user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
+		}
+		VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
+		/*
+		 * if (!plugin.getConfigFile().isExtraVoteShopCheck()) { user.cacheAsync(); }
+		 */
+		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 {
-				hasPerm = player.hasPermission(perm);
+				String p = "";
+				if (perm.startsWith("!")) {
+					p = PlaceholderUtils.replacePlaceHolders(player, perm.substring(1));
+					hasPerm = !player.hasPermission(p);
+				} else {
+					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) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
 				if (user.getVoteShopIdentifierLimit(identifier) >= limit) {
 					limitPass = false;
 				}
 			}

-			if (!plugin.getGui().getChestVoteShopNotBuyable(identifier)) {
-				if (hasPerm && (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) {

@@ -84,18 +104,18 @@ public class VoteShop extends GUIHandler {
 						public void onClick(ClickEvent event) {
 							Player player = event.getWhoClicked();

-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-							if (plugin.getConfigFile().isClearCacheOnVoteShopPurchase()
-									|| plugin.getBungeeSettings().isUseBungeecoord()) {
-								user.clearCache();
+							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
+							if (plugin.getConfigFile().isExtraVoteShopCheck()) {
+								user.cache();
 							}
+
 							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.getButton().getInv().closeInv(player, null);
-								}
+								// if (plugin.getGui().getChestVoteShopCloseGUI(identifier)) {
+								// event.closeInventory();
+								// }

 								// limit fail-safe, should never be needed, except in rare cases
 								boolean limitPass = true;
@@ -106,35 +126,51 @@ public class VoteShop extends GUIHandler {
 								}

 								if (limitPass) {
-									if (!plugin.getGui().isChestVoteShopRequireConfirmation(identifier)) {
-										HashMap<String, String> placeholders = new HashMap<String, String>();
+									if (!plugin.getShopFile().isVoteShopRequireConfirmation(identifier)) {
+										HashMap<String, String> placeholders = new HashMap<>();
 										placeholders.put("identifier",
-												plugin.getGui().getChestShopIdentifierIdentifierName(identifier));
+												plugin.getShopFile().getShopIdentifierIdentifierName(identifier));
 										placeholders.put("points", "" + points);
 										placeholders.put("limit", "" + limit);
-										if (user.removePoints(points)) {
+										if (user.removePoints(points, true)) {
+											plugin.getLogger().info("VoteShop: " + user.getPlayerName() + "/"
+													+ user.getUUID() + " bought " + identifier + " for " + points);
+											if (plugin.getConfigFile().isTrackShopPurchases()) {
+												plugin.getServerData().addVoteShopPurchase(identifier);
+											}

-											RewardHandler.getInstance().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 {
-										new VoteShopConfirm(plugin, player, user, identifier).open(GUIMethod.CHEST);
-										;
+										plugin.getBukkitScheduler().runTask(plugin, new Runnable() {
+
+											@Override
+											public void run() {
+												new VoteShopConfirm(plugin, player, user, identifier)
+														.open(GUIMethod.CHEST);
+											}
+										});
+
 									}
 								} else {
-									user.sendMessage(plugin.getGui().getChestVoteShopLimitReached());
+									user.sendMessage(plugin.getShopFile().getVoteShopLimitReached());
+								}
+								plugin.getCommandLoader().processSlotClick(player, user, identifier);
+								if (plugin.getShopFile().isVoteShopReopenGUIOnPurchase()) {
+									plugin.getCommandLoader().processSlotClick(player, user, "shop");
 								}
 							}
 						}
@@ -143,20 +179,33 @@ 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
 						public void onClick(ClickEvent event) {
-
+							user.sendMessage(plugin.getConfigFile().getFormatShopNotPurchasable());
 						}

-					}.dontClose().addData("identifier", identifier).addData("Limit", limit));
+					}.addData("identifier", identifier).addData("Limit", limit));
 				}
 			}
 		}

-		if (plugin.getGui().getChestVoteShopBackButton()) {
+		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.getShopFile().getData(),
+							"ExtraItems." + str + "." + clickEvent.getButton().getLastRewardsPath(player))
+							.setGiveOffline(false).send(clickEvent.getPlayer());
+				}
+			});
+		}
+
+		if (plugin.getShopFile().isVoteShopBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}

@@ -12,10 +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.rewards.RewardHandler;
+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;

@@ -26,7 +25,7 @@ public class VoteShopConfirm extends GUIHandler {
 	private VotingPluginUser user;

 	public VoteShopConfirm(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, String identifier) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 		this.identifier = identifier;
@@ -47,35 +46,41 @@ 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) {
-				int points = plugin.getGui().getChestShopIdentifierCost(identifier);
-				int limit = plugin.getGui().getChestShopIdentifierLimit(identifier);
-				HashMap<String, String> placeholders = new HashMap<String, String>();
+				user.cache();
+				int points = plugin.getShopFile().getShopIdentifierCost(identifier);
+				int limit = plugin.getShopFile().getShopIdentifierLimit(identifier);
+				HashMap<String, String> placeholders = new HashMap<>();
 				placeholders.put("identifier", identifier);
 				placeholders.put("points", "" + points);
 				placeholders.put("limit", "" + limit);
-				if (user.removePoints(points)) {
+				if (user.removePoints(points, true)) {
+					plugin.getLogger().info("VoteShop: " + user.getPlayerName() + "/" + user.getUUID() + " bought "
+							+ identifier + " for " + points);
+					if (plugin.getConfigFile().isTrackShopPurchases()) {
+						plugin.getServerData().addVoteShopPurchase(identifier);
+					}

-					RewardHandler.getInstance().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();
@@ -83,14 +88,14 @@ 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);
+					new VoteShop(plugin, event.getPlayer(), user).open();
 				}
 			}
 		});
@@ -12,7 +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;

@@ -23,18 +25,18 @@ public class VoteStreak extends GUIHandler {
 	private VotingPluginUser user;

 	public VoteStreak(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}

 	@Override
 	public ArrayList<String> getChat(CommandSender sender) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 		msg.add(plugin.getConfigFile().getFormatCommandsVoteStreakTitle());
 		msg.addAll(plugin.getConfigFile().getFormatCommandsVoteStreakLines());

-		HashMap<String, String> placeholders = new HashMap<String, String>();
+		HashMap<String, String> placeholders = new HashMap<>();
 		placeholders.put("DailyStreak", "" + user.getDayVoteStreak());
 		placeholders.put("WeeklyStreak", "" + user.getWeekVoteStreak());
 		placeholders.put("MonthlyStreak", "" + user.getMonthVoteStreak());
@@ -45,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
@@ -119,7 +121,23 @@ public class VoteStreak extends GUIHandler {
 			}
 		});

-		if (plugin.getGui().getChestVoteStreakBackButton()) {
+		String guiPath = "VoteStreak";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
+		if (plugin.getGui().isChestVoteStreakBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}

@@ -5,6 +5,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map.Entry;
+import java.util.UUID;

 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -15,13 +16,13 @@ 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.user.UUID;
-import com.bencodez.advancedcore.nms.NMSManager;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+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.user.UserManager;
+import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
 import com.bencodez.votingplugin.user.VotingPluginUser;

 public class VoteToday extends GUIHandler {
@@ -31,7 +32,7 @@ public class VoteToday extends GUIHandler {
 	private VotingPluginUser user;

 	public VoteToday(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, int page) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 		this.page = page;
@@ -43,7 +44,7 @@ public class VoteToday extends GUIHandler {
 		if (page < 1) {
 			page = 1;
 		}
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 		String[] voteToday = voteToday();

 		int maxPage = voteToday.length / pagesize;
@@ -51,7 +52,7 @@ public class VoteToday extends GUIHandler {
 			maxPage++;
 		}

-		HashMap<String, String> placeholders = new HashMap<String, String>();
+		HashMap<String, String> placeholders = new HashMap<>();
 		placeholders.put("page", "" + page);
 		placeholders.put("maxpage", "" + maxPage);

@@ -65,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
@@ -84,31 +85,31 @@ public class VoteToday extends GUIHandler {
 		if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
 			inv.dontClose();
 		}
-		for (VotingPluginUser user : plugin.getVoteToday().keySet()) {
+		for (TopVoterPlayer user : plugin.getVoteToday().keySet()) {

 			for (VoteSite voteSite : plugin.getVoteToday().get(user).keySet()) {
 				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(plugin.getConfigFile().getFormatTimeFormat());
 				String timeString = plugin.getVoteToday().get(user).get(voteSite).format(formatter);
 				String msg = plugin.getGui().getChestVoteTodayLine();
-				HashMap<String, String> placeholders = new HashMap<String, String>();
+				HashMap<String, String> placeholders = new HashMap<>();
 				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 String uuid = user.getUUID();
+				final UUID uuid = user.getUuid();
 				inv.addButton(inv.getNextSlot(), new BInventoryButton(item) {

 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid);
 						new VoteGUI(plugin, player, user)
 								.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
 					}
@@ -116,7 +117,24 @@ public class VoteToday extends GUIHandler {
 			}
 		}

-		if (plugin.getGui().getChestVoteTodayBackButton()) {
+		String guiPath = "VoteToday";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+
+					});
+		}
+
+		if (plugin.getGui().isChestVoteTodayBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 		inv.openInventory(player);
@@ -128,29 +146,30 @@ public class VoteToday extends GUIHandler {
 	}

 	public String[] voteToday() {
-		ArrayList<String> msg = new ArrayList<String>();
-		for (VotingPluginUser user : plugin.getVoteToday().keySet()) {
+		ArrayList<String> msg = new ArrayList<>();
+		for (TopVoterPlayer user : plugin.getVoteToday().keySet()) {

 			for (VoteSite voteSite : plugin.getVoteToday().get(user).keySet()) {
 				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(plugin.getConfigFile().getFormatTimeFormat());
 				String timeString = plugin.getVoteToday().get(user).get(voteSite).format(formatter);
-				HashMap<String, String> placeholders = new HashMap<String, String>();
+				HashMap<String, String> placeholders = new HashMap<>();
 				placeholders.put("player", user.getPlayerName());
 				placeholders.put("votesite", voteSite.getKey());
+                                placeholders.put("sitename", voteSite.getDisplayName());
 				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() {
-		ArrayList<String> msg = new ArrayList<String>();
-		for (VotingPluginUser user : plugin.getVoteToday().keySet()) {
+		ArrayList<String> msg = new ArrayList<>();
+		for (TopVoterPlayer user : plugin.getVoteToday().keySet()) {

 			LocalDateTime mostRecent = null;
 			VoteSite mostRecentSite = null;
@@ -163,16 +182,17 @@ public class VoteToday extends GUIHandler {
 			if (mostRecent != null) {
 				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(plugin.getConfigFile().getFormatTimeFormat());
 				String timeString = mostRecent.format(formatter);
-				HashMap<String, String> placeholders = new HashMap<String, String>();
+				HashMap<String, String> placeholders = new HashMap<>();
 				placeholders.put("player", user.getPlayerName());
 				placeholders.put("votesite", mostRecentSite.getKey());
+                                placeholders.put("sitename", mostRecentSite.getDisplayName());
 				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);
 	}

 }
@@ -2,11 +2,15 @@ package com.bencodez.votingplugin.commands.gui.player;

 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map.Entry;
+import java.util.Queue;
 import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedQueue;

 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;

@@ -16,9 +20,11 @@ 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;
 import com.bencodez.votingplugin.user.VotingPluginUser;

 public class VoteTopVoter extends GUIHandler {
@@ -29,7 +35,7 @@ public class VoteTopVoter extends GUIHandler {
 	private VotingPluginUser user;

 	public VoteTopVoter(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, TopVoter top, int page) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 		this.top = top;
@@ -40,17 +46,17 @@ 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;
 		}
-		return new ArrayList<String>();
+		return new ArrayList<>();
 	}

 	@Override
@@ -69,14 +75,23 @@ public class VoteTopVoter extends GUIHandler {
 			if (top == null) {
 				top = TopVoter.getDefault();
 			}
-			Set<Entry<VotingPluginUser, Integer>> users = null;
+			Set<Entry<TopVoterPlayer, Integer>> users = null;

 			String topVoter = top.getName();
 			@SuppressWarnings("unchecked")
-			LinkedHashMap<VotingPluginUser, Integer> topVotes = (LinkedHashMap<VotingPluginUser, Integer>) plugin
+			LinkedHashMap<TopVoterPlayer, Integer> topVotes = (LinkedHashMap<TopVoterPlayer, Integer>) plugin
 					.getTopVoter(top).clone();
 			users = topVotes.entrySet();

+			ConfigurationSection customization = plugin.getGui().getChestVoteTopCustomization();
+			boolean customzationEnabled = false;
+			Queue<Integer> playerSlots = new ConcurrentLinkedQueue<>();
+			if (customization != null) {
+				customzationEnabled = customization.getBoolean("Enabled");
+				List<Integer> customizationPlayerSlots = customization.getIntegerList("PlayerSlots");
+				playerSlots.addAll(customizationPlayerSlots);
+			}
+
 			BInventory inv = new BInventory(plugin.getGui().getChestVoteTopName());
 			inv.addPlaceholder("topvoter", topVoter);
 			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
@@ -84,8 +99,9 @@ public class VoteTopVoter extends GUIHandler {
 			}

 			int pos = 1;
-			for (Entry<VotingPluginUser, Integer> entry : users) {
-				ItemBuilder playerItem;
+			for (Entry<TopVoterPlayer, Integer> entry : users) {
+
+				ItemBuilder playerItem = new ItemBuilder(Material.PAPER);

 				if (plugin.getGui().isChestVoteTopUseSkull()) {
 					playerItem = new ItemBuilder(entry.getKey().getPlayerHead());
@@ -93,46 +109,99 @@ public class VoteTopVoter extends GUIHandler {
 					playerItem = new ItemBuilder(Material.valueOf(plugin.getGui().getChestVoteTopPlayerItemMaterial()));
 				}

-				playerItem.setLore(new ArrayList<String>());
+				playerItem.setLore(new ArrayList<>());

-				inv.addButton(new BInventoryButton(playerItem.setName(plugin.getGui().getChestVoteTopItemName())
+				BInventoryButton button = 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) {
-						if (plugin.getGui().getChestVoteTopOpenMainGUIOnClick()) {
-							VotingPluginUser user = (VotingPluginUser) getData("User");
-							new VoteGUI(plugin, player, user)
+						if (plugin.getGui().isChestVoteTopOpenMainGUIOnClick()) {
+							TopVoterPlayer user = (TopVoterPlayer) getData("User");
+							new VoteGUI(plugin, player, user.getUser())
 									.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
-						} else {
-							getInv().forceClose(clickEvent.getPlayer());
 						}
 					}
-				}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey()));
+				}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey());
+
+				if (customzationEnabled && !playerSlots.isEmpty()) {
+					button.setSlot(playerSlots.remove());
+				}
+
+				inv.setCloseInv(plugin.getGui().isChestVoteTopCloseGUIOnClick());
+
+				inv.addButton(button);
 				pos++;
 			}

-			final TopVoter cur = top;
-			inv.getPageButtons().add(new BInventoryButton(
-					new ItemBuilder(plugin.getGui().getChestVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
-
-				@Override
-				public void onClick(ClickEvent clickEvent) {
-					if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
-						new VoteTopVoter(plugin, player, user, cur.next(), 0).open(GUIMethod.CHEST);
-					} else {
-						new VoteTopVoter(plugin, player, user, cur.prev(), 0).open(GUIMethod.CHEST);
-					}
+			TopVoter newTops = top;
+			ArrayList<String> tops = plugin.getGui().getChestVoteTopSwitchItemTopVoters();
+			if (!tops.isEmpty()) {
+				for (String name : tops) {
+					newTops.getSwitchItems().add(TopVoter.getTopVoter(name));
 				}
-			});
-
-			if (plugin.getGui().getChestVoteTopBackButton()) {
-				inv.getPageButtons().add(plugin.getCommandLoader().getBackButton(user).setSlot(1));
 			}

-			inv.setPages(true);
+			final TopVoter cur = newTops;
+			if (!customzationEnabled) {
+				inv.getPageButtons().add(new BInventoryButton(
+						new ItemBuilder(plugin.getGui().getChestVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
+							new VoteTopVoter(plugin, player, user, cur.next(), 0).open(GUIMethod.CHEST);
+						} else {
+							new VoteTopVoter(plugin, player, user, cur.prev(), 0).open(GUIMethod.CHEST);
+						}
+					}
+				});
+			} else {
+				inv.addButton(new BInventoryButton(
+						new ItemBuilder(plugin.getGui().getChestVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
+							new VoteTopVoter(plugin, player, user, cur.next(), 0).open(GUIMethod.CHEST);
+						} else {
+							new VoteTopVoter(plugin, player, user, cur.prev(), 0).open(GUIMethod.CHEST);
+						}
+					}
+				});
+			}
+
+			if (plugin.getGui().isChestVoteTopBackButton()) {
+				if (customzationEnabled) {
+					inv.addButton(plugin.getCommandLoader().getBackButton(user)
+							.setSlot(customization.getInt("BackButtonSlot", 0)));
+				} else {
+					inv.getPageButtons().add(plugin.getCommandLoader().getBackButton(user).setSlot(1));
+				}
+			}
+
+			String guiPath = "VoteTop.Customization";
+			for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+				inv.addButton(
+						new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+							@Override
+							public void onClick(ClickEvent clickEvent) {
+								plugin.getCommandLoader().processSlotClick(player, user, str);
+								new RewardBuilder(plugin.getGui().getData(),
+										"CHEST." + guiPath + ".ExtraItems." + str + ".Rewards").setGiveOffline(false)
+										.send(clickEvent.getPlayer());
+
+							}
+						});
+			}
+
+			if (customization == null || !customzationEnabled || !customization.getBoolean("RemoveBottomBar")) {
+				inv.setPages(true);
+			}
 			inv.setMaxInvSize(plugin.getGui().getChestVoteTopSize());
 			inv.openInventory(player);
 		} catch (Exception e) {
@@ -15,6 +15,7 @@ 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;

 public class VoteTopVoterLastMonth extends GUIHandler {
@@ -23,7 +24,7 @@ public class VoteTopVoterLastMonth extends GUIHandler {
 	private VotingPluginUser user;

 	public VoteTopVoterLastMonth(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}
@@ -44,7 +45,7 @@ public class VoteTopVoterLastMonth extends GUIHandler {

 	@Override
 	public void onChest(Player player) {
-		Set<Entry<VotingPluginUser, Integer>> users = null;
+		Set<Entry<TopVoterPlayer, Integer>> users = null;

 		users = plugin.getLastMonthTopVoter().entrySet();

@@ -55,7 +56,7 @@ public class VoteTopVoterLastMonth extends GUIHandler {
 		}

 		int pos = 1;
-		for (Entry<VotingPluginUser, Integer> entry : users) {
+		for (Entry<TopVoterPlayer, Integer> entry : users) {
 			ItemBuilder playerItem;

 			if (plugin.getGui().isChestVoteTopUseSkull()) {
@@ -64,7 +65,7 @@ public class VoteTopVoterLastMonth extends GUIHandler {
 				playerItem = new ItemBuilder(Material.valueOf(plugin.getGui().getChestVoteTopPlayerItemMaterial()));
 			}

-			playerItem.setLore(new ArrayList<String>());
+			playerItem.setLore(new ArrayList<>());

 			inv.addButton(new BInventoryButton(playerItem.setName(plugin.getGui().getChestVoteTopItemName())
 					.addLoreLine(plugin.getGui().getChestVoteTopItemLore()).addPlaceholder("position", "" + pos)
@@ -73,15 +74,15 @@ public class VoteTopVoterLastMonth extends GUIHandler {

 				@Override
 				public void onClick(ClickEvent clickEvent) {
-					VotingPluginUser user = (VotingPluginUser) getData("User");
-					new VoteGUI(plugin, player, user)
+					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++;
 		}

-		if (plugin.getGui().getChestVoteTopBackButton()) {
+		if (plugin.getGui().isChestVoteTopBackButton()) {
 			inv.getPageButtons().add(plugin.getCommandLoader().getBackButton(user).setSlot(1));
 		}

@@ -0,0 +1,147 @@
+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;
+	}
+
+	public void next(int index) {
+
+	}
+
+	@Override
+	public void onBook(Player player) {
+		// TODO
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+	}
+
+	@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;
+		}
+		if (yearMonthList.size() <= index) {
+			player.sendMessage(ChatColor.RED + "Can't open previous months, no data for requested index");
+			return;
+		}
+		yearMonth = yearMonthList.get(index);
+
+		Set<Entry<TopVoterPlayer, Integer>> users = null;
+		if (!plugin.getPreviousMonthsTopVoters().containsKey(yearMonth)) {
+			player.sendMessage(ChatColor.RED + "Can't open previous months, no data");
+			return;
+		}
+		users = plugin.getPreviousMonthsTopVoters().get(yearMonth).entrySet();
+
+		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<>());
+
+			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);
+	}
+
+}
@@ -9,29 +9,30 @@ 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.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;

 public class VoteTotal extends GUIHandler {

-	@SuppressWarnings("unused")
 	private VotingPluginMain plugin;
 	private VotingPluginUser user;

 	public VoteTotal(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}

 	@Override
 	public ArrayList<String> getChat(CommandSender arg0) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();

 		int daily = user.getTotal(TopVoter.Daily);
 		int weekly = user.getTotal(TopVoter.Weekly);
@@ -39,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
@@ -66,7 +67,7 @@ public class VoteTotal extends GUIHandler {
 		inv.addPlaceholder("player", user.getPlayerName());

 		for (final TopVoter top : TopVoter.values()) {
-			inv.addButton(new UpdatingBInventoryButton(
+			inv.addButton(new UpdatingBInventoryButton(plugin,
 					new ItemBuilder(plugin.getGui().getChestVoteTotalItem(top))
 							.addPlaceholder("Total", "" + user.getTotal(top)).addPlaceholder("topvoter", top.getName()),
 					1000, 1000) {
@@ -85,7 +86,23 @@ public class VoteTotal extends GUIHandler {
 			});
 		}

-		if (plugin.getGui().getChestVoteTotalBackButton()) {
+		String guiPath = "VoteTotal";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
+		if (plugin.getGui().isChestVoteTotalBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 		inv.openInventory(player);
@@ -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,13 +19,12 @@ 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;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;

 import xyz.upperlevel.spigot.book.BookUtil;
@@ -36,56 +36,69 @@ public class VoteURL extends GUIHandler {
 	private VotingPluginUser user;

 	public VoteURL(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, boolean json) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 		this.json = json;
 		if (user == null && player instanceof Player) {
-			this.user = UserManager.getInstance().getVotingPluginUser((Player) player);
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) player);
 		}
 		if (player != null && user != null && player.getName().equals(user.getPlayerName())) {
 			if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
-				user = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
+				user = plugin.getVotingPluginUserManager().getVotingPluginUser(user.getPrimaryAccount());
 			}
 		}
 	}

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

 		List<String> title = plugin.getConfigFile().getFormatCommandsVoteText();
 		if (title != null) {
 			sites.addAll(title);
 		}
-		if (plugin.getConfigFile().getFormatCommandsVoteAutoInputSites()) {
+		if (plugin.getConfigFile().isFormatCommandsVoteAutoInputSites()) {
 			int counter = 0;
-			for (VoteSite voteSite : plugin.getVoteSites()) {
+			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());
 				}
 			}
 		}
 		if (user != null) {
-			HashMap<String, String> phs = new HashMap<String, String>();
+			HashMap<String, String> phs = new HashMap<>();
 			phs.put("DailyTotal", "" + user.getTotal(TopVoter.Daily));
 			phs.put("WeekTotal", "" + user.getTotal(TopVoter.Weekly));
 			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() {
@@ -118,13 +131,16 @@ public class VoteURL extends GUIHandler {

 		if (user.canVoteSite(voteSite)) {
 			builder = new ItemBuilder(plugin.getGui().getChestVoteURLCanVoteItemSection());
-			builder.setName(
-					plugin.getGui().getChestVoteURLGUISiteNameCanVote().replace("%Name%", voteSite.getDisplayName()));
+			builder.setName(plugin.getGui().getChestVoteURLGUISiteNameCanVote());
 		} else {
-			builder.setName(plugin.getGui().getChestVoteURLGUISiteName().replace("%Name%", voteSite.getDisplayName()));
-			builder.addLoreLine(
-					plugin.getGui().getChestVoteURLNextVote().replace("%Info%", user.voteCommandNextInfo(voteSite)));
+			builder.setName(plugin.getGui().getChestVoteURLGUISiteName());
+			builder.addLoreLine(plugin.getGui().getChestVoteURLNextVote());
 		}
+		builder.addPlaceholder("ServiceSite", voteSite.getServiceSite());
+		builder.addPlaceholder("Name", voteSite.getDisplayName());
+		builder.addPlaceholder("VoteDelay", "" + voteSite.getVoteDelay());
+		builder.addPlaceholder("VoteHour", "" + voteSite.getVoteDelayDailyHour());
+		builder.addPlaceholder("Info", user.voteCommandNextInfo(voteSite));

 		return builder;
 	}
@@ -133,21 +149,31 @@ public class VoteURL extends GUIHandler {
 	public void onBook(Player player) {
 		BookWrapper book = new BookWrapper(plugin.getGui().getBookVoteURLBookGUITitle());

-		for (VoteSite site : plugin.getVoteSites()) {
-			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();
-			}
-			String url = StringParser.getInstance().replacePlaceHolder(site.getVoteURLJsonStrip(), "player",
-					user.getPlayerName());
-			layout.replaceTextComponent("[UrlText]", BookUtil.TextBuilder.of(text).color(color)
-					.onClick(BookUtil.ClickAction.openUrl(url)).onHover(BookUtil.HoverAction.showText(url)).build());
+		if (plugin.getGui().isBookVoteURLBookGUIManual()) {
+			Layout layout = new Layout(plugin.getGui().getBookVoteURLBookGUITopLayout());
 			book.addLayout(layout);
-
+		}
+		int i = 1;
+		for (VoteSite site : plugin.getVoteSitesEnabled()) {
+			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++;
+				}
+			}
 		}

 		book.open(player);
@@ -162,16 +188,21 @@ public class VoteURL extends GUIHandler {
 	public void onChest(Player player) {
 		// normal GUI
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteURLName());
-		if (plugin.getGui().getChestVoteURLViewAllUrlsButtonEnabled()) {
+		if (plugin.getGui().isChestVoteURLViewAllUrlsButtonEnabled()) {
 			ItemBuilder builderAll = getItemAll();

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

 				@Override
 				public void onClick(ClickEvent event) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(event.getPlayer());
+					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
@@ -182,53 +213,61 @@ public class VoteURL extends GUIHandler {
 		}

 		int startSlot = plugin.getGui().getChestVoteURLAllUrlsButtonStartSlot();
-		for (final VoteSite voteSite : plugin.getVoteSites()) {
+		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(builder, 1000, 1000) {
+					inv.addButton(new UpdatingBInventoryButton(plugin, builder, 5000, 5000) {

-					@Override
-					public void onClick(ClickEvent event) {
-						Player player = event.getPlayer();
-						if (player != null) {
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-							user.sendMessage(StringParser.getInstance().replacePlaceHolder(StringParser.getInstance()
-									.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
-											plugin.getGui().getChestVoteURLURLText(), "voteurl", voteSite.getVoteURL()),
-											"sitename", voteSite.getDisplayName()),
-									"player", player.getName()));
+						@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<>();
+								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
 				public void onClick(ClickEvent clickEvent) {
-					new RewardBuilder(plugin.getGui().getData(), "CHEST.VoteURL.ExtraItems." + str + ".Rewards")
+					new RewardBuilder(plugin.getGui().getData(),
+							"CHEST.VoteURL.ExtraItems." + str + "." + clickEvent.getButton().getLastRewardsPath(player))
 							.setGiveOffline(false).send(clickEvent.getPlayer());
-					;
+
 				}
 			});
 		}

-		if (plugin.getGui().getChestVoteURLBackButton()) {
+		if (plugin.getGui().isChestVoteURLBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}

@@ -24,7 +24,7 @@ public class VoteURLVoteSite extends GUIHandler {
 	private String voteSite;

 	public VoteURLVoteSite(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, String voteSite) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 		this.voteSite = voteSite;
@@ -51,7 +51,7 @@ public class VoteURLVoteSite extends GUIHandler {
 			player.sendMessage("Not a valid votesite");
 			return;
 		}
-		VoteSite site = plugin.getVoteSite(voteSite);
+		VoteSite site = plugin.getVoteSite(voteSite, true);
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteURLSiteName());
 		inv.addPlaceholder("site", site.getDisplayName());
 		inv.setMeta(player, "VoteSite", site);
@@ -69,7 +69,7 @@ public class VoteURLVoteSite extends GUIHandler {
 					}
 				});

-		inv.addButton(new UpdatingBInventoryButton(
+		inv.addButton(new UpdatingBInventoryButton(plugin,
 				new ItemBuilder(Material.COMPASS).setName("&4Next Vote").addLoreLine(user.voteCommandNextInfo(site)),
 				1000, 1000) {

@@ -94,7 +94,7 @@ public class VoteURLVoteSite extends GUIHandler {
 			}
 		});

-		if (plugin.getGui().getChestVoteURLBackButton()) {
+		if (plugin.getGui().isChestVoteURLBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 		inv.openInventory(player);
@@ -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;

 /**
@@ -32,15 +32,15 @@ public class AdminVoteTabCompleter implements TabCompleter {
 	@Override
 	public List<String> onTabComplete(CommandSender sender, Command cmd, String alias, String[] args) {

-		List<String> tab = new ArrayList<String>();
+		List<String> tab = new ArrayList<>();

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

-		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;

 /**
@@ -39,19 +39,19 @@ public class AliasesTabCompleter implements TabCompleter {
 	 */
 	@Override
 	public List<String> onTabComplete(CommandSender sender, Command cmd, String alias, String[] argsIn) {
-		ArrayList<String> msgArray = new ArrayList<String>();
+		ArrayList<String> msgArray = new ArrayList<>();
 		msgArray.add("");
 		for (String arg : argsIn) {
 			msgArray.add(arg);
 		}

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

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

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

-		ArrayList<CommandHandler> cmdHandlers = new ArrayList<CommandHandler>();
+		ArrayList<CommandHandler> cmdHandlers = new ArrayList<>();

 		if (adminCommand) {
 			cmdHandlers.addAll(plugin.getAdminVoteCommand());
@@ -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);
 			}
 		}