First Commit - Only Bukkit tested!