diff --git a/UCDaccounts/login/client.lua b/UCDaccounts/login/client.lua
index de7b9d7..5f2ad89 100644
--- a/UCDaccounts/login/client.lua
+++ b/UCDaccounts/login/client.lua
@@ -109,7 +109,7 @@ addEventHandler("onClientMouseLeave", guiRoot,
 function drawElements()
 	dxDrawRectangle(0, 0, sX, sY, tocolor(0, 0, 0, 75), false, false, false, false) 
 	if (login.button.visible) then
-		dxDrawText("Remember my credentials", (1086 / nX) * sX, (595 / nY) * sY, (1329 / nX) * sX, (612 / nY) * sY, tocolor(255, 255, 255, 255), 1, "default-bold", "left", "center", false, false, false, false, true)
+		dxDrawText("Remember my credentials", 	(1086 / nX) * sX, (595 / nY) * sY, (1329 / nX) * sX, (612 / nY) * sY, tocolor(255, 255, 255, 255), 1, "default-bold", "left", "center", false, false, false, false, true)
 		dxDrawText("Account Name", 				(1047 / nX) * sX, (433 / nY) * sY, (1329 / nX) * sX, (463 / nY) * sY, tocolor(255, 255, 255, 255), 2, "default-bold", "left", "center", false, false, false, false, true)
 		dxDrawText("Password", 					(1047 / nX) * sX, (513 / nY) * sY, (1329 / nX) * sX, (543 / nY) * sY, tocolor(255, 255, 255, 255), 2, "default-bold", "left", "center", false, false, false, false, true)
 	end
@@ -118,18 +118,7 @@ function drawElements()
 		dxDrawText("Email", (1047 / nX) * sX, 				(413 / nY) * sY, (1329 / nX) * sX, (443 / nY) * sY, tocolor(255, 255, 255, 255), 2, "default-bold", "left", "center", false, false, false, false, true)
 		dxDrawText("Password", (1047 / nX) * sX, 			(493 / nY) * sY, (1329 / nX) * sX, (523 / nY) * sY, tocolor(255, 255, 255, 255), 2, "default-bold", "left", "center", false, false, false, false, true)
 		dxDrawText("Confirm Password", (1047 / nX) * sX, 	(573 / nY) * sY, (1329 / nX) * sX, (603 / nY) * sY, tocolor(255, 255, 255, 255), 2, "default-bold", "left", "center", false, false, false, false, true)
-	
-		--dxDrawText("Account Name", (1047 / nX) * sX, 		(383 / nY) * sY, (1329 / nX) * sX, (413 / nY) * sY, tocolor(255, 255, 255, 255), 2, "default-bold", "left", "center", false, false, false, false, true)
-		--dxDrawText("Email", (1047 / nX) * sX, 			(463 / nY) * sY, (1329 / nX) * sX, (493 / nY) * sY, tocolor(255, 255, 255, 255), 2, "default-bold", "left", "center", false, false, false, false, true)
-		--dxDrawText("Password", (1047 / nX) * sX, 			(543 / nY) * sY, (1329 / nX) * sX, (573 / nY) * sY, tocolor(255, 255, 255, 255), 2, "default-bold", "left", "center", false, false, false, false, true)
-		--dxDrawText("Confirm Password", (1047 / nX) * sX, 	(623 / nY) * sY, (1329 / nX) * sX, (653 / nY) * sY, tocolor(255, 255, 255, 255), 2, "default-bold", "left", "center", false, false, false, false, true)
-	end
-	
-	--dxDrawRectangle((567 / nX) * sX, (433 / nY) * sY, dxGetTextWidth("Login", 2, "default-bold"), (30 / nY) * sY, tocolor(0, 0, 0, 255), false, false, false, false) 
-	--dxDrawRectangle((567 / nX) * sX, (483 / nY) * sY, dxGetTextWidth("Register", 2, "default-bold"), (30 / nY) * sY, tocolor(0, 0, 0, 255), false, false, false, false) 
-	--dxDrawRectangle((567 / nX) * sX, (533 / nY) * sY, dxGetTextWidth("About UCD", 2, "default-bold"), (30 / nY) * sY, tocolor(0, 0, 0, 255), false, false, false, false) 
-	--dxDrawRectangle((567 / nX) * sX, (583 / nY) * sY, dxGetTextWidth("Admins Online", 2, "default-bold"), (30 / nY) * sY, tocolor(0, 0, 0, 255), false, false, false, false) 
-	--dxDrawRectangle((567 / nX) * sX, (633 / nY) * sY, dxGetTextWidth("Disconnect", 2, "default-bold"), (30 / nY) * sY, tocolor(0, 0, 0, 255), false, false, false, false)
+	end	
 	
 	dxDrawText("Login", (567 / nX) * sX, (433 / nY) * sY, (725 / nX) * sX, (463 / nY) * sY, tocolor(255, 255, 255, 255), scale[1], "default-bold", "left", "center", false, false, false, false, true)
 	dxDrawText("Register", (567 / nX) * sX, (483 / nY) * sY, (725 / nX) * sX, (513 / nY) * sY, tocolor(255, 255, 255, 255), scale[2], "default-bold", "left", "center", false, false, false, false, true)
@@ -156,11 +145,15 @@ function onClientClick(button, state, aX, aY)
 		end
 		-- Login button
 		if (aX >= lX and aX <= lW and aY >= lY and aY <= lH) then
-			for k, v in pairs(RPE) do
-				v.visible = false
+			if (RPE) then
+				for k, v in pairs(RPE) do
+					v.visible = false
+				end
 			end
-			for k, v in pairs(LPE) do
-				v.visible = true
+			if (LPE) then
+				for k, v in pairs(LPE) do
+					v.visible = true
+				end
 			end
 		end
 	end
@@ -182,7 +175,6 @@ addEventHandler("onClientResourceStart", resourceRoot,
 		if (not isPlayerLoggedIn(localPlayer)) then
 			triggerServerEvent("UCDaccounts.removeLoginText", resourceRoot)
 			triggerServerEvent("UCDadmin.banCheck", resourceRoot)
-			--triggerServerEvent("UCDaccounts.fetchUpdates", resourceRoot)
 		
 			guiSetInputEnabled(true)
 			
@@ -192,16 +184,17 @@ addEventHandler("onClientResourceStart", resourceRoot,
 				b.alpha = 0 
 			end
 			
-			login.button = GuiButton((1047 / nX) * sX, (622 / nY) * sY, (272 / nX) * sX, (42 / nY) * sY, "Login", false)
-			login.checkbox = GuiCheckBox((1061 / nX) * sX, (595 / nY) * sY, (15 / nX) * sX, (17 / nY) * sY, "", false, false)	
-			login.edit["usr"] = GuiEdit((1037 / nX) * sX, (467 / nY) * sY, (292 / nX) * sX, (40 / nY) * sY, "", false)
-			login.edit["passwd"] = GuiEdit((1037 / nX) * sX, (549 / nY) * sY, (292 / nX) * sX, (40 / nY) * sY, "", false)
-			login.edit["passwd"].masked = true
-			login.memo = GuiMemo((577 / nX) * sX, (719 / nY) * sY, (740 / nX) * sX, (316 / nY) * sY, "", false)
-			login.memo.readOnly = true
-			login.memo.text = "Fetching updates.."
-			fetchRemote("http://ucdmta.com/updates.txt", displayUpdates)
-			login.button.enabled = true
+			login.button 					= GuiButton((1047 / nX) * sX, (622 / nY) * sY, (272 / nX) * sX, (42 / nY) * sY, "Login", false)
+			login.checkbox 					= GuiCheckBox((1061 / nX) * sX, (595 / nY) * sY, (15 / nX) * sX, (17 / nY) * sY, "", false, false)	
+			login.edit["usr"] 				= GuiEdit((1037 / nX) * sX, (467 / nY) * sY, (292 / nX) * sX, (40 / nY) * sY, "", false)
+			login.edit["passwd"] 			= GuiEdit((1037 / nX) * sX, (549 / nY) * sY, (292 / nX) * sX, (40 / nY) * sY, "", false)
+			login.memo 						= GuiMemo((577 / nX) * sX, (719 / nY) * sY, (740 / nX) * sX, (316 / nY) * sY, "", false)
+			login.memo.text 				= "Fetching updates..."
+			login.memo.readOnly 			= true
+			login.edit["passwd"].masked 	= true
+			login.button.enabled 			= true
+			
+			fetchRemote("http://ucdmta.com/updates.php", displayUpdates)
 			
 			LPE = {login.button, login.checkbox, login.edit["usr"], login.edit["passwd"]}
 			for k, v in pairs(LPE) do
@@ -212,13 +205,13 @@ addEventHandler("onClientResourceStart", resourceRoot,
 			--addEventHandler("onClientGUIClick", login.button[2], onClickRegister, false)
 			--addEventHandler("onClientGUIChanged", guiRoot, onLoginEditsChanged)
 			
-			registration.button = GuiButton((1047/ nX) * sX, (657 / nY) * sY, (272 / nX) * sX, (42 / nY) * sY, "Register", false)
-			registration.edit["usr"] =				GuiEdit((1037/ nX) * sX, (367 / nY) * sY, (292 / nX) * sX, (40 / nY) * sY, "", false)
-			registration.edit["email"] =			GuiEdit((1037/ nX) * sX, (447 / nY) * sY, (292 / nX) * sX, (40 / nY) * sY, "", false)
-			registration.edit["passwd"] = 			GuiEdit((1037/ nX) * sX, (527 / nY) * sY, (292 / nX) * sX, (40 / nY) * sY, "", false)
-			registration.edit["passwd_confirm"] = 	GuiEdit((1037/ nX) * sX, (607 / nY) * sY, (292 / nX) * sX, (40 / nY) * sY, "", false)
-			registration.edit["passwd"].masked = true
-			registration.edit["passwd_confirm"].masked = true
+			registration.button 							= GuiButton((1047/ nX) * sX, (657 / nY) * sY, (272 / nX) * sX, (42 / nY) * sY, "Register", false)
+			registration.edit["usr"] 						= GuiEdit((1037/ nX) * sX, (367 / nY) * sY, (292 / nX) * sX, (40 / nY) * sY, "", false)
+			registration.edit["email"] 						= GuiEdit((1037/ nX) * sX, (447 / nY) * sY, (292 / nX) * sX, (40 / nY) * sY, "", false)
+			registration.edit["passwd"] 					= GuiEdit((1037/ nX) * sX, (527 / nY) * sY, (292 / nX) * sX, (40 / nY) * sY, "", false)
+			registration.edit["passwd_confirm"] 			= GuiEdit((1037/ nX) * sX, (607 / nY) * sY, (292 / nX) * sX, (40 / nY) * sY, "", false)
+			registration.edit["passwd"].masked 				= true
+			registration.edit["passwd_confirm"].masked 		= true
 			
 			--[[
 			registration.button = GuiButton((1047/ nX) * sX, (707 / nY) * sY, (272 / nX) * sX, (42 / nY) * sY, "Register", false)
@@ -453,13 +446,17 @@ function onClickRegister(button, state, login)
 			--guiBringToFront(registration.window[1])
 			--guiSetInputEnabled(true)
 			
-			for _, v in pairs(RPE) do
-				v.visible = true
+			if (RPE) then
+				for _, v in pairs(RPE) do
+					v.visible = true
+				end
 			end
 			
 			-- Hide other login elements
-			for _, v in pairs(LPE) do
-				v.visible = false
+			if (LPE) then
+				for _, v in pairs(LPE) do
+					v.visible = false
+				end
 			end
 			
 			if (not isCursorShowing()) then showCursor(true) end
@@ -536,7 +533,7 @@ addEvent("UCDaccounts.login.destroyInterface", true)
 addEventHandler("UCDaccounts.login.destroyInterface", root, destroyInterface)
 
 function toggleLogin()
-	if (login.button and isElement(login.button)) then
+	if (login and login.button and isElement(login.button)) then
 		login.button.enabled = not login.button.enabled
 	end
 end
@@ -591,4 +588,4 @@ function xmllol()
 	end
 end
 addEvent("UCDaccounts.login.saveAccountCredentials", true)
-addEventHandler("UCDaccounts.login.saveAccountCredentials", root, xmllol)
\ No newline at end of file
+addEventHandler("UCDaccounts.login.saveAccountCredentials", root, xmllol)
diff --git a/UCDaccounts/login/server.lua b/UCDaccounts/login/server.lua
index 4d41bcc..6707372 100644
--- a/UCDaccounts/login/server.lua
+++ b/UCDaccounts/login/server.lua
@@ -20,7 +20,7 @@ local matrixViewPositions = {
 	{1862.90833, -1452.45300, 140.37985, 1528.33813, -1258.09937, 215.22653},
 	{1674.29980, -895.24408, 531.87439, 1659.51709, -982.78577, 39.61652},
 	{-903.80847, 1740.82678, 171.57216, -720.15826, 2015.47437, 56.53033},
-	-- My own bc I am god
+	-- My own bc I am [s]god[/s] I told you I don't believe in christmas kid - Risk (yes, bbc)
 	{1380.4105, -748.9726, 104.6013, 1460.8162, -1051.0956, 95.9769},
 	{2139.718, 1899.7533, 12.9899, 2034.3885, 1921.8209, 14.3957},
 	{-1211.5592, -2928.3223, 67.2434, -1071.653, -2823.7144, 46.9938},
diff --git a/UCDadmin/GUI/UCDatm/HEAD b/UCDadmin/GUI/UCDatm/HEAD
new file mode 100644
index 0000000..cb089cd
--- /dev/null
+++ b/UCDadmin/GUI/UCDatm/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master
diff --git a/UCDadmin/GUI/UCDatm/config b/UCDadmin/GUI/UCDatm/config
new file mode 100644
index 0000000..07d359d
--- /dev/null
+++ b/UCDadmin/GUI/UCDatm/config
@@ -0,0 +1,4 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
diff --git a/UCDadmin/GUI/UCDatm/description b/UCDadmin/GUI/UCDatm/description
new file mode 100644
index 0000000..498b267
--- /dev/null
+++ b/UCDadmin/GUI/UCDatm/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/UCDadmin/GUI/UCDatm/hooks/applypatch-msg.sample b/UCDadmin/GUI/UCDatm/hooks/applypatch-msg.sample
new file mode 100755
index 0000000..a5d7b84
--- /dev/null
+++ b/UCDadmin/GUI/UCDatm/hooks/applypatch-msg.sample
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
+test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
+:
diff --git a/UCDadmin/GUI/UCDatm/hooks/commit-msg.sample b/UCDadmin/GUI/UCDatm/hooks/commit-msg.sample
new file mode 100755
index 0000000..b58d118
--- /dev/null
+++ b/UCDadmin/GUI/UCDatm/hooks/commit-msg.sample
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}
diff --git a/UCDadmin/GUI/UCDatm/hooks/post-update.sample b/UCDadmin/GUI/UCDatm/hooks/post-update.sample
new file mode 100755
index 0000000..ec17ec1
--- /dev/null
+++ b/UCDadmin/GUI/UCDatm/hooks/post-update.sample
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info
diff --git a/UCDadmin/GUI/UCDatm/hooks/pre-applypatch.sample b/UCDadmin/GUI/UCDatm/hooks/pre-applypatch.sample
new file mode 100755
index 0000000..4142082
--- /dev/null
+++ b/UCDadmin/GUI/UCDatm/hooks/pre-applypatch.sample
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+precommit="$(git rev-parse --git-path hooks/pre-commit)"
+test -x "$precommit" && exec "$precommit" ${1+"$@"}
+:
diff --git a/UCDadmin/GUI/UCDatm/hooks/pre-commit.sample b/UCDadmin/GUI/UCDatm/hooks/pre-commit.sample
new file mode 100755
index 0000000..68d62d5
--- /dev/null
+++ b/UCDadmin/GUI/UCDatm/hooks/pre-commit.sample
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --
diff --git a/UCDadmin/GUI/UCDatm/hooks/pre-push.sample b/UCDadmin/GUI/UCDatm/hooks/pre-push.sample
new file mode 100755
index 0000000..6187dbf
--- /dev/null
+++ b/UCDadmin/GUI/UCDatm/hooks/pre-push.sample
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local sha1> <remote ref> <remote sha1>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+z40=0000000000000000000000000000000000000000
+
+while read local_ref local_sha remote_ref remote_sha
+do
+	if [ "$local_sha" = $z40 ]
+	then
+		# Handle delete
+		:
+	else
+		if [ "$remote_sha" = $z40 ]
+		then
+			# New branch, examine all commits
+			range="$local_sha"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_sha..$local_sha"
+		fi
+
+		# Check for WIP commit
+		commit=`git rev-list -n 1 --grep '^WIP' "$range"`
+		if [ -n "$commit" ]
+		then
+			echo >&2 "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0
diff --git a/UCDadmin/GUI/UCDatm/hooks/pre-rebase.sample b/UCDadmin/GUI/UCDatm/hooks/pre-rebase.sample
new file mode 100755
index 0000000..33730ca
--- /dev/null
+++ b/UCDadmin/GUI/UCDatm/hooks/pre-rebase.sample
@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up-to-date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+<<\DOC_END
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".
+
+DOC_END
diff --git a/UCDadmin/GUI/UCDatm/hooks/prepare-commit-msg.sample b/UCDadmin/GUI/UCDatm/hooks/prepare-commit-msg.sample
new file mode 100755
index 0000000..f093a02
--- /dev/null
+++ b/UCDadmin/GUI/UCDatm/hooks/prepare-commit-msg.sample
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples.  The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+case "$2,$3" in
+  merge,)
+    /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+#   /usr/bin/perl -i.bak -pe '
+#      print "\n" . `git diff --cached --name-status -r`
+#	 if /^#/ && $first++ == 0' "$1" ;;
+
+  *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
diff --git a/UCDadmin/GUI/UCDatm/hooks/update.sample b/UCDadmin/GUI/UCDatm/hooks/update.sample
new file mode 100755
index 0000000..80ba941
--- /dev/null
+++ b/UCDadmin/GUI/UCDatm/hooks/update.sample
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to block unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0
diff --git a/UCDadmin/GUI/UCDatm/info/exclude b/UCDadmin/GUI/UCDatm/info/exclude
new file mode 100644
index 0000000..a5196d1
--- /dev/null
+++ b/UCDadmin/GUI/UCDatm/info/exclude
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff --git a/UCDadmin/GUI/actions_s.lua b/UCDadmin/GUI/actions_s.lua
index a8af9ea..92b62dd 100644
--- a/UCDadmin/GUI/actions_s.lua
+++ b/UCDadmin/GUI/actions_s.lua
@@ -174,7 +174,9 @@ addEvent("UCDadmin.freeze", true)
 addEventHandler("UCDadmin.freeze", root, freezePlayer)
 
 function shoutToPlayer(plr, text)
-	-- Have to make this post GUI
+	if (not plr or not isElement(plr) or not text or not tostring(text)) then return end
+	exports.UCDdx:shout(plr, text) -- POST GUI'ED
+	exports.UCDlogging:adminLog(client.account.name, client.name.." has shouted '"..text.."' at "..plr.name)
 end
 addEvent("UCDadmin.shout", true)
 addEventHandler("UCDadmin.shout", root, shoutToPlayer)
@@ -223,12 +225,16 @@ addEventHandler("UCDadmin.rename", root, renamePlayer)
 
 function takeScreenshotOfPlayer(plr)
 	-- This one will take a while
+	-- If this'd be spammed we'd get rekt...
 end
 addEvent("UCDadmin.takeScreenshot", true)
 addEventHandler("UCDadmin.takeScreenshot", root, takeScreenshotOfPlayer)
 
 function setPlayerMoney_(plr, newAmount)
-	
+	if (not newAmount or not tonumber(newAmount) or tonumber(newAmount) == plr.money) then return end
+	-- if (plr == client) then return end for further use
+	plr.money = newAmount
+	exports.UCDlogging:adminLog(client.account.name, client.name.." has set "..plr.name.."'s money from $"..exports.UCDutil:tocomma(plr.money).." to $"..exports.UCDutil:tocomma(newAmount))
 end
 addEvent("UCDadmin.setMoney", true)
 addEventHandler("UCDadmin.setMoney", root, setPlayerMoney_)
@@ -314,7 +320,12 @@ function giveVehicle(plr, vehicle)
 		local spawnedVehicle
 		
 		-- We're dealing with a vehicle ID
-		if tostring(vehicle):match("%d") and tonumber(vehicle) ~= false and tonumber(vehicle) ~= nil then
+		if (vehicle:gsub(" ", "") == "" or not Vehicle.getNameFromModel(vehicle)) then
+			exports.UCDdx:new(client, "You must specify a valid vehicle name or ID", 255, 0, 0)
+			return false
+		end
+		
+		if (tostring(vehicle):match("%d") and tonumber(vehicle) ~= false and tonumber(vehicle) ~= nil) then
 			if (not Vehicle.getNameFromModel(vehicle) or Vehicle.getNameFromModel(vehicle) == "" or Vehicle.getNameFromModel(vehicle) == " ") then
 				exports.UCDdx:new(client, "You must specify a valid vehicle name or ID", 255, 0, 0)
 				return
@@ -356,17 +367,22 @@ function fixVehicle_(plr, vehicle)
 			return
 		end
 		if (vehicle:getData("vehicleID") and type(vehicle:getData("vehicleID")) == number) then
-			if (getPlayerAdminRank(client) < 4) then
-				exports.UCDdx:new(client, "You are not allowed to fix player vehicles until L4", 255, 0, 0)
-				return
+			--if (getPlayerAdminRank(client) < 4) then
+			--	exports.UCDdx:new(client, "You are not allowed to fix player vehicles until L4", 255, 0, 0)
+			--	return
+			--end
+			local vehicleID = vehicle:getData("vehicleID")
+			if (exports.UCDvehicles:getVehicleData(vehicleID, "owner") == client.account.name and not canAdminDoAction(client, 14)) then
+				exports.UCDdx:new(client, "You are not allowed to repair your own purchased vehicles", 255, 0, 0)
+				return false
 			end
-			exports.UCDvehicles:setVehicleData(vehicle:getData("vehicleID"), "health", 1000)
+			exports.UCDvehicles:setVehicleData(vehicleID, "health", 1000)
 		end
 		exports.UCDvehicles:fix(vehicle)
 		vehicle.health = 1000
-		exports.UCDdx:new(client, "You have fixed "..plr.name.."'s "..vehicle.name, 0, 255, 0)
-		exports.UCDdx:new(plr, client.name.." has fixed your "..vehicle.name, 0, 255, 0)
-		exports.UCDlogging:adminLog(client.account.name, client.name.." has fixed "..plr.name.."'s "..vehicle.name)
+		exports.UCDdx:new(client, "You have fixed "..tostring(plr.name).."'s "..tostring(vehicle.name), 0, 255, 0)
+		exports.UCDdx:new(plr, client.name.." has fixed your "..tostring(vehicle.name), 0, 255, 0)
+		exports.UCDlogging:adminLog(client.account.name, tostring(client.name).." has fixed "..tostring(plr.name).."'s "..tostring(vehicle.name))
 	end
 end
 addEvent("UCDadmin.fixVehicle", true)
@@ -378,9 +394,9 @@ function ejectPlayerFromVehicle(plr, vehicle)
 			return
 		end
 		plr:removeFromVehicle(vehicle)
-		exports.UCDdx:new(client, "You have ejected "..plr.name.." from their "..vehicle.name, 0, 255, 0)
-		exports.UCDdx:new(plr, "You have been ejected from your "..vehicle.name.." by "..plr.name, 0, 255, 0)
-		exports.UCDlogging:adminLog(client.account.name, client.name.." has ejected "..plr.name.." from their vehicle")
+		exports.UCDdx:new(client, "You have ejected "..tostring(plr.name).." from their "..tostring(vehicle.name), 0, 255, 0)
+		exports.UCDdx:new(plr, "You have been ejected from your "..tostring(vehicle.name).." by "..tostring(client.name), 0, 255, 0)
+		exports.UCDlogging:adminLog(client.account.name, tostring(client.name).." has ejected "..tostring(plr.name).." from their "..tostring(vehicle.name))
 	end
 end
 addEvent("UCDadmin.ejectPlayer", true)
@@ -389,19 +405,26 @@ addEventHandler("UCDadmin.ejectPlayer", root, ejectPlayerFromVehicle)
 function destroyVehicle(plr, vehicle)
 	if (plr and client and isPlayerAdmin(client)) then
 		-- The vehicle may have been a player vehicle and hence already destroyed client-side
-		if vehicle then
+		exports.UCDdx:new(plr, "Your "..tostring(vehicle.name).." has been destroyed by "..tostring(client.name), 0, 255, 0)
+		exports.UCDdx:new(client, "You have destroyed "..tostring(plr.name).."'s "..tostring(vehicle.name), 0, 255, 0)
+		exports.UCDlogging:adminLog(client.account.name, tostring(client.name).." has destroyed "..tostring(plr.name).."'s "..tostring(vehicle.name))
+		if (vehicle) then
 			vehicle:destroy()
 		end
-		exports.UCDdx:new(plr, "Your vehicle has been destroyed by "..client.name, 0, 255, 0)
-		exports.UCDdx:new(client, "You have destroyed "..plr.name.."'s vehicle", 0, 255, 0)
-		exports.UCDlogging:adminLog(client.account.name, client.name.." has destroyed "..plr.name.."'s vehicle")
 	end
 end
 addEvent("UCDadmin.destroyVehicle", true)
 addEventHandler("UCDadmin.destroyVehicle", root, destroyVehicle)
 
 function disableVehicle(plr, vehicle)
-	
+	if (plr and client and vehicle and isPlayerAdmin(client)) then
+		if (vehicle and isElement(vehicle) and vehicle.type == "vehicle") then
+			vehicle.health = 250 -- Events are automatically triggered in UCDvehicles/vehicleDamage_s.lua and UCDvehicles/vehicleDamage.lua
+			exports.UCDdx:new(plr, "Your "..tostring(vehicle.name).." has been disabled by "..tostring(client.name), 0, 255, 0)
+			exports.UCDdx:new(client, "You have disabled "..tostring(plr.name).."'s "..tostring(vehicle.name), 0, 255, 0)
+			exports.UCDlogging:adminLog(client.account.name, tostring(client.name).." has disabled "..tostring(plr.name).."'s "..tostring(vehicle.name))
+		end
+	end
 end
 addEvent("UCDadmin.disableVehicle", true)
 addEventHandler("UCDadmin.disableVehicle", root, disableVehicle)
@@ -411,3 +434,25 @@ function blowVehicle_(plr, vehicle)
 end
 addEvent("UCDadmin.blowVehicle", true)
 addEventHandler("UCDadmin.blowVehicle", root, blowVehicle_)
+
+function viewPunishments(plr)
+	if (not exports.UCDaccounts:isPlayerLoggedIn(plr)) then return end
+	local temp
+	for _, v in ipairs(punishments) do
+		if (plr.account.name == v[1] or plr.serial == v[4]) then
+			if (not temp) then temp = {} end
+			if (v[1] == plr.account.name) then
+				if (not temp.accPunishments) then temp.accPunishments = {} end
+				table.insert(temp.accPunishments, {v[4], v[7]})
+			end
+			if (v[4] == plr.serial) then
+				if (not temp.serialPunishments) then temp.serialPunishments = {} end
+				table.insert(temp.serialPunishments, {v[1], v[7]})
+			end
+		end
+	end
+	if (not temp) then return end -- To save bandwidth -for you, sir Noki-, if not no calling back
+	triggerClientEvent(client, "UCDadmin.viewPunishments.callback", client, temp)
+end
+addEvent("UCDadmin.viewPunishments.call", true)
+addEventHandler("UCDadmin.viewPunishments.call", root, viewPunishments) -- calls back to insertPunishments in punishments/punishments_c.lua, if you are wonderin'
\ No newline at end of file
diff --git a/UCDadmin/GUI/c_panel.lua b/UCDadmin/GUI/c_panel.lua
index d030bbb..e404408 100644
--- a/UCDadmin/GUI/c_panel.lua
+++ b/UCDadmin/GUI/c_panel.lua
@@ -34,176 +34,286 @@ local actions = {
 	"Unjail",
 }
 
-adminPanel.window[1] = GuiWindow(697, 262, 665, 504, "UCD | Administrative & Management Panel", false)
-guiWindowSetSizable(adminPanel.window[1], false)
-guiSetVisible(adminPanel.window[1], false)
-exports.UCDutil:centerWindow(adminPanel.window[1])
-adminPanel.window[1].alpha = 1
-
-adminPanel.tabpanel[1] = guiCreateTabPanel(10, 24, 645, 470, false, adminPanel.window[1])
-
-adminPanel.tab[1] = guiCreateTab("Players", adminPanel.tabpanel[1])
-
-adminPanel.gridlist[1] = guiCreateGridList(10, 40, 151, 395, false, adminPanel.tab[1])
-guiGridListAddColumn(adminPanel.gridlist[1], "Player Name", 0.9)
-guiGridListSetSortingEnabled(adminPanel.gridlist[1], false)
-
-adminPanel.edit[1] = GuiEdit(10, 10, 151, 26, "", false, adminPanel.tab[1])
-adminPanel.label[1] = GuiLabel(170, 26, 290, 20, "Name: ", false, adminPanel.tab[1])
-adminPanel.label[2] = GuiLabel(170, 86, 290, 20, "IP: ", false, adminPanel.tab[1])
-guiLabelSetHorizontalAlign(adminPanel.label[2], "right", false)
-adminPanel.label[3] = GuiLabel(170, 66, 290, 20, "Serial: ", false, adminPanel.tab[1])
-adminPanel.label[4] = GuiLabel(171, 86, 289, 20, "Version: ", false, adminPanel.tab[1])
-adminPanel.label[5] = GuiLabel(170, 46, 290, 20, "Account Name: ", false, adminPanel.tab[1])
-adminPanel.label[6] = GuiLabel(171, 375, 289, 21, "Playtime: ", false, adminPanel.tab[1])
-adminPanel.label[7] = GuiLabel(170, 126, 290, 22, "Country: ", false, adminPanel.tab[1])
-adminPanel.label[9] = GuiLabel(170, 210, 290, 20, "Location: ", false, adminPanel.tab[1])
-adminPanel.label[10] = GuiLabel(170, 230, 290, 20, "Dimension: ", false, adminPanel.tab[1])
-adminPanel.label[11] = GuiLabel(170, 230, 290, 20, "Interior: ", false, adminPanel.tab[1])
-guiLabelSetHorizontalAlign(adminPanel.label[11], "right", false)
-adminPanel.label[12] = GuiLabel(170, 106, 290, 20, "Email: ", false, adminPanel.tab[1])
-adminPanel.label[13] = GuiLabel(170, 270, 290, 20, "Health: ", false, adminPanel.tab[1])
-adminPanel.label[14] = GuiLabel(170, 270, 290, 20, "Armour: ", false, adminPanel.tab[1])
-guiLabelSetHorizontalAlign(adminPanel.label[14], "right", false)
-adminPanel.label[15] = GuiLabel(171, 355, 289, 20, "Money: ", false, adminPanel.tab[1])
-adminPanel.label[16] = GuiLabel(170, 355, 290, 20, "Bank: ", false, adminPanel.tab[1])
-guiLabelSetHorizontalAlign(adminPanel.label[16], "right", false)
-adminPanel.label[17] = GuiLabel(170, 396, 291, 20, "Occupation: ", false, adminPanel.tab[1])
-guiLabelSetHorizontalAlign(adminPanel.label[17], "right", false)
-adminPanel.label[18] = GuiLabel(171, 396, 290, 20, "Class: ", false, adminPanel.tab[1])
-adminPanel.label[19] = GuiLabel(171, 335, 289, 20, "Group: ", false, adminPanel.tab[1])
-adminPanel.label[20] = GuiLabel(171, 375, 289, 21, "Team: ", false, adminPanel.tab[1])
-guiLabelSetHorizontalAlign(adminPanel.label[20], "right", false)
-adminPanel.label[21] = GuiLabel(170, 250, 267, 20, "Model: ", false, adminPanel.tab[1])
-adminPanel.label[22] = GuiLabel(171, 250, 290, 20, "Weapon: ", false, adminPanel.tab[1])
-guiLabelSetHorizontalAlign(adminPanel.label[22], "right", false)
-adminPanel.label[23] = GuiLabel(170, 26, 290, 20, "Ping: ", false, adminPanel.tab[1])
-guiLabelSetHorizontalAlign(adminPanel.label[23], "right", false)
-adminPanel.label[24] = GuiLabel(170, 416, 290, 20, "Vehicle: ", false, adminPanel.tab[1])
-adminPanel.label[25] = GuiLabel(170, 416, 290, 20, "Vehicle Health: ", false, adminPanel.tab[1])
-guiLabelSetHorizontalAlign(adminPanel.label[25], "right", false)
-adminPanel.label[26] = GuiLabel(170, 190, 290, 20, "X: N/A; Y: N/A; Z: N/A", false, adminPanel.tab[1])
-adminPanel.label[27] = GuiLabel(170, 168, 49, 22, "Locality", false, adminPanel.tab[1])
-guiSetFont(adminPanel.label[27], "default-bold-small")
-guiLabelSetColor(adminPanel.label[27], 255, 0, 0)
-adminPanel.label[28] = GuiLabel(170, 4, 49, 22, "Player", false, adminPanel.tab[1])
-guiSetFont(adminPanel.label[28], "default-bold-small")
-guiLabelSetColor(adminPanel.label[28], 255, 0, 0)
-adminPanel.label[29] = GuiLabel(170, 313, 49, 22, "Misc", false, adminPanel.tab[1])
-guiSetFont(adminPanel.label[29], "default-bold-small")
-guiLabelSetColor(adminPanel.label[29], 255, 0, 0)
-adminPanel.button[1] = GuiButton(488, 52, 147, 18, "Warp to player", false, adminPanel.tab[1])
-adminPanel.button[2] = GuiButton(488, 10, 147, 36, "Punish", false, adminPanel.tab[1])
-adminPanel.button[3] = GuiButton(488, 144, 72, 18, "Spectate", false, adminPanel.tab[1])
-adminPanel.button[4] = GuiButton(488, 76, 147, 18, "Warp player to", false, adminPanel.tab[1])
-adminPanel.button[5] = GuiButton(488, 100, 72, 18, "Reconnect", false, adminPanel.tab[1])
-adminPanel.button[6] = GuiButton(563, 100, 72, 18, "Kick", false, adminPanel.tab[1])
-adminPanel.button[7] = GuiButton(488, 122, 72, 18, "Freeze", false, adminPanel.tab[1])
-adminPanel.button[8] = GuiButton(563, 122, 72, 18, "Shout", false, adminPanel.tab[1])
-adminPanel.button[9] = GuiButton(563, 144, 72, 18, "Slap", false, adminPanel.tab[1])
-adminPanel.button[10] = GuiButton(488, 167, 72, 18, "Rename", false, adminPanel.tab[1])
-adminPanel.button[11] = GuiButton(488, 318, 147, 20, "View punishments", false, adminPanel.tab[1])
-adminPanel.button[12] = GuiButton(563, 167, 72, 18, "Screenshot", false, adminPanel.tab[1])
-adminPanel.button[13] = GuiButton(563, 195, 72, 18, "Set Model", false, adminPanel.tab[1])
-adminPanel.button[14] = GuiButton(488, 195, 72, 18, "Money", false, adminPanel.tab[1])
-adminPanel.button[15] = GuiButton(488, 220, 72, 18, "Set Health", false, adminPanel.tab[1])
-adminPanel.button[16] = GuiButton(563, 220, 72, 18, "Set Armour", false, adminPanel.tab[1])
-adminPanel.button[17] = GuiButton(488, 244, 72, 18, "Dimension", false, adminPanel.tab[1])
-adminPanel.button[18] = GuiButton(563, 244, 72, 18, "Interior", false, adminPanel.tab[1])
-adminPanel.button[19] = GuiButton(488, 369, 72, 18, "Fix", false, adminPanel.tab[1])
-adminPanel.button[20] = GuiButton(563, 369, 72, 18, "Eject", false, adminPanel.tab[1])
-adminPanel.button[21] = GuiButton(488, 392, 72, 18, "Destroy", false, adminPanel.tab[1])
-adminPanel.button[22] = GuiButton(563, 392, 72, 18, "Disable", false, adminPanel.tab[1])
-adminPanel.button[23] = GuiButton(563, 266, 72, 18, "Set Job", false, adminPanel.tab[1])
-adminPanel.button[24] = GuiButton(488, 341, 72, 18, "Anticheat", false, adminPanel.tab[1])
-adminPanel.button[25] = GuiButton(563, 341, 72, 18, "View Weps", false, adminPanel.tab[1])
-adminPanel.button[26] = GuiButton(488, 290, 72, 18, "Weapons", false, adminPanel.tab[1])
-adminPanel.button[27] = GuiButton(488, 266, 72, 18, "Give Vehicle", false, adminPanel.tab[1])
-adminPanel.button[28] = GuiButton(488, 416, 72, 18, "Blow", false, adminPanel.tab[1])
-adminPanel.button[29] = GuiButton(563, 416, 72, 18, "Freeze", false, adminPanel.tab[1])
-adminPanel.button[30] = GuiButton(563, 290, 72, 18, "Last Logins", false, adminPanel.tab[1])
-
--- Disable all at first
-for i = 1, #adminPanel.button do
-	adminPanel.button[i].enabled = false
+adminPanel.window = GuiWindow(697, 262, 665, 504, "UCD | Administrative & Management Panel", false)
+guiWindowSetSizable(adminPanel.window, false)
+guiSetVisible(adminPanel.window, false)
+exports.UCDutil:centerWindow(adminPanel.window)
+adminPanel.window.alpha = 1
+
+adminPanel.tabpanel = guiCreateTabPanel(10, 24, 645, 470, false, adminPanel.window)
+
+adminPanel.tab["players"] = guiCreateTab("Players", adminPanel.tabpanel)
+
+	adminPanel.gridlist[1] = guiCreateGridList(10, 40, 151, 395, false, adminPanel.tab["players"])
+	guiGridListAddColumn(adminPanel.gridlist[1], "Player Name", 0.9)
+	guiGridListSetSortingEnabled(adminPanel.gridlist[1], false)
+
+	adminPanel.edit[1] = GuiEdit(10, 10, 151, 26, "", false, adminPanel.tab["players"])
+	adminPanel.label[1] = GuiLabel(170, 26, 290, 20, "Name: ", false, adminPanel.tab["players"])
+	adminPanel.label[2] = GuiLabel(170, 86, 290, 20, "IP: ", false, adminPanel.tab["players"])
+	guiLabelSetHorizontalAlign(adminPanel.label[2], "right", false)
+	adminPanel.label[3] = GuiLabel(170, 66, 290, 20, "Serial: ", false, adminPanel.tab["players"])
+	adminPanel.label[4] = GuiLabel(171, 86, 289, 20, "Version: ", false, adminPanel.tab["players"])
+	adminPanel.label[5] = GuiLabel(170, 46, 290, 20, "Account Name: ", false, adminPanel.tab["players"])
+	adminPanel.label[6] = GuiLabel(171, 375, 289, 21, "Play time: ", false, adminPanel.tab["players"])
+	adminPanel.label[7] = GuiLabel(170, 126, 290, 22, "Country: ", false, adminPanel.tab["players"])
+	adminPanel.label[9] = GuiLabel(170, 210, 290, 20, "Location: ", false, adminPanel.tab["players"])
+	adminPanel.label[10] = GuiLabel(170, 230, 290, 20, "Dimension: ", false, adminPanel.tab["players"])
+	adminPanel.label[11] = GuiLabel(170, 230, 290, 20, "Interior: ", false, adminPanel.tab["players"])
+	guiLabelSetHorizontalAlign(adminPanel.label[11], "right", false)
+	adminPanel.label[12] = GuiLabel(170, 106, 290, 20, "Email: ", false, adminPanel.tab["players"])
+	adminPanel.label[13] = GuiLabel(170, 270, 290, 20, "Health: ", false, adminPanel.tab["players"])
+	adminPanel.label[14] = GuiLabel(170, 270, 290, 20, "Armour: ", false, adminPanel.tab["players"])
+	guiLabelSetHorizontalAlign(adminPanel.label[14], "right", false)
+	adminPanel.label[15] = GuiLabel(171, 355, 289, 20, "Money: ", false, adminPanel.tab["players"])
+	adminPanel.label[16] = GuiLabel(170, 355, 290, 20, "Bank: ", false, adminPanel.tab["players"])
+	guiLabelSetHorizontalAlign(adminPanel.label[16], "right", false)
+	adminPanel.label[17] = GuiLabel(170, 396, 291, 20, "Occupation: ", false, adminPanel.tab["players"])
+	guiLabelSetHorizontalAlign(adminPanel.label[17], "right", false)
+	adminPanel.label[18] = GuiLabel(171, 396, 290, 20, "Class: ", false, adminPanel.tab["players"])
+	adminPanel.label[19] = GuiLabel(171, 335, 289, 20, "Group: ", false, adminPanel.tab["players"])
+	adminPanel.label[20] = GuiLabel(171, 375, 289, 21, "Team: ", false, adminPanel.tab["players"])
+	guiLabelSetHorizontalAlign(adminPanel.label[20], "right", false)
+	adminPanel.label[21] = GuiLabel(170, 250, 267, 20, "Model: ", false, adminPanel.tab["players"])
+	adminPanel.label[22] = GuiLabel(171, 250, 290, 20, "Weapon: ", false, adminPanel.tab["players"])
+	guiLabelSetHorizontalAlign(adminPanel.label[22], "right", false)
+	adminPanel.label[23] = GuiLabel(170, 26, 290, 20, "Ping: ", false, adminPanel.tab["players"])
+	guiLabelSetHorizontalAlign(adminPanel.label[23], "right", false)
+	adminPanel.label[24] = GuiLabel(170, 416, 290, 20, "Vehicle: ", false, adminPanel.tab["players"])
+	adminPanel.label[25] = GuiLabel(170, 416, 290, 20, "Vehicle Health: ", false, adminPanel.tab["players"])
+	guiLabelSetHorizontalAlign(adminPanel.label[25], "right", false)
+	adminPanel.label[26] = GuiLabel(170, 190, 290, 20, "X: N/A; Y: N/A; Z: N/A", false, adminPanel.tab["players"])
+	adminPanel.label[27] = GuiLabel(170, 168, 49, 22, "Locality", false, adminPanel.tab["players"])
+	guiSetFont(adminPanel.label[27], "default-bold-small")
+	guiLabelSetColor(adminPanel.label[27], 255, 0, 0)
+	adminPanel.label[28] = GuiLabel(170, 4, 49, 22, "Player", false, adminPanel.tab["players"])
+	guiSetFont(adminPanel.label[28], "default-bold-small")
+	guiLabelSetColor(adminPanel.label[28], 255, 0, 0)
+	adminPanel.label[29] = GuiLabel(170, 313, 49, 22, "Misc", false, adminPanel.tab["players"])
+	guiSetFont(adminPanel.label[29], "default-bold-small")
+	guiLabelSetColor(adminPanel.label[29], 255, 0, 0)
+	adminPanel.button[1] = GuiButton(488, 52, 147, 18, "Warp to player", false, adminPanel.tab["players"])
+	adminPanel.button[2] = GuiButton(488, 10, 147, 36, "Punish", false, adminPanel.tab["players"])
+	adminPanel.button[3] = GuiButton(488, 144, 72, 18, "Spectate", false, adminPanel.tab["players"])
+	adminPanel.button[4] = GuiButton(488, 76, 147, 18, "Warp player to", false, adminPanel.tab["players"])
+	adminPanel.button[5] = GuiButton(488, 100, 72, 18, "Reconnect", false, adminPanel.tab["players"])
+	adminPanel.button[6] = GuiButton(563, 100, 72, 18, "Kick", false, adminPanel.tab["players"])
+	adminPanel.button[7] = GuiButton(488, 122, 72, 18, "Freeze", false, adminPanel.tab["players"])
+	adminPanel.button[8] = GuiButton(563, 122, 72, 18, "Shout", false, adminPanel.tab["players"])
+	adminPanel.button[9] = GuiButton(563, 144, 72, 18, "Slap", false, adminPanel.tab["players"])
+	adminPanel.button[10] = GuiButton(488, 167, 72, 18, "Rename", false, adminPanel.tab["players"])
+	adminPanel.button[11] = GuiButton(488, 318, 147, 20, "View Punishments", false, adminPanel.tab["players"])
+	adminPanel.button[12] = GuiButton(563, 167, 72, 18, "Screenshot", false, adminPanel.tab["players"])
+	adminPanel.button[13] = GuiButton(563, 195, 72, 18, "Set Model", false, adminPanel.tab["players"])
+	adminPanel.button[14] = GuiButton(488, 195, 72, 18, "Set Money", false, adminPanel.tab["players"])
+	adminPanel.button[15] = GuiButton(488, 220, 72, 18, "Set Health", false, adminPanel.tab["players"])
+	adminPanel.button[16] = GuiButton(563, 220, 72, 18, "Set Armour", false, adminPanel.tab["players"])
+	adminPanel.button[17] = GuiButton(488, 244, 72, 18, "Dimension", false, adminPanel.tab["players"])
+	adminPanel.button[18] = GuiButton(563, 244, 72, 18, "Interior", false, adminPanel.tab["players"])
+	adminPanel.button[19] = GuiButton(488, 369, 72, 18, "Fix", false, adminPanel.tab["players"])
+	adminPanel.button[20] = GuiButton(563, 369, 72, 18, "Eject", false, adminPanel.tab["players"])
+	adminPanel.button[21] = GuiButton(488, 392, 72, 18, "Destroy", false, adminPanel.tab["players"])
+	adminPanel.button[22] = GuiButton(563, 392, 72, 18, "Disable", false, adminPanel.tab["players"])
+	adminPanel.button[23] = GuiButton(563, 266, 72, 18, "Set Job", false, adminPanel.tab["players"])
+	adminPanel.button[24] = GuiButton(488, 341, 72, 18, "Anticheat", false, adminPanel.tab["players"])
+	adminPanel.button[25] = GuiButton(563, 341, 72, 18, "View Weps", false, adminPanel.tab["players"])
+	adminPanel.button[26] = GuiButton(488, 290, 72, 18, "Give Wep", false, adminPanel.tab["players"])
+	adminPanel.button[27] = GuiButton(488, 266, 72, 18, "Give Vehicle", false, adminPanel.tab["players"])
+	adminPanel.button[28] = GuiButton(488, 416, 72, 18, "Blow", false, adminPanel.tab["players"])
+	adminPanel.button[29] = GuiButton(563, 416, 72, 18, "Freeze", false, adminPanel.tab["players"])
+	adminPanel.button[30] = GuiButton(563, 290, 72, 18, "Last Logins", false, adminPanel.tab["players"])
+
+	-- Disable all at first
+	for i = 1, #adminPanel.button do
+		adminPanel.button[i].enabled = false
+	end
+
+	confirm.window[1] = GuiWindow(792, 480, 324, 111, "UCD | Admin - ", false)
+	confirm.window[1].sizable = false
+	confirm.window[1].visible = false
+	confirm.button[1] = GuiButton(58, 82, 101, 19, "Confirm", false, confirm.window[1])
+	confirm.button[2] = GuiButton(169, 82, 101, 19, "Cancel", false, confirm.window[1])
+	confirm.edit[1] = GuiEdit(35, 47, 260, 25, "", false, confirm.window[1])
+	confirm.label[1] = GuiLabel(36, 21, 259, 20, "Set the motherfucking label text nigga", false, confirm.window[1])
+	guiLabelSetHorizontalAlign(confirm.label[1], "center", false)
+	guiLabelSetVerticalAlign(confirm.label[1], "center") 
+	 
+	WPT.window[1] = GuiWindow(850, 390, 201, 348, "UCD Admin | Warp Player To", false)
+	WPT.window[1].sizable = false
+	WPT.window[1].visible = false
+	WPT.button[1] = GuiButton(10, 304, 85, 34, "Warp Player To", false, WPT.window[1])
+	WPT.label[1] = GuiLabel(10, 24, 179, 21, "Select a player from the grid", false, WPT.window[1])
+	guiLabelSetHorizontalAlign(WPT.label[1], "center", false)
+	WPT.gridlist[1] = guiCreateGridList(10, 45, 178, 249, false, WPT.window[1])
+	guiGridListAddColumn(WPT.gridlist[1], "Player", 0.9)
+	WPT.button[2] = GuiButton(103, 304, 85, 34, "Close", false, WPT.window[1])
+
+	local weapons = {
+		"Colt 45", "Silenced", "Deagle", "Shotgun", "Sawed-off", "Combat Shotgun",
+		"Uzi", "MP5", "Tec-9", "AK-47", "M4", "Rifle", "Sniper",
+		"Minigun", "Grenade", "Satchel", "Teargas", "Parachute"
+	}
+	giveWeapon_.window[1] = GuiWindow(244, 682, 317, 160, "UCD | Admin - Give Weapon", false)
+	giveWeapon_.window[1].sizable = false
+	giveWeapon_.window[1].visible = false
+	giveWeapon_.edit[1] = GuiEdit(226, 48, 81, 25, "", false, giveWeapon_.window[1])
+	giveWeapon_.combobox[1] = GuiComboBox(10, 48, 197, 100, "", false, giveWeapon_.window[1])
+	for _, wep in ipairs(weapons) do
+		guiComboBoxAddItem(giveWeapon_.combobox[1], wep)
+	end
+	giveWeapon_.label[1] = GuiLabel(10, 24, 197, 19, "Weapon", false, giveWeapon_.window[1])
+	guiLabelSetHorizontalAlign(giveWeapon_.label[1], "center", false)
+	guiLabelSetVerticalAlign(giveWeapon_.label[1], "center")
+	giveWeapon_.label[2] = GuiLabel(226, 24, 81, 19, "Ammo", false, giveWeapon_.window[1])
+	guiLabelSetHorizontalAlign(giveWeapon_.label[2], "center", false)
+	guiLabelSetVerticalAlign(giveWeapon_.label[2], "center")
+	giveWeapon_.button[1] = GuiButton(66, 120, 87, 22, "Confirm", false, giveWeapon_.window[1])
+	giveWeapon_.button[2] = GuiButton(168, 120, 87, 22, "Close", false, giveWeapon_.window[1])
+		
+	-- Punish window
+	punish.window = GuiWindow(535, 156, 272, 358, "UCD | Admin - Punish", false)
+	punish.window.visible = false
+	punish.window.sizable = false
+	punish.window.alpha = 255
+	punish.combobox["rules"] = GuiComboBox(9, 73, 253, 240, "Select rule", false, punish.window)
+	for _, reason in ipairs(reasons) do
+		guiComboBoxAddItem(punish.combobox["rules"], tostring(reason))
+	end
+	punish.edit["custom"] = GuiEdit(9, 38, 253, 25, "", false, punish.window)
+	punish.button["cancel"] = GuiButton(10, 310, 105, 38, "Cancel", false, punish.window)
+	punish.button["punish"] = GuiButton(157, 310, 105, 38, "Punish", false, punish.window)
+	punish.checkbox["custom_duration"] = GuiCheckBox(9, 141, 16, 16, "", false, false, punish.window)
+	punish.label[1] = GuiLabel(34, 141, 228, 16, "Use custom duration (otherwise it's auto)", false, punish.window)
+	punish.edit["min"] = GuiEdit(10, 167, 65, 29, "", false, punish.window)
+	punish.edit["hour"] = GuiEdit(99, 167, 65, 29, "", false, punish.window)
+	punish.edit["day"] = GuiEdit(188, 167, 65, 29, "", false, punish.window)
+	punish.radiobutton[1] = GuiRadioButton(10, 206, 15, 15, "", false, punish.window)
+	punish.label[2] = GuiLabel(35, 206, 40, 15, "Mins", false, punish.window)
+	punish.radiobutton[2] = GuiRadioButton(99, 206, 15, 15, "", false, punish.window)
+	punish.label[3] = GuiLabel(124, 206, 40, 15, "Hours", false, punish.window)
+	punish.radiobutton[3] = GuiRadioButton(187, 206, 15, 15, "", false, punish.window)
+	punish.label[4] = GuiLabel(212, 206, 40, 15, "Days", false, punish.window)
+	punish.combobox["punishtype"] = GuiComboBox(9, 231, 253, 117, "Select punish type", false, punish.window)
+	for _, action in ipairs(actions) do
+		guiComboBoxAddItem(punish.combobox["punishtype"], tostring(action))
+	end
+	punish.edit["reason"] = GuiEdit(9, 106, 253, 25, "", false, punish.window)
+	punish.label[5] = GuiLabel(9, 21, 253, 16, "Manual syntax: acc:name or serial (bans only)", false, punish.window)
+	guiLabelSetHorizontalAlign(punish.label[5], "center", false)
+	punish.label[6] = GuiLabel(9, 271, 252, 16, "-1 minutes = permanent (bans only)", false, punish.window)
+	guiLabelSetHorizontalAlign(punish.label[6], "center", false)
+
+	setJob = {}
+	setJob.window 							= GuiWindow(362, 112, 614, 376, "UCD | Set Job", false)
+	setJob.window.sizable = false
+	setJob.window.visible = false
+	setJob.window.alpha = 1
+	setJob.playersGrid 						= GuiGridList(9, 25, 187, 281, false, setJob.window)
+	setJob.playersGrid:addColumn("Player:", 0.9)
+	setJob.jobsGrid 						= GuiGridList(213, 25, 187, 281, false, setJob.window)
+	setJob.jobsGrid:addColumn("Job:", 0.9)
+	setJob.skinsGrid 						= GuiGridList(416, 25, 187, 281, false, setJob.window)
+	setJob.skinsGrid:addColumn("Skin:", 0.5)
+	setJob.skinsGrid:addColumn("Skin ID:", 0.4)
+	setJob.setButton 						= GuiButton(9, 316, 187, 46, "Set player job", false, setJob.window)
+	setJob.removeButton 					= GuiButton(213, 316, 187, 46, "Remove player from job", false, setJob.window)
+	setJob.cancelButton 					= GuiButton(416, 316, 187, 46, "Cancel", false, setJob.window)
+
+	viewPunish = {}
+	viewPunish.window 						= GuiWindow(0, 0, 825, 515, "UCD | Admin - View Punishments", false)
+	viewPunish.window.sizable 				= false
+	viewPunish.window.visible 				= false
+	viewPunish.tabPanel 					= GuiTabPanel(0, 20, 825, 455, false, viewPunish.window)
+	viewPunish.serialPunishTab 				= GuiTab("Serial punishments", viewPunish.tabPanel)
+	viewPunish.accountPunishTab 			= GuiTab("Account punishments", viewPunish.tabPanel)
+	viewPunish.serialPunishGrid 			= GuiGridList(10, 10, 790, 410, false, viewPunish.serialPunishTab)
+	viewPunish.accountPunishGrid 			= GuiGridList(10, 10, 790, 410, false, viewPunish.accountPunishTab)
+	viewPunish.closeButton 					= GuiButton(0, 480, 825, 20, "Close", false, viewPunish.window)
+	viewPunish.serialPunishGrid:addColumn("Account", 0.125)
+	viewPunish.serialPunishGrid:addColumn("Log", 0.747)
+	viewPunish.accountPunishGrid:addColumn("Serial", 0.25)
+	viewPunish.accountPunishGrid:addColumn("Log", 0.7)
+
+	-- fuark this identation but i have to do the same
+	
+	viewLogins = {}
+	viewLogins.window 						= GuiWindow(0, 0, 825, 515, "UCD | Admin - View Last Logins", false)
+	viewLogins.window.sizable 				= false
+	viewLogins.window.visible 				= false
+	viewLogins.tabPanel 					= GuiTabPanel(0, 20, 825, 455, false, viewLogins.window)
+	viewLogins.serialLoginsTab 				= GuiTab("Serial punishments", viewLogins.tabPanel)
+	viewLogins.accountLoginsTab 			= GuiTab("Account punishments", viewLogins.tabPanel)
+	viewLogins.serialLoginsGrid 			= GuiGridList(10, 10, 790, 410, false, viewLogins.serialLoginsTab)
+	viewLogins.accountLoginsGrid 			= GuiGridList(10, 10, 790, 410, false, viewLogins.accountLoginsTab)
+	viewLogins.closeButton         			= GuiButton(0, 480, 825, 20, "Close", false, viewLogins.window) -- REMEMBERED IT HAHAHA
+	viewLogins.serialLoginsGrid:addColumn("Account", 0.125)
+	viewLogins.serialLoginsGrid:addColumn("Log", 0.747)
+	viewLogins.accountLoginsGrid:addColumn("Serial", 0.25)
+	viewLogins.accountLoginsGrid:addColumn("Log", 0.7)
+	
+adminPanel.tab["bans"] = guiCreateTab("Bans", adminPanel.tabpanel)
+	adminPanel.gridlist["banList"] 			= GuiGridList(348, 11, 287, 425, false, adminPanel.tab["bans"])
+	
+	adminPanel.label["banInfo"] 			= GuiLabel(10, 11, 328, 77, "Search, manage and remove bans here.\n\nNote: when searching for bans, prefix the ban value.\nAccounts are acc:name.\nSerials are always 32 characters in length.", false, adminPanel.tab["bans"])
+	
+	adminPanel.edit["searchValue"] 			= GuiEdit(10, 126, 246, 29, "", false, adminPanel.tab["bans"])
+	adminPanel.edit["searchBanisher"] 		= GuiEdit(10, 195, 246, 29, "", false, adminPanel.tab["bans"])
+	
+	adminPanel.label["valueLabel"] 			= GuiLabel(10, 106, 246, 20, "Value:", false, adminPanel.tab["bans"])
+	adminPanel.label["banisherLabel"] 		= GuiLabel(10, 175, 246, 20, "Banisher:", false, adminPanel.tab["bans"])
+	
+	adminPanel.button["searchLabel"] 		= GuiButton(56, 234, 152, 36, "Search", false, adminPanel.tab["bans"])
+	adminPanel.label["withSelected"] 		= GuiLabel(10, 289, 246, 16, "With selected:", false, adminPanel.tab["bans"])
+	adminPanel.button["editBan"] 			= GuiButton(10, 400, 152, 36, "Edit Ban", false, adminPanel.tab["bans"])
+	adminPanel.button["unban"] 				= GuiButton(172, 400, 152, 36, "Unban", false, adminPanel.tab["bans"])
+	adminPanel.label["and/or"] 				= GuiLabel(10, 155, 246, 20, "and/or", false, adminPanel.tab["bans"])
+	
+	adminPanel.label["bannedValue"] 		= GuiLabel(31, 311, 293, 15, "Value: ", false, adminPanel.tab["bans"])
+	adminPanel.label["bannedOn"] 			= GuiLabel(31, 326, 293, 15, "When: ", false, adminPanel.tab["bans"])
+	adminPanel.label["bannedDuration"] 		= GuiLabel(31, 341, 293, 15, "Duration: ", false, adminPanel.tab["bans"])
+	adminPanel.label["bannedReason"] 		= GuiLabel(31, 356, 293, 15, "Reason:", false, adminPanel.tab["bans"])
+	adminPanel.label["bannedBanisher"] 		= GuiLabel(31, 371, 293, 15, "Banisher:", false, adminPanel.tab["bans"])
+
+adminPanel.tab["adminLog"] = guiCreateTab("Admin Log", adminPanel.tabpanel)
+
+function viewPunish.autoSize()
+	for _, gui in pairs(viewPunish) do
+		if (isElement(gui) and gui.type == "gui-gridlist") then -- isElement coz functions arent elements
+			for i = 1, gui.columnCount do
+				gui:autoSizeColumn(i)
+				gui:setColumnWidth(i, guiGridListGetColumnWidth(gui, i, true) + 0.006, true)
+				-- yeah auto size function doesn't work well, idk why doesn't it show last letter
+				-- i wonder why dont they make guiGridListGetColumnWidth in OOP
+			end
+		end
+	end
 end
 
-confirm.window[1] = GuiWindow(792, 480, 324, 111, "UCD | Admin - ", false)
-confirm.window[1].sizable = false
-confirm.window[1].visible = false
-confirm.button[1] = GuiButton(58, 82, 101, 19, "Confirm", false, confirm.window[1])
-confirm.button[2] = GuiButton(169, 82, 101, 19, "Cancel", false, confirm.window[1])
-confirm.edit[1] = GuiEdit(35, 47, 260, 25, "", false, confirm.window[1])
-confirm.label[1] = GuiLabel(36, 21, 259, 20, "Set the motherfucking label text nigga", false, confirm.window[1])
-guiLabelSetHorizontalAlign(confirm.label[1], "center", false)
-guiLabelSetVerticalAlign(confirm.label[1], "center") 
- 
-WPT.window[1] = GuiWindow(850, 390, 201, 348, "UCD Admin | Warp Player To", false)
-WPT.window[1].sizable = false
-WPT.window[1].visible = false
-WPT.button[1] = GuiButton(10, 304, 85, 34, "Warp Player To", false, WPT.window[1])
-WPT.label[1] = GuiLabel(10, 24, 179, 21, "Select a player from the grid", false, WPT.window[1])
-guiLabelSetHorizontalAlign(WPT.label[1], "center", false)
-WPT.gridlist[1] = guiCreateGridList(10, 45, 178, 249, false, WPT.window[1])
-guiGridListAddColumn(WPT.gridlist[1], "Player", 0.9)
-WPT.button[2] = GuiButton(103, 304, 85, 34, "Close", false, WPT.window[1])
-
-local weapons = {
-	"Colt 45", "Silenced", "Deagle", "Shotgun", "Sawed-off", "Combat Shotgun",
-	"Uzi", "MP5", "Tec-9", "AK-47", "M4", "Rifle", "Sniper",
-	"Minigun", "Grenade", "Satchel", "Teargas", "Parachute"
-}
-giveWeapon_.window[1] = GuiWindow(244, 682, 317, 160, "UCD | Admin - Give Weapon", false)
-giveWeapon_.window[1].sizable = false
-giveWeapon_.window[1].visible = false
-giveWeapon_.edit[1] = GuiEdit(226, 48, 81, 25, "", false, giveWeapon_.window[1])
-giveWeapon_.combobox[1] = GuiComboBox(10, 48, 197, 100, "", false, giveWeapon_.window[1])
-for _, wep in ipairs(weapons) do
-	guiComboBoxAddItem(giveWeapon_.combobox[1], wep)
+function viewLogins.autoSize() -- use this to auto size columns after adding rows
+	for _, gui in pairs(viewLogins) do
+		if (isElement(gui) and gui.type == "gui-gridlist") then -- isElement coz functions arent elements
+			for i = 1, gui.columnCount do
+				gui:autoSizeColumn(i)
+				gui:setColumnWidth(i, guiGridListGetColumnWidth(gui, i, true) + 0.006, true)
+				-- yeah auto size function doesn't work well, idk why doesn't it show last letter
+				-- i wonder why dont they have guiGridListGetColumnWidth OOPed
+				-- yeah copied cuz lazy and no time
+			end
+		end
+	end
 end
-giveWeapon_.label[1] = GuiLabel(10, 24, 197, 19, "Weapon", false, giveWeapon_.window[1])
-guiLabelSetHorizontalAlign(giveWeapon_.label[1], "center", false)
-guiLabelSetVerticalAlign(giveWeapon_.label[1], "center")
-giveWeapon_.label[2] = GuiLabel(226, 24, 81, 19, "Ammo", false, giveWeapon_.window[1])
-guiLabelSetHorizontalAlign(giveWeapon_.label[2], "center", false)
-guiLabelSetVerticalAlign(giveWeapon_.label[2], "center")
-giveWeapon_.button[1] = GuiButton(66, 120, 87, 22, "Confirm", false, giveWeapon_.window[1])
-giveWeapon_.button[2] = GuiButton(168, 120, 87, 22, "Close", false, giveWeapon_.window[1])
-	
--- Punish window
-punish.window = GuiWindow(535, 156, 272, 358, "UCD | Admin - Punish", false)
-punish.window.visible = false
-punish.window.sizable = false
-punish.window.alpha = 255
-punish.combobox["rules"] = GuiComboBox(9, 73, 253, 240, "Select rule", false, punish.window)
-for _, reason in ipairs(reasons) do
-	guiComboBoxAddItem(punish.combobox["rules"], tostring(reason))
+
+function viewPunish.close()
+	viewPunish.window.visible = false
 end
-punish.edit["custom"] = GuiEdit(9, 38, 253, 25, "", false, punish.window)
-punish.button["cancel"] = GuiButton(10, 310, 105, 38, "Cancel", false, punish.window)
-punish.button["punish"] = GuiButton(157, 310, 105, 38, "Punish", false, punish.window)
-punish.checkbox["custom_duration"] = GuiCheckBox(9, 141, 16, 16, "", false, false, punish.window)
-punish.label[1] = GuiLabel(34, 141, 228, 16, "Use custom duration (otherwise it's auto)", false, punish.window)
-punish.edit["min"] = GuiEdit(10, 167, 65, 29, "", false, punish.window)
-punish.edit["hour"] = GuiEdit(99, 167, 65, 29, "", false, punish.window)
-punish.edit["day"] = GuiEdit(188, 167, 65, 29, "", false, punish.window)
-punish.radiobutton[1] = GuiRadioButton(10, 206, 15, 15, "", false, punish.window)
-punish.label[2] = GuiLabel(35, 206, 40, 15, "Mins", false, punish.window)
-punish.radiobutton[2] = GuiRadioButton(99, 206, 15, 15, "", false, punish.window)
-punish.label[3] = GuiLabel(124, 206, 40, 15, "Hours", false, punish.window)
-punish.radiobutton[3] = GuiRadioButton(187, 206, 15, 15, "", false, punish.window)
-punish.label[4] = GuiLabel(212, 206, 40, 15, "Days", false, punish.window)
-punish.combobox["punishtype"] = GuiComboBox(9, 231, 253, 117, "Select punish type", false, punish.window)
-for _, action in ipairs(actions) do
-	guiComboBoxAddItem(punish.combobox["punishtype"], tostring(action))
+addEventHandler("onClientGUIClick", viewPunish.closeButton, viewPunish.close, false)
+
+function viewLogins.close()
+	viewLogins.window.visible = false
 end
-punish.edit["reason"] = GuiEdit(9, 106, 253, 25, "", false, punish.window)
-punish.label[5] = guiCreateLabel(9, 21, 253, 16, "Manual syntax: acc:name or serial (bans only)", false, punish.window)
-guiLabelSetHorizontalAlign(punish.label[5], "center", false)
-punish.label[6] = guiCreateLabel(9, 271, 252, 16, "-1 minutes = permanent (bans only)", false, punish.window)
-guiLabelSetHorizontalAlign(punish.label[6], "center", false)
+addEventHandler("onClientGUIClick", viewLogins.closeButton, viewLogins.close, false)
 
-windows = {adminPanel.window[1], giveWeapon_.window[1], WPT.window[1], punish.window}
+windows = {adminPanel.window, giveWeapon_.window[1], WPT.window[1], punish.window, setJob.window, viewPunish.window, viewLogins.window}
 for _, gui in ipairs(windows) do
 	if (gui and isElement(gui)) then
 		exports.UCDutil:centerWindow(gui)
@@ -344,7 +454,7 @@ addEventHandler("onClientPlayerChangeNick", root,
 )
 
 function updateInformation()
-	if (adminPanel.window[1].visible) then
+	if (adminPanel.window.visible) then
 		-- Update team colours
 		for i = 0, guiGridListGetRowCount(adminPanel.gridlist[1]) - 1 do
 			local plr = guiGridListGetItemData(adminPanel.gridlist[1], i, 1)
@@ -385,7 +495,7 @@ function updatePlayerInformation(plr, getServerSidedData)
 	local class = plr:getData("Class") or "N/A"
 	local occupation = plr:getData("Occupation") or "N/A"
 	local ping = plr.ping
-	local suburb, city = getZoneName(loc.x, loc.y, loc.z), getZoneName(loc.x, loc.y, loc.z, true)
+	local suburb, city = getZoneName(loc), getZoneName(loc, true)
 	local country = plr:getData("Country") or "N/A"
 	local playtime = plr:getData("dxscoreboard_playtime") or "N/A"
 	
@@ -400,33 +510,30 @@ function updatePlayerInformation(plr, getServerSidedData)
 	local vehicle, vehicleHealth
 	if not plr.vehicle then 
 		vehicle = "Not in a vehicle" 
-		vehicleHealth = "N/A" 
+		vehicleHealth = "N/A"
 	else 
 		vehicle = plr.vehicle.name
 		vehicleHealth = tostring(exports.UCDutil:mathround(plr.vehicle.health / 10).."%")
 	end
 	
-	adminPanel.label[1]:setText("Name: "..name)
-	adminPanel.label[5]:setText("Account Name: "..accountName)
-	adminPanel.label[6]:setText("Playtime: "..playtime)
-	adminPanel.label[7]:setText("Country: "..country)
-	--adminPanel.label[8]:setText("Account ID: "..accountID)
-	adminPanel.label[9]:setText("Location: "..suburb..", "..city)
-	adminPanel.label[10]:setText("Dimension: "..dim)
-	adminPanel.label[11]:setText("Interior: "..int)
-	adminPanel.label[13]:setText("Health: "..health)
-	adminPanel.label[14]:setText("Armour: "..armour)
-	--adminPanel.label[15]:setText("Money: ".."$"..tostring(exports.UCDutil:tocomma(money)))
-	adminPanel.label[17]:setText("Occupation: "..occupation)
-	adminPanel.label[18]:setText("Class: "..class)
-	adminPanel.label[19]:setText("Group: "..group)
-	adminPanel.label[20]:setText("Team: "..team)
-	adminPanel.label[21]:setText("Model: "..model)
-	--adminPanel.label[22]:setText("Weapon: "..tostring(weapon).." ["..tostring(ammo).."]")
-	adminPanel.label[23]:setText("Ping: "..ping)
-	adminPanel.label[24]:setText("Vehicle: "..vehicle)
-	adminPanel.label[25]:setText("Vehicle Health: "..vehicleHealth)
-	adminPanel.label[26]:setText("X: "..exports.UCDutil:mathround(loc.x, 3).."; Y: "..exports.UCDutil:mathround(loc.y, 3).."; Z: "..exports.UCDutil:mathround(loc.z, 3))
+	adminPanel.label[1]:setText("Name: "..tostring(name))
+	adminPanel.label[5]:setText("Account Name: "..tostring(accountName))
+	adminPanel.label[6]:setText("Play Time: "..tostring(playtime))
+	adminPanel.label[7]:setText("Country: "..tostring(country))
+	adminPanel.label[9]:setText("Location: "..tostring(suburb)..", "..tostring(city))
+	adminPanel.label[10]:setText("Dimension: "..tostring(dim))
+	adminPanel.label[11]:setText("Interior: "..tostring(int))
+	adminPanel.label[13]:setText("Health: "..tostring(health))
+	adminPanel.label[14]:setText("Armour: "..tostring(armour))
+	adminPanel.label[17]:setText("Occupation: "..tostring(occupation))
+	adminPanel.label[18]:setText("Class: "..tostring(class))
+	adminPanel.label[19]:setText("Group: "..tostring(group))
+	adminPanel.label[20]:setText("Team: "..tostring(team))
+	adminPanel.label[21]:setText("Model: "..tostring(model))
+	adminPanel.label[23]:setText("Ping: "..tostring(ping))
+	adminPanel.label[24]:setText("Vehicle: "..tostring(vehicle))
+	adminPanel.label[25]:setText("Vehicle Health: "..tostring(vehicleHealth))
+	adminPanel.label[26]:setText("X: "..tostring(exports.UCDutil:mathround(loc.x, 3)).."; Y: "..tostring(exports.UCDutil:mathround(loc.y, 3)).."; Z: "..tostring(exports.UCDutil:mathround(loc.z, 3)))
 	
 	if (getServerSidedData) then
 		-- This has a callback function where the data is updated
@@ -437,12 +544,21 @@ end
 function requestPlayerData_callback(sync)
 	--outputDebugString("Client callback")
 	local data = sync
+<<<<<<< HEAD
 	adminPanel.label[2]:setText("IP: "..data["ip"])
 	adminPanel.label[3]:setText("Serial: "..data["serial"])
 	adminPanel.label[4]:setText("Version: "..data["version"])
 	adminPanel.label[12]:setText("Email: "..data["email"] or "N/A")
 	adminPanel.label[16]:setText("Bank: ".."$"..tostring(exports.UCDutil:tocomma(data["bank"])))
 	adminPanel.label[15]:setText("Money: $"..tostring(exports.UCDutil:tocomma(data["money"])))
+=======
+	adminPanel.label[2]:setText("IP: "..tostring(data["ip"] or "N/A"))
+	adminPanel.label[3]:setText("Serial: "..tostring(data["serial"] or "N/A"))
+	adminPanel.label[4]:setText("Version: "..tostring(data["version"] or "N/A"))
+	adminPanel.label[12]:setText("Email: "..tostring(data["email"] or "N/A"))
+	adminPanel.label[16]:setText("Bank: ".."$"..tostring(exports.UCDutil:tocomma(data["bank"]) or "0"))
+	adminPanel.label[15]:setText("Money: $"..tostring(exports.UCDutil:tocomma(data["money"]) or "0"))
+>>>>>>> bitbucket/master
 	adminPanel.label[22]:setText("Weapon: "..tostring(data["weapon"]))
 end
 addEvent("UCDadmin.requestPlayerData:callback", true)
@@ -462,7 +578,7 @@ function playerSelection()
 			adminPanel.label[3]:setText("Serial: ")
 			adminPanel.label[4]:setText("Version: ")
 			adminPanel.label[5]:setText("Account Name: ")
-			adminPanel.label[6]:setText("Playtime: ")
+			adminPanel.label[6]:setText("Play Time: ")
 			adminPanel.label[7]:setText("Country: ")
 			adminPanel.label[9]:setText("Location: ")
 			adminPanel.label[10]:setText("Dimension: ")
@@ -496,18 +612,19 @@ function toggleWPT(plr)
 			guiBringToFront(WPT.window[1])
 			for _, player in ipairs(Element.getAllByType("player")) do
 				if (plr ~= player and exports.UCDaccounts:isPlayerLoggedIn(player)) then
-					local r, g, b
+					
+					local r, g, b = 255, 255, 255
+					
 					if (player.team) then
-			r, g, b = player.team:getColor()
-					else
-			r, g, b = 255, 255, 255
-		end
-		local row = guiGridListAddRow(WPT.gridlist[1])
-		guiGridListSetItemText(WPT.gridlist[1], row, 1, tostring(player.name), false, false)
-		guiGridListSetItemData(WPT.gridlist[1], row, 1, player)
-		guiGridListSetItemColor(WPT.gridlist[1], row, 1, r, g, b)
-	end
-end
+						r, g, b = player.team:getColor()
+					end
+					
+					local row = guiGridListAddRow(WPT.gridlist[1])
+					guiGridListSetItemText(WPT.gridlist[1], row, 1, tostring(player.name), false, false)
+					guiGridListSetItemData(WPT.gridlist[1], row, 1, player)
+					guiGridListSetItemColor(WPT.gridlist[1], row, 1, r, g, b)
+				end
+			end
 		end
 	end
 end
@@ -532,7 +649,7 @@ addEventHandler("onClientGUIClick", WPT.button[1], handleWPTInput)
 addEventHandler("onClientGUIClick", WPT.button[2], handleWPTInput)
 
 function adminAction()
-	if (source ~= adminPanel.gridlist[1] and source.parent == adminPanel.tab[1]) then
+	if (source ~= adminPanel.gridlist[1] and source.parent == adminPanel.tab["players"]) then
 		local plr = getSelectedPlayer()
 		local action = source.text:lower()
 		if not action then return end
@@ -548,7 +665,7 @@ function adminAction()
 		end
 		
 		if (action == "punish") then
--- open punish gui
+			-- open punish gui
 		elseif (action == "warp to player") then
 			triggerServerEvent("UCDadmin.warpToPlayer", localPlayer, plr)
 		elseif (action == "warp player to") then
@@ -565,7 +682,7 @@ function adminAction()
 				triggerServerEvent("UCDadmin.freeze", localPlayer, plr)
 			end
 		elseif (action == "shout") then
-
+			createInputBox("UCD | Admin - Shout", "Enter the desired text", "", "UCDadmin.shout", localPlayer, plr)
 		elseif (action == "spectate") then
 			triggerServerEvent("UCDadmin.spectate", resourceRoot, plr)
 		elseif (action == "slap") then
@@ -573,9 +690,9 @@ function adminAction()
 		elseif (action == "rename") then
 			createInputBox("UCD | Admin - Rename", "Enter the desired name", exports.UCDutil:randomstring(8), "UCDadmin.rename", localPlayer, plr)
 		elseif (action == "screenshot") then
-
-		elseif (action == "money") then
-
+			-- read actions_s.lua pls
+		elseif (action == "set money") then
+			createInputBox("UCD | Admin - Set Money", "Enter the desired amount of money", "", "UCDadmin.setMoney", localPlayer, plr)
 		elseif (action == "set model") then
 			createInputBox("UCD | Admin - Model", "Enter the desired model", 0, "UCDadmin.setModel", localPlayer, plr)
 		elseif (action == "set health") then
@@ -591,15 +708,42 @@ function adminAction()
 		elseif (action == "last logins") then
 
 		elseif (action == "set job") then
-			triggerEvent("UCDadmin.setjob.openGUI", resourceRoot, plr)
-		elseif (action == "weapons") then
+			openGUI(plr)
+		-- elseif (action == "give wep") then handled #328
 
 		elseif (action == "view punishments") then
-
+			triggerServerEvent("UCDadmin.viewPunishments.call", localPlayer, plr)
+			viewPunish.window.visible = true
+			guiBringToFront(viewPunish.window)
+			viewPunish.serialPunishGrid:clear()
+			viewPunish.accountPunishGrid:clear()
+			local serialRow = viewPunish.serialPunishGrid:addRow()
+			local accountRow = viewPunish.accountPunishGrid:addRow()
+			viewPunish.serialPunishGrid:setItemText(serialRow, 1, "CLEAR", true, false)
+			viewPunish.serialPunishGrid:setItemText(serialRow, 2, "CLEAR", true, false)
+			viewPunish.accountPunishGrid:setItemText(accountRow, 1, "CLEAR", true, false)
+			viewPunish.accountPunishGrid:setItemText(accountRow, 2, "CLEAR", true, false)
 		elseif (action == "anticheat") then
 
 		elseif (action == "view weps") then
-
+			outputChatBox("VIEWING "..tostring(plr.name).."'s WEAPONS", 255, 255, 0)
+			outputChatBox("FORMAT: SLOT - ID - NAME - AMMO", 255, 140, 0)
+			for i = 0, 13 do
+				local wep = getPedWeapon(plr, i)
+				if (wep and wep > 0) then
+					local ammo = getPedTotalAmmo(plr, i)
+					if (ammo and ammo > 0) then
+						local str = string.format("%s - %s - %s - %s",
+						tostring(i),
+						tostring(wep),
+						tostring(getWeaponNameFromID(wep)),
+						tostring(getPedTotalAmmo(plr, i))
+						) -- just like tables(table = {row1, row2, ...\n})
+						outputChatBox(str, 255, 0, 255)
+					end
+				end
+			end
+			outputChatBox("DONE - P.S. If the player has no weapons no lines would be outputted", 255, 255, 0)
 		elseif (action == "fix") then
 			if (plr.vehicle) then
 				triggerServerEvent("UCDadmin.fixVehicle", localPlayer, plr, plr.vehicle)
@@ -621,7 +765,9 @@ function adminAction()
 			--	exports.UCDdx:new("This player is not in a vehicle", 255, 0, 0)
 			end
 		elseif (action == "disable") then
-
+			if (plr.vehicle) then
+				triggerServerEvent("UCDadmin.disableVehicle", resourceRoot, plr, plr.vehicle)
+			end
 		elseif (action == "blow") then
 
 		elseif (action == "give vehicle") then
@@ -637,9 +783,9 @@ addEventHandler("onClientGUIClick", guiRoot, adminAction)
 
 function toggleGUI()
 	if (not _permissions) then return end
-	adminPanel.window[1].visible = not adminPanel.window[1].visible
-	showCursor(adminPanel.window[1].visible)
-	if (adminPanel.window[1].visible) then
+	adminPanel.window.visible = not adminPanel.window.visible
+	showCursor(adminPanel.window.visible)
+	if (adminPanel.window.visible) then
 		guiSetInputMode("no_binds_when_editing")
 	else
 		guiSetInputMode("allow_binds")
@@ -653,5 +799,5 @@ function toggleGUI()
 		closeInputBox()
 	end
 end
-addCommandHandler("adminpanel", toggleGUI)
+addCommandHandler("adminpanel", toggleGUI, false, false)
 bindKey("p", "down", "adminpanel")
diff --git a/UCDadmin/punishments/punishments.lua b/UCDadmin/punishments/punishments.lua
index e124b18..6520c4e 100644
--- a/UCDadmin/punishments/punishments.lua
+++ b/UCDadmin/punishments/punishments.lua
@@ -1,6 +1,6 @@
 local types = {["mute"] = "muted", ["admin jail"] = "jailed"}
 local infr = 300 -- Infraction base number, no of infractions * base = time (0 = base)
-local punishments = {}
+punishments = {}
 
 addEventHandler("onResourceStart", resourceRoot,
 	function ()
diff --git a/UCDadmin/punishments/punishments_c.lua b/UCDadmin/punishments/punishments_c.lua
index 60d28ff..0ad5cb6 100644
--- a/UCDadmin/punishments/punishments_c.lua
+++ b/UCDadmin/punishments/punishments_c.lua
@@ -96,3 +96,25 @@ function customTimeShit()
 end
 customTimeShit() -- Do this once to disable them
 addEventHandler("onClientGUIClick", punish.checkbox["custom_duration"], customTimeShit, false)
+
+function viewPunish.insertPunishments(data)
+	viewPunish.accountPunishGrid:clear()
+	viewPunish.serialPunishGrid:clear()
+	if (data.accPunishments) then
+		for _, v in ipairs(data.accPunishments) do
+			local row = viewPunish.accountPunishGrid:addRow()
+			viewPunish.accountPunishGrid:setItemText(row, 1, v[1], false, false)
+			viewPunish.accountPunishGrid:setItemText(row, 2, v[2], false, false)
+		end
+	end
+	if (data.serialPunishments) then
+		for _, v in ipairs(data.serialPunishments) do
+			local row = viewPunish.serialPunishGrid:addRow()
+			viewPunish.serialPunishGrid:setItemText(row, 1, v[1], false, false)
+			viewPunish.serialPunishGrid:setItemText(row, 2, v[2], false, false)
+		end
+	end
+	viewPunish.autoSize()
+end
+addEvent("UCDadmin.viewPunishments.callback", true)
+addEventHandler("UCDadmin.viewPunishments.callback", resourceRoot, viewPunish.insertPunishments)
\ No newline at end of file
diff --git a/UCDadmin/setjob/setjob.lua b/UCDadmin/setjob/setjob.lua
index 68cbb7d..2c741bf 100644
--- a/UCDadmin/setjob/setjob.lua
+++ b/UCDadmin/setjob/setjob.lua
@@ -1,55 +1,44 @@
-window = GuiWindow(362, 112, 614, 376, "UCD | Set Job", false)
-window.sizable = false
-window.visible = false
-window.alpha = 1
-local screen_width, screen_height = guiGetScreenSize()
-window:setPosition((screen_width-614)/2, (screen_height-376)/2, false)
-local openType = "source"
-
-players_grid = GuiGridList(9, 25, 187, 281, false, window)
-players_grid:addColumn("Player:", 0.9)
-jobs_grid = GuiGridList(213, 25, 187, 281, false, window)
-jobs_grid:addColumn("Job:", 0.9)
-skins_grid = GuiGridList(416, 25, 187, 281, false, window)
-skins_grid:addColumn("Skin:", 0.5)
-skins_grid:addColumn("Skin ID", 0.4)
-set_button = GuiButton(9, 316, 187, 46, "Set player job", false, window)
-remove_button = GuiButton(213, 316, 187, 46, "Remove player from job", false, window)
-cancel_button = GuiButton(416, 316, 187, 46, "Cancel", false, window)
-
 local jobs = exports.UCDjobsTable:getJobTable()
 
-for name, skins in pairs(jobs) do -- Insert all jobs into gridlist
+for name, data in pairs(jobs) do -- Insert all jobs into gridlist
 	if (#name > 0) then
-		jobs_grid:setItemText(jobs_grid:addRow(), 1, name, false, false)
+		local row = setJob.jobsGrid:addRow()
+		local r, g, b = 255, 255, 255
+		if (data.colour and type(data.colour) == "table") then
+			r, g, b = data.colour.r, data.colour.g, data.colour.b
+		else
+			if (data.team and Team.getFromName(data.team)) then
+				r, g, b = Team.getFromName(data.team):getColor()
+			end
+		end
+		setJob.jobsGrid:setItemText(row, 1, name, false, false)
+		setJob.jobsGrid:setItemColor(row, 1, r, g, b)
 	end
 end
 
-for _, player in ipairs(Element.getAllByType("player")) do -- Insert all players into gridlist
-	players_grid:setItemText(players_grid:addRow(), 1, player.name, false, false)
-end
-
-function requestOpenGUI()
-	window.visible = not window.visible
-	showCursor(window.visible)
-	openType = "source"
+for _, plr in ipairs(Element.getAllByType("player")) do -- Insert all players into gridlist
+	local row = setJob.playersGrid:addRow()
+	local r, g, b = 255, 255, 255
+	if (plr.team) then
+		r, g, b = plr.team:getColor()
+	end
+	setJob.playersGrid:setItemText(row, 1, tostring(plr.name), false, false)
+	setJob.playersGrid:setItemColor(row, 1, r, g, b)
 end
-addEvent("onOpenGUIRequest", true)
-addEventHandler("onOpenGUIRequest", resourceRoot, requestOpenGUI)
 
 function connect_quit_change_nick(oldNick, newNick) -- Keep the players gridlist up-to-date
 	if (eventName == "onClientPlayerJoin") then
-		players_grid:setItemText(players_grid:addRow(), 1, source.name, false, false)
+		setJob.playersGrid:setItemText(setJob.playersGrid:addRow(), 1, source.name, false, false)
 	elseif (eventName == "onClientPlayerQuit") then
-		for i = 1, players_grid.rowCount do
-			if (players_grid:getItemText(i, 1) == source.name) then
-				players_grid:removeRow(i)
+		for i = 1, setJob.playersGrid.rowCount do
+			if (setJob.playersGrid:getItemText(i, 1) == source.name) then
+				setJob.playersGrid:removeRow(i)
 			end
 		end
 	elseif (eventName == "onClientPlayerChangeNick") then
-		for i = 0, players_grid.rowCount do
-			if (players_grid:getItemText(i, 1) == oldNick) then
-				players_grid:setItemText(i, 1, newNick, false, false)
+		for i = 0, setJob.playersGrid.rowCount do
+			if (setJob.playersGrid:getItemText(i, 1) == oldNick) then
+				setJob.playersGrid:setItemText(i, 1, newNick, false, false)
 			end
 		end
 	end
@@ -61,44 +50,39 @@ addEventHandler("onClientPlayerChangeNick", root, connect_quit_change_nick)
 addEventHandler("onClientGUIClick", root,
 	function(button, state)
 		if (button ~= "left" or state ~= "up") then return end
-		if (source == jobs_grid) then
-			local row = jobs_grid:getSelectedItem()
-			skins_grid:clear()
+		if (source == setJob.jobsGrid) then
+			local row = setJob.jobsGrid:getSelectedItem()
+			setJob.skinsGrid:clear()
 			if (row and row ~= -1) then
-				local name = jobs_grid:getItemText(row, 1)
-				local skins = jobs[jobs_grid:getItemText(row, 1)].skins
+				local name = setJob.jobsGrid:getItemText(row, 1)
+				local skins = jobs[setJob.jobsGrid:getItemText(row, 1)].skins
 				if (skins) then
 					if (type(skins) == "table") then
 						for _, data in pairs(skins) do
-							local _row = skins_grid:addRow()
-							skins_grid:setItemText(_row, 1, data[2], false, false)
-							skins_grid:setItemText(_row, 2, data[1], false, false)
+							local _row = setJob.skinsGrid:addRow()
+							setJob.skinsGrid:setItemText(_row, 1, data[2], false, false)
+							setJob.skinsGrid:setItemText(_row, 2, data[1], false, false)
 						end
 					end
 				end
 			end
-		elseif (source == cancel_button) then
-			window:setVisible(false)
-			if (openType == "source") then
+		elseif (source == setJob.cancelButton) then
+			setJob.window.visible = false
+			if (not adminPanel.window.visible) then
 				showCursor(false)
 			end
-		elseif (source == set_button or source == remove_button) then
-			local player = Player(players_grid:getItemText(players_grid:getSelectedItem()))
+		elseif (source == setJob.setButton or source == setJob.removeButton) then
+			local player = Player(setJob.playersGrid:getItemText(setJob.playersGrid:getSelectedItem()))
 			if (player) then
 				local selected_job, selected_model
-				if (source == set_button) then
-					selected_job = jobs_grid:getItemText(jobs_grid:getSelectedItem())
-					selected_model = skins_grid:getItemText(skins_grid:getSelectedItem(), 2)
-					outputDebugString(tostring(selected_job))
-					if ((not selected_model or selected_model == "") and guiGridListGetRowCount(skins_grid) ~= 0) then
+				if (source == setJob.setButton) then
+					selected_job = setJob.jobsGrid:getItemText(setJob.jobsGrid:getSelectedItem())
+					selected_model = setJob.skinsGrid:getItemText(setJob.skinsGrid:getSelectedItem(), 2)
+					if ((not selected_model or selected_model == "") and guiGridListGetRowCount(setJob.skinsGrid) ~= 0) then
 						exports.UCDdx:new("You must select a skin from the list", 255, 0, 0)
 						return
 					end
 				else
-					if ((not selected_model or selected_model == "") and guiGridListGetRowCount(skins_grid) ~= 0) then
-						exports.UCDdx:new("You must select a skin from the list", 255, 0, 0)
-						return
-					end
 					selected_job = ""
 				end
 				triggerServerEvent("UCDadmin.setjob.setJob", resourceRoot, player, selected_job, selected_model)
@@ -107,16 +91,16 @@ addEventHandler("onClientGUIClick", root,
 	end
 )
 
-function openGUIPlayer(player)
-	window:setVisible(true)
-	guiBringToFront(window)
+function openGUI(player)
+	setJob.window.visible = true
+	guiBringToFront(setJob.window)
 	showCursor(true)
-	openType = "admin panel"
-	for i = 1, players_grid.rowCount do
-		if (players_grid:getItemText(i, 1) == player.name) then
-			players_grid:setSelectedItem(i, 1)
+	if (not player) then return end
+	for i = 0, setJob.playersGrid.rowCount do
+		if (setJob.playersGrid:getItemText(i, 1) == player.name) then
+			setJob.playersGrid:setSelectedItem(i, 1)
 		end
 	end
 end
 addEvent("UCDadmin.setjob.openGUI", true)
-addEventHandler("UCDadmin.setjob.openGUI", resourceRoot, openGUIPlayer)
\ No newline at end of file
+addEventHandler("UCDadmin.setjob.openGUI", resourceRoot, openGUI)
\ No newline at end of file
diff --git a/UCDadmin/setjob/setjob.slua b/UCDadmin/setjob/setjob.slua
index 2753caf..f773e5c 100644
--- a/UCDadmin/setjob/setjob.slua
+++ b/UCDadmin/setjob/setjob.slua
@@ -2,13 +2,10 @@ function requestOpenGUI(player)
 	if (isElement(player)) then
 		client = player
 	end
-	--if (ACLGroup.get("Admin"):doesContainObject("user."..client.account.name)) then
-	if (isPlayerAdmin(client)) then
-		triggerClientEvent(client, "onOpenGUIRequest", resourceRoot)
+	if (canAdminDoAction(player, 23)) then
+		triggerLatentClientEvent(client, "UCDadmin.setjob.openGUI", resourceRoot)
 	end
 end
-addEvent("onOpenGUIRequest", true)
-addEventHandler("onOpenGUIRequest", resourceRoot, requestOpenGUI)
 addCommandHandler("setjob", requestOpenGUI)
 
 addEvent("UCDadmin.setjob.setJob", true)
diff --git a/UCDadmin/warp/client.lua b/UCDadmin/warp/client.lua
index 538d4cc..b2cf723 100644
--- a/UCDadmin/warp/client.lua
+++ b/UCDadmin/warp/client.lua
@@ -1,72 +1,82 @@
--- Warp points by HellStunter
-local positions = 
-{
-	["LV Airport"] = {1707.2239, 1607.8732, 10.0156},
-	["Restricted Area"] = {214.1687, 1911.5682, 17.6406},
-	["The Sherman Dam"] = {-893.0352, 1998.78, 60.9141},
-	["SF Ship"] = {-1468.334, 1490.0498, 8.2578},
-	["SF Gant Bridge"] = {-2655.8728, 1596.3607, 64.5165},
-	["SF Police Department"] = {-1615.0035, 667.2029, 7.1875},
-	["SF Docks"] = {-2897.3108, 457.6115, 4.9141},
-	["SF Hospital"] = {-2667.3772, 593.3926, 14.4531},
-	["SF Airport"] = {-1666.1599, -401.2081, 14.1484},
-	["Mount Chillad"] = {-2238.6616, -1731.6495, 480.4632},
-	["Santa Maria Beach"] = {482.1791, -1853.8127, 3.7268},
-	["White House"] = {1255.2522, -2030.9908, 59.5556},
-	["LS Airport"] = {1962.8151, -2194.1438, 13.5469},
-	["LS Police Department"] = {1539.0527, -1674.7443, 13.5469},
-	["LS All Saints Hospital"] = {1189.0702, -1324.7906, 13.5671},
-	["LS Jefferson Hospital"] = {2011.6215, -1435.8839, 13.5547},
-	["Dillimore"] = {648.8795, -561.3219, 16.2489},
-	["Palomino Creek"] = {2349.6997, 81.1277, 26.4844},
-	["LV Police Department"] = {2233.646, 2453.5923, 10.8245},
-	["Spinybed"] = {2481.0706, 2751.9346, 10.8203},
-	["Verdant Meadows"] = {399.7484, 2528.8411, 16.5755},
-	["Bayside Marina"] = {-2269.199, 2347.9468, 4.8202}, 
+-- Warp panel by HellStunter
+local positions = {
+	{1707.2239, 1607.8732, 10.0156, 270.94384765625, "Las Venturas Airport"},
+	{2233.646, 2453.5923, 10.8245, 177.72918701172, "Las Venturas Police Department"},
+	{214.1687, 1911.5682, 17.6406, 179.93859863281, "Area 51"},
+	{-893.0352, 1998.78, 60.9141, 249.41040039063, "The Sherman Dam"},
+	{-1468.334, 1490.0498, 8.2578, 269.69522094727, "San Fierro Da-Nang Boys Ship"},
+	{-2655.8728, 1596.3607, 64.5165, 86.292449951172, "San Fierro Gant Bridge"},
+	{-1615.0035, 667.2029, 7.1875, 268.8996887207, "San Fierro Police Department"},
+	{-2897.3108, 457.6115, 4.9141, 268.99917602539, "San Fierro Docks"},
+	{-2667.3772, 593.3926, 14.4531, 181.69494628906, "San Fierro Hospital"},
+	{-1666.1599, -401.2081, 14.1484, 134.51873779297, "San Fierro Airport"},
+	{-2238.6616, -1731.6495, 480.4632, 49.358123779297, "Mount Chillad"},
+	{482.1791, -1853.8127, 3.7268, 359.69595336914, "Santa Maria Beach"},
+	{1255.2522, -2030.9908, 59.5556, 84.657928466797, "San Andreas Presidental House"},
+	{1962.8151, -2194.1438, 13.5469, 89.033111572266, "Los Santos Airport"},
+	{1539.0527, -1674.7443, 13.5469, 89.033111572266, "Los Santos Police Department"},
+	{1189.0702, -1324.7906, 13.5671, 269.82861328125, "All Saints Hospital"},
+	{2011.6215, -1435.8839, 13.5547, 134.87286376953, "Jefferson Hospital"},
+	{635.91784667969, -571.85083007813, 16.3359375, 269.90609741211, "Dillimore Police Department"},
+	{2231.7734375, -28.512060165405, 26.3359375, 266.68014526367, "Palomino Creek"},
+	{2523.5927734375, 2796.7934570313, 10.8203125, 179.57482910156, "K.A.C.C Military Fuels"},
+	{318.58770751953, 2500.8020019531, 16.484375, 269.68524169922, "Verdant Meadows"},
+	{-2259.8310546875, 2304.9401855469, 4.8202133178711, 354.60308837891, "Bayside Marina"}, 
 }
 
-local window = guiCreateWindow(574, 151, 434, 592, "UCD Admin | Warp", false)
+local window = guiCreateWindow(574, 151, 434, 592, "UCD | Admin - Warp Points", false)
 guiWindowSetSizable(window, false)
-local sw, sh = guiGetScreenSize()
-guiSetPosition(window, (sw-434)/2, (sh-592)/2, false)
+guiSetVisible(window, false)
+exports.UCDutil:centerWindow(window)
 
 local grid = guiCreateGridList(15, 29, 409, 473, false, window)
-guiGridListAddColumn(grid, "Location", 0.9)
+guiGridListAddColumn(grid, "Location name:", 0.9)
 
-for locName, locPos in pairs(positions) do
+for i, v in pairs(positions) do
 	local row = guiGridListAddRow(grid)
-	guiGridListSetItemText(grid, row, 1, locName, false, false)
+	guiGridListSetItemText(grid, row, 1, v[5], false, false)
+	guiGridListSetItemData(grid, row, 1, i, false, false)
 end
 
-local button = guiCreateButton(35, 512, 153, 62, "Warp", false, window)
-local Exit = guiCreateButton(255, 512, 153, 62, "Close", false, window)
-guiSetVisible(window, false)	 
+local warpButton = guiCreateButton(35, 512, 153, 62, "Warp", false, window)
+local cancelButton = guiCreateButton(255, 512, 153, 62, "Close", false, window)
   
-function showGUI()
+function toggleWPGUI()
   guiSetVisible(window, not guiGetVisible(window))
   showCursor(guiGetVisible(window))
  end
-addEvent("showGUI", true)
-addEventHandler("showGUI", getRootElement(), showGUI)
+addEvent("UCDadmin.onToggleWPGUI", true)
+addEventHandler("UCDadmin.onToggleWPGUI", resourceRoot, toggleWPGUI)
 
-function onClick()
-    if (source == button) then
-		local locName = guiGridListGetItemText(grid, guiGridListGetSelectedItem(grid))
-	    local x, y, z = positions[locName][1], positions[locName][2], positions[locName][3]
+function onWPButtonClick()
+    if (source == warpButton) then
+		local i = guiGridListGetItemData(grid, guiGridListGetSelectedItem(grid))
+		if (not i) then
+			exports.UCDdx:new("Please choose a destination", 255, 0, 0)
+			return
+		end
+	    local x, y, z, r = positions[i][1], positions[i][2], positions[i][3], positions[i][4]
 		local element = localPlayer
 		if (isPedInVehicle(element)) then
 			element = getPedOccupiedVehicle(element)
-			if (getVehicleOccupant(element) ~= localPlayer) then
-				exports.UCDdx:new("You must be the driver in order to warp your vehicle", 255, 0, 0)
+			if (getVehicleController(element) ~= localPlayer) then
+				exports.UCDdx:new("You must be the driver in order to warp this vehicle", 255, 0, 0)
 				return
 			end
 		end
 		setElementPosition(element, x, y, z)
+		setElementRotation(element, 0, 0, r)
 	    guiSetVisible(window, false)
-		showCursor(false)
-	elseif (source == Exit) then
+		if (not adminPanel.window.visible) then
+			showCursor(false)
+		end
+		exports.UCDdx:new("You have warped to "..tostring(guiGridListGetItemText(grid, guiGridListGetSelectedItem(grid))), 0, 255, 0)
+	elseif (source == cancelButton) then
 	    guiSetVisible(window, false)
-		showCursor(false)
+		if (not adminPanel.window.visible) then
+			showCursor(false)
+		end
 	end
 end
-addEventHandler("onClientGUIClick", root, onClick)
\ No newline at end of file
+addEventHandler("onClientGUIClick", warpButton, onWPButtonClick, false)
+addEventHandler("onClientGUIClick", cancelButton, onWPButtonClick, false)
\ No newline at end of file
diff --git a/UCDadmin/warp/server.lua b/UCDadmin/warp/server.lua
index 51a43e3..dc84704 100644
--- a/UCDadmin/warp/server.lua
+++ b/UCDadmin/warp/server.lua
@@ -1,7 +1,8 @@
--- Warp points by HellStunter
-function serverShowGUI(thePlayer)
+-- Warp panel by HellStunter
+function toggleWPGUI(thePlayer)
+	if (not exports.UCDaccounts:isPlayerLoggedIn(thePlayer)) then return end
    if (isPlayerAdmin(thePlayer) and thePlayer.team.name == "Admins") then
-        triggerClientEvent(thePlayer, "showGUI", thePlayer)
+        triggerClientEvent(thePlayer, "UCDadmin.onToggleWPGUI", resourceRoot)
    end
 end
-addCommandHandler("wp", serverShowGUI)
\ No newline at end of file
+addCommandHandler("wp", toggleWPGUI)
\ No newline at end of file
diff --git a/UCDanticheat/meta.xml b/UCDanticheat/meta.xml
index 5eb7b0a..7128b43 100644
--- a/UCDanticheat/meta.xml
+++ b/UCDanticheat/meta.xml
@@ -1,3 +1,3 @@
 <meta>
	<min_mta_version server="1.5.2" client="1.5.2"/>
-	<info author="Noki" description="Anticheat" type="script" version="1" />
-	<script src="antispam.lua" type="server"/>
	<script src="togglecontrol.lua" type="client"/>
	<oop>true</oop>
</meta>
\ No newline at end of file
+	<info author="Noki" description="Anticheat" type="script" version="1" />
	
+	<script src="antispam.lua" type="server"/>
	<script src="vehcontrol_s.lua" type="server"/>
	<script src="vehcontrol_c.lua" type="client"/>
	<script src="togglecontrol.lua" type="client"/>
	
	<export function="toggleVehicle" type="server"/>
	<export function="isVehicleDisabled" type="server"/>
	
	<oop>true</oop>
</meta>
\ No newline at end of file
diff --git a/UCDanticheat/vehcontrol_c.lua b/UCDanticheat/vehcontrol_c.lua
new file mode 100644
index 0000000..698e253
--- /dev/null
+++ b/UCDanticheat/vehcontrol_c.lua
@@ -0,0 +1,46 @@
+local vehicleControls = {
+	"vehicle_fire",
+	"vehicle_secondary_fire",
+	"vehicle_left",
+	"vehicle_right",
+	"steer_forward",
+	"steer_back",
+	"accelerate",
+	"brake_reverse",
+	"radio_next",
+	"radio_previous",
+	"radio_user_track_skip",
+	"horn",
+	"sub_mission",
+	"handbrake",
+	"vehicle_look_left",
+	"vehicle_look_right",
+	"vehicle_look_behind",
+	"vehicle_mouse_look",
+	"special_control_left",
+	"special_control_right",
+	"special_control_down",
+	"special_control_up",
+}
+
+function toggleVehicleControls(disable)
+	removeEventHandler("onClientKey", root, stopControls)
+	if (disable) then
+		addEventHandler("onClientKey", root, stopControls)
+		return
+	end
+end
+addEvent("onToggleVehicleControls", true)
+addEventHandler("onToggleVehicleControls", resourceRoot, toggleVehicleControls)
+
+function stopControls(key, state)
+	for _, v in ipairs(vehicleControls) do
+		if (getBoundKeys(v)[key]) then
+			if (state) then
+				toggleControl(v, false)
+			elseif (not state and not isControlEnabled(v)) then -- not to enable when controls is disabled(abuse)
+				toggleControl(v, true)
+			end
+		end
+	end
+end
\ No newline at end of file
diff --git a/UCDanticheat/vehcontrol_s.lua b/UCDanticheat/vehcontrol_s.lua
new file mode 100644
index 0000000..3b631ff
--- /dev/null
+++ b/UCDanticheat/vehcontrol_s.lua
@@ -0,0 +1,39 @@
+local disabledVehicles = {}
+
+function toggleVehicle(vehicle, resp)
+	if (not vehicle or not isElement(vehicle) or vehicle.type ~= "vehicle"
+		or not resp or not isElement(resp) or resp.type ~= "player") then
+		return false
+	end
+	removeEventHandler("onVehicleStartEnter", vehicle, toggleEffects)
+	removeEventHandler("onVehicleStartExit", vehicle, toggleEffects)
+	removeEventHandler("onElementDestroy", vehicle, removeOnDestroy)
+	if (disabledVehicles[vehicle]) then
+		disabledVehicles[vehicle] = nil
+		if (vehicle.controller) then
+			triggerClientEvent(vehicle.controller, "onToggleVehicleControls", resourceRoot, false)
+		end
+	else
+		disabledVehicles[vehicle] = true
+		addEventHandler("onVehicleStartEnter", vehicle, toggleEffects, false)
+		addEventHandler("onVehicleStartExit", vehicle, toggleEffects, false)
+		addEventHandler("onElementDestroy", vehicle, removeOnDestroy, false)
+		if (vehicle.controller) then -- Disable if in vehicle already
+			triggerClientEvent(vehicle.controller, "onToggleVehicleControls", resourceRoot, true)
+		end
+	end
+	return true
+end
+
+function isVehicleDisabled(vehicle)
+	return disabledVehicles[vehicle] or false
+end
+
+function removeOnDestroy()
+	disabledVehicles[source] = nil
+end
+
+function toggleEffects(plr, seat)
+	if (not disabledVehicles[source] or seat ~= 0) then return end
+	triggerClientEvent(plr, "onToggleVehicleControls", resourceRoot, eventName == "onVehicleStartEnter" and true or false)
+end
\ No newline at end of file
diff --git a/UCDatm/shared.lua b/UCDatm/shared.lua
index 23351ec..e17f781 100644
--- a/UCDatm/shared.lua
+++ b/UCDatm/shared.lua
@@ -1,5 +1,9 @@
 atms = {
+<<<<<<< HEAD
 	--{x = 2220.311, y = 1911.8014, z = 68.0481, rot = 0},
+=======
+	-- {x = 2220.311, y = 1911.8014, z = 68.0481, rot = 0},
+>>>>>>> bitbucket/master
 	{x = 1505.1757, y = -1698.2469, z = 14.0469, rot = 270},
 	{x = 2072.6182, y = -1823.6646, z = 13.5469, rot = 270},
 	{x = 2127.967, y = -1152.9561, z = 23.9997, rot = 35.8409},
@@ -39,5 +43,10 @@ atms = {
 	{x = 1265.1475, y = 165.639, z = 19.6632, rot = 250},
 	{x = 2330.957, y = 83.0518, z = 26.4848, rot = 0},
 	{x = 2773.2581, y = -2502.8472, z = 13.6465, rot = 90},
+<<<<<<< HEAD
 	--{x = 846.7418, y = -2034.7103, z = 12.8672, rot = 90}
 }
+=======
+	{x = 846.7418, y = -2034.7103, z = 12.8672, rot = 90}
+}
+>>>>>>> bitbucket/master
diff --git a/UCDbc/meta.xml b/UCDbc/meta.xml
index 9001505..0b05f67 100644
--- a/UCDbc/meta.xml
+++ b/UCDbc/meta.xml
@@ -4,5 +4,7 @@
 	<script src="client.lua" type="client"/>
 	<export function="bcDrop" type="server"/>
 	<export function="bcGetTime" type="server"/>
+	<export function="bcGetTimeRaw" type="server"/>
+	<export function="bcGetTimeMsg" type="server"/>
 	<oop>true</oop>
 </meta>
\ No newline at end of file
diff --git a/UCDbc/server.lua b/UCDbc/server.lua
index 674e186..70817e7 100644
--- a/UCDbc/server.lua
+++ b/UCDbc/server.lua
@@ -36,7 +36,7 @@ function bcTake(plr)
 		blip:attach(bc)
 		exports.bone_attach:attachElementToBone(bc, plr, 11, 0, 0.06, 0.3, 0, 180, 0)
 		triggerClientEvent(plr, "bcDoBlip", resourceRoot, true)
-		exports.UCDdx:new(plr, "Deliver the briefcase to Woozie within 10 minutes!", 0, 255, 0)
+		exports.UCDdx:new(plr, "Deliver the briefcase to Woozie within 10 minutes", 0, 255, 0)
 		for _, plr2 in ipairs(Element.getAllByType("player")) do
 			if (plr2 ~= plr) then
 				exports.UCDdx:new(plr2, plr.name.." has picked up the briefcase", 0, 255, 0)
@@ -55,7 +55,7 @@ function bcStart()
 	startPos = bc:getPosition()
 	blip = Blip.createAttachedTo(bc, 17, nil, nil, nil, nil, nil, 0, 650)
 	for _, plr in ipairs(Element.getAllByType("player")) do
-		exports.UCDdx:new(plr, "A briefcase needs to be delivered, look for diner blip in the map!", 0, 255, 0)
+		exports.UCDdx:new(plr, "A briefcase needs to be delivered, look for diner blip on the map", 0, 255, 0)
 	end
 	addEventHandler("onPickupHit", bc, bcTake)
 end
@@ -134,7 +134,7 @@ addEventHandler("bcEnd", resourceRoot,
 			end
 		end
 		local reward = math.floor(getDistanceBetweenPoints3D(x, y, z, startPos) * 50)
-		if (reward > 40000) then reward = 40000 end
+		if (reward > 30000) then reward = 30000 end
 		client.money = client.money + reward
 		exports.UCDdx:new(client, "You have been rewarded $"..exports.UCDutil:tocomma(reward).." and 15 criminal XP!", 0, 255, 0)
 		exports.UCDwanted:addWantedPoints(bcTaker, 30)
@@ -184,6 +184,26 @@ function bcGetTime()
 	return msg
 end
 
+function bcGetTimeRaw()
+	if (isTimer(startTimer)) then
+		return startTimer:getDetails()
+	elseif (isTimer(stopTimer)) then
+		return stopTimer:getDetails()
+	end
+	return false
+end
+
+function bcGetTimeMsg()
+	local msg
+	if (isTimer(startTimer)) then
+		msg = "left for Woozie to arrive in LV"
+	elseif (isTimer(stopTimer)) then	
+		msg = "left for Woozie to leave for SF"
+	else
+		msg = "Waiting for Woozie's savior"
+	end
+	return msg
+end
 
 addCommandHandler("bctime",
 	function (plr)
@@ -199,8 +219,8 @@ addCommandHandler("bctime",
 		if (not r or not g or not b) then
 			r, g, b = 255, 255, 255
 		end
-		outputChatBox(bcGetTime(), plr, r, g, b)
+		exports.UCDdx:new(plr, tostring(bcGetTime()), r, g, b)
 		antiSpam[plr] = true
 		Timer(function (plr) if (isElement(plr)) then antiSpam[plr] = nil end end, 5000, 1, plr)
 	end
-)
\ No newline at end of file
+)
diff --git a/UCDbuilder/build_s.lua b/UCDbuilder/build_s.lua
index b02acb8..cada2ab 100644
--- a/UCDbuilder/build_s.lua
+++ b/UCDbuilder/build_s.lua
@@ -28,7 +28,7 @@ function testObject(plr)
 	local isZone, zoneID = isPlayerInZone(plr, "*")
 	if (isZone) then
 		if (idToZone[zoneID]) then
-			local o = Object(5464, plr.matrix.position + plr.matrix.forward * 3)
+			local o = Object(1684, plr.matrix.position + plr.matrix.forward * 3)
 			o:setParent(idToZone[zoneID])
 		else
 			outputDebugString("wtf")
diff --git a/UCDbuilder/zones_s.lua b/UCDbuilder/zones_s.lua
index c857d18..125d067 100644
--- a/UCDbuilder/zones_s.lua
+++ b/UCDbuilder/zones_s.lua
@@ -5,6 +5,7 @@ authorizedToBuild = {}
 
 zoneCoords = {
 	[1] = {-3340.2417, 2054.9397, 0, 50, 30, 20}
+	
 }
 
 addEventHandler("onResourceStart", resourceRoot,
@@ -14,17 +15,19 @@ addEventHandler("onResourceStart", resourceRoot,
 )
 
 function cacheZones(qh)
-	local result = qh:poll(-1)
+	local result = qh:poll(0)
 	
-	for i, coord in ipairs(zoneCoords) do
-		local z = ColShape.Cuboid(coord[1], coord[2], coord[3], coord[4], coord[5], coord[6])
-		local data = result[i]
+	for i, data in ipairs(result) do
+		local xyz = Vector3(fromJSON(data.xyz))
+		local lwh = Vector3(fromJSON(data.lwh))
+		
+		local z = ColShape.Cuboid(xyz, lwh)
 		
-		z:setData("zoneID", i)
+		z:setData("zoneID", data.zoneID)
 		idToZone[i] = z
 		addEventHandler("onColShapeHit", z, onEnterZone)
 		addEventHandler("onColShapeLeave", z, onExitZone)
-		zones[i] = {account = data.account, name = data.name}
+		zones[data.zoneID] = {account = data.account, name = data.name}
 		
 		authorizedToBuild[i] = {}
 		authorizedToBuild[i] = fromJSON(data.authorized)
diff --git a/UCDchat/chatbox_c.lua b/UCDchat/chatbox_c.lua
index 047e9e7..bc3224d 100644
--- a/UCDchat/chatbox_c.lua
+++ b/UCDchat/chatbox_c.lua
@@ -1,51 +1,48 @@
-local window = GuiWindow(0, 0, 600, 400, "UCD | Chatbox", false)
-window.sizable = false
-window.movable = false
-window.visible = false
-exports.UCDutil:centerWindow(window)
-local tabPanel = GuiTabPanel(0, 20, 600, 335, false, window)
-local _tabs = {"Support", "Main", "Team", "Local", "Group", "Alliance"}
-local tabs = {}
-local lists = {}
-for _, tab in ipairs(_tabs) do
-	tabs[tab:lower()] = GuiTab(tab, tabPanel)
-	lists[tab:lower()] = GuiGridList(5, 5, 572.5, 302.5, false, tabs[tab:lower()])
-	lists[tab:lower()]:addColumn("Name", 0.25)
-	lists[tab:lower()]:addColumn("Message", 0.71)
+local chatbox = {tab = {}, grid = {}}
+chatbox.window = GuiWindow(0, 0, 600, 400, "UCD | Chatbox", false)
+chatbox.window.sizable = false
+chatbox.window.visible = false
+exports.UCDutil:centerWindow(chatbox.window)
+chatbox.tabPanel = GuiTabPanel(0, 20, 600, 335, false, chatbox.window)
+local tabs = {"Support", "Main", "Team", "Local", "Group", "Alliance"}
+for _, tab in ipairs(tabs) do
+	local chatType = tab:lower()
+	chatbox.tab[chatType] = GuiTab(tab, chatbox.tabPanel)
+	chatbox.grid[chatType] = GuiGridList(5, 5, 572.5, 302.5, false, chatbox.tab[chatType])
+	chatbox.grid[chatType]:addColumn("Name", 0.25)
+	chatbox.grid[chatType]:addColumn("Message", 0.71)
 end
-local talk = GuiEdit(0, 360, 600, 200, "", false, window)
-talk.maxLength = 128
+chatbox.edit = GuiEdit(0, 360, 600, 200, "", false, chatbox.window)
+chatbox.edit.maxLength = 128
 
-addEvent("listInsert", true)
-addEventHandler("listInsert", resourceRoot,
-	function (type, sender, msg)
-		local row = lists[type]:insertRowAfter(-1)
-		lists[type]:setItemText(row, 1, sender.name, false, false)
-		lists[type]:setItemText(row, 2, msg, false, false)
+addEvent("UCDchat.chatbox.insert", true)
+addEventHandler("UCDchat.chatbox.insert", root,
+	function (chatType, msg)
+		local row = chatbox.grid[chatType]:insertRowAfter(-1)
+		chatbox.grid[chatType]:setItemText(row, 1, source.name, false, false)
+		chatbox.grid[chatType]:setItemText(row, 2, msg, false, false)
 	end
 )
 
-addEventHandler("onClientGUIAccepted", root,
+addEventHandler("onClientGUIAccepted", chatbox.edit,
 	function ()
-		if (source == talk) then
-			if (talk.text:gsub(" ", "") ~= "") then
-				local type
-				for type2, tab in pairs(tabs) do
-					if (tabPanel.selectedTab == tab) then
-						type = type2
-					end
+		if (chatbox.edit.text:gsub(" ", "") ~= "") then
+			local chatType
+			for tabType, tab in pairs(chatbox.tab) do
+				if (chatbox.tabPanel.selectedTab == tab) then
+					chatType = tabType
 				end
-				triggerServerEvent("doChat", resourceRoot, type, talk.text)
-				talk.text = ""
 			end
+			triggerServerEvent("UCDchat.chatbox.send", localPlayer, chatType, chatbox.edit.text)
+			chatbox.edit.text = ""
 		end
-	end
+	end, false
 )
 
 bindKey("j", "down",
 	function ()
-		window.visible = not window.visible
-		showCursor(window.visible)
-		guiSetInputMode(window.visible and "no_binds_when_editing" or "allow_binds")
+		chatbox.window.visible = not chatbox.window.visible
+		showCursor(chatbox.window.visible)
+		guiSetInputMode(chatbox.window.visible and "no_binds_when_editing" or "allow_binds")
 	end
 )
\ No newline at end of file
diff --git a/UCDchat/chatbox_s.lua b/UCDchat/chatbox_s.lua
index 43127e2..eeac284 100644
--- a/UCDchat/chatbox_s.lua
+++ b/UCDchat/chatbox_s.lua
@@ -1,9 +1,9 @@
-function listInsert(receiver, type, sender, msg)
-	triggerClientEvent(receiver, "listInsert", resourceRoot, type, sender, msg)
+function insert(receiver, type, sender, msg)
+	triggerClientEvent(receiver, "UCDchat.chatbox.insert", sender, type, msg)
 end
 
-addEvent("doChat", true)
-addEventHandler("doChat", resourceRoot,
+addEvent("UCDchat.chatbox.send", true)
+addEventHandler("UCDchat.chatbox.send", root,
 	function (type, msg)
 		if (not exports.UCDchecking:canPlayerDoAction(client, "Chat")) then return end
 		if (type == "main" or type == "team") then
diff --git a/UCDchat/local.lua b/UCDchat/local.lua
index 4b6526f..0384a2d 100644
--- a/UCDchat/local.lua
+++ b/UCDchat/local.lua
@@ -36,7 +36,7 @@ function localChat(player, _, ...)
 		if (getElementAlpha(v) == 0) then playerCount = playerCount - 1 end
 		if (playerCount < 0) then playerCount = 0 end
 		outputChatBox("(LOC) ["..playerCount.."] "..player.name.." #FFFFFF"..msg, v, pR, pG, pB, true)
-		triggerClientEvent(v, "listInsert", resourceRoot, "local", player, msg)
+		insert(v, "local",  player, msg)
 	end
 	
 	triggerClientEvent("onMessageIncome", player, msg)
diff --git a/UCDchat/meta.xml b/UCDchat/meta.xml
index 291ecfb..1be5c6f 100644
--- a/UCDchat/meta.xml
+++ b/UCDchat/meta.xml
@@ -1,3 +1,3 @@
 <meta>
	<min_mta_version server="1.5.2" client="1.5.2"/>
 	<info author="Noki" description="Chat system" type="script" version="1" />
	
-	<script src="instantMessaging.lua" type="server"/>
	<script src="instantMessaging_c.lua" type="client"/>
	<script src="local.lua" type="server"/>
	<script src="rolePlay.lua" type="server"/>
	<script src="carchat.lua" type="server"/>
	<script src="server.lua" type="server"/>
	<script src="admin.lua" type="server"/>
	<script src="ircpm.lua" type="server"/>
	<script src="chatbubbles_client.lua" type="client"/>
	<script src="chatbox_c.lua" type="client"/>
	<script src="chatbox_s.lua" type="server"/>
	
	<export function="instantMessage" type="server"/>
	<export function="getForeignLetters" type="server"/>
	<export function="listInsert" type="server"/>
	
	<oop>true</oop>
</meta>
\ No newline at end of file
+	<script src="instantMessaging.lua" type="server"/>
	<script src="instantMessaging_c.lua" type="client"/>
	<script src="local.lua" type="server"/>
	<script src="rolePlay.lua" type="server"/>
	<script src="carchat.lua" type="server"/>
	<script src="server.lua" type="server"/>
	<script src="admin.lua" type="server"/>
	<script src="ircpm.lua" type="server"/>
	<script src="chatbubbles_client.lua" type="client"/>
	<script src="chatbox_c.lua" type="client"/>
	<script src="chatbox_s.lua" type="server"/>
	
	<export function="instantMessage" type="server"/>
	<!--><export function="getForeignLetters" type="server"/><!-->
	<export function="insert" type="server"/>
	
	<oop>true</oop>
</meta>
\ No newline at end of file
diff --git a/UCDchat/server.lua b/UCDchat/server.lua
index 9265ac2..8b6a2de 100644
--- a/UCDchat/server.lua
+++ b/UCDchat/server.lua
@@ -29,7 +29,9 @@ end
 --]]
 
 local antiSpam = {}
+local advertSpam = {}
 local antiSpamTime = 2000 -- Time in ms that we don't allow a player to speak after have already spoken
+local includeCities = false
 
 function clearAntiSpam(player)
 	if (antiSpam[player]) then
@@ -57,25 +59,29 @@ function onPlayerChat2(player, message, messageType)
 	end
 	if (exports.UCDaccounts:isPlayerLoggedIn(player)) then
 		-- if main chat
-		
+			
 		local nR, nG, nB = player:getNametagColor()
 		local coord = player:getPosition()
 		
 		if (messageType == 0) then
+			-- local t what is this?
+			local msg = tostring(player.name).."#FFFFFF "..tostring(message)
 			
-			local sourceCity = exports.UCDutil:getPlayerCityZone(player)
-			
-			outputChatBox(--[["("..sourceCity..") "..--]]player.name.."#FFFFFF "..message, root, nR, nG, nB, true)
+			if (includeCities) then
+				msg = "("..tostring(exports.UCDutil:getPlayerCityZone(player))..") "..msg
+			end
+
+			outputChatBox(msg, root, nR, nG, nB, true)
 			antiSpam[player] = true
 			setTimer(clearAntiSpam, antiSpamTime, 1, player)
 			
 			exports.UCDlogging:new(player, "Main", message, sourceCity)
 			
-			--triggerClientEvent("listInsert", resourceRoot, "main", player, message)
-			listInsert(root, "main", player, message)
+			--triggerClientEvent("insert", resourceRoot, "main", player, message)
+			insert(root, "main", player, message)
 		-- if team chat
 		elseif (messageType == 2) then
-			local t
+			-- local t again? omg
 			
 			if (message:sub(1, 1) == "/") then
 				executeCommandHandler(message:sub(2, #message), player)
@@ -90,8 +96,8 @@ function onPlayerChat2(player, message, messageType)
 			setTimer(clearAntiSpam, antiSpamTime, 1, player)
 			exports.UCDlogging:new(player, "Teamchat", message, t)
 			
-			--triggerClientEvent(player.team:getPlayers(), "listInsert", resourceRoot, "team", player, message)
-			listInsert(player.team:getPlayers(), "team", player, message)
+			-- triggerClientEvent(player.team.players, "insert", resourceRoot, "team", player, message)
+			insert(player.team.players, "team", player, message)
 		-- if /me chat
 		elseif (messageType == 1) then
 			for _, v in ipairs(Element.getAllByType("player")) do
@@ -125,32 +131,29 @@ function supportChat(plr, _, ...)
 		return
 	end
 	outputChatBox("(SUPPORT) "..plr.name.." #ffffff"..msg, root, 0, 155, 0, true)
-	exports.irc:ircSay(exports.irc:ircGetChannelFromName("#ucd.echo"), "13(SUPPORT) "..plr.name.." "..msg)
+	-- exports.irc:ircSay(exports.irc:ircGetChannelFromName("#ucd.echo"), "13(SUPPORT) "..plr.name.." "..msg)
 	exports.UCDlogging:new(plr, "support", msg)
-	--triggerClientEvent("listInsert", resourceRoot, "support", plr, msg)
-	listInsert(root, "support", plr, msg)
+	-- triggerClientEvent("insert", resourceRoot, "support", plr, msg)
+	insert(root, "support", plr, msg)
 end
 addCommandHandler("support", supportChat)
 
-local advertSpam = {}
-
-addCommandHandler("advert",
-	function (plr, _, ...)
-		if (not exports.UCDchecking:canPlayerDoAction(plr, "Chat")) then
-			return false
-		end
-		if (advertSpam[plr.account.name] and getTickCount() - advertSpam[plr.account.name] <= (30 * 60000)) then
-			exports.UCDdx:new(plr, "You can advert once per 30 minutes", 255, 0, 0)
-			return false
-		end
-		local msg = string.gsub(table.concat({...}, " "), "%x%x%x%x%x%x", "")
-		if (not msg or string.gsub(msg, " ", "") == "") then
-			exports.UCDdx:new(plr, "Enter a message!", 255, 0, 0)
-			return false
-		end
-		outputChatBox("(ADVERT) "..plr.name.." #ffffff"..msg, root, 255, 255, 0, true)
-		exports.irc:ircSay(exports.irc:ircGetChannelFromName("#ucd.echo"), "8(ADVERT) "..plr.name.." "..msg)
-		exports.UCDlogging:new(plr, "advert", msg)
-		advertSpam[plr.account.name] = getTickCount()
+function advertChat(plr, _, ...)
+	if (not exports.UCDchecking:canPlayerDoAction(plr, "Chat")) then
+		return false
 	end
-)
\ No newline at end of file
+	if (advertSpam[plr.account.name] and getTickCount() - advertSpam[plr.account.name] <= (30 * 60000)) then
+		exports.UCDdx:new(plr, "You can advert once per 30 minutes", 255, 0, 0)
+		return false
+	end
+	local msg = table.concat({...}, " "):gsub(" ", ""):gsub("%x%x%x%x%x%x", "")
+	if (not msg or #msg == 0) then
+		exports.UCDdx:new(plr, "Please, enter a message", 255, 0, 0)
+		return false
+	end
+	outputChatBox("(AD) "..plr.name.." #ffffff"..msg, root, 255, 255, 0, true)
+	-- exports.irc:ircSay(exports.irc:ircGetChannelFromName("#ucd.echo"), "8(ADVERT) "..plr.name.." "..msg)
+	exports.UCDlogging:new(plr, "advert", msg)
+	advertSpam[plr.account.name] = getTickCount()
+end
+addCommandHandler("ad", advertChat)
\ No newline at end of file
diff --git a/UCDchecking/checking.lua b/UCDchecking/checking.lua
index d7173f8..fe7e313 100644
--- a/UCDchecking/checking.lua
+++ b/UCDchecking/checking.lua
@@ -50,6 +50,24 @@ local actions = {
 		{"s", "NoVehicle", "NoArrest", "NoJailed", "NoJetpack", "NoDead", "NoCustody", "NoGlue"},
 		{"w", 2},
 	},
+	["EndShift"] = {
+		{"a", "BC", "Builder", "AFK", "RobHouse"},
+		{"s", "NoVehicle", "NoArrest", "NoJailed", "NoJetpack", "NoDead", "NoCustody", "NoGlue"},
+		{"w", 1},
+	},
+	["QuitJob"] = {
+		{"a", "BC", "Builder", "AFK", "RobHouse"},
+		{"s", "NoVehicle", "NoArrest", "NoJailed", "NoJetpack", "NoDead", "NoCustody", "NoGlue"},
+		{"w", 1},
+	},
+	["DoAnim"] = {
+		{"a", "BC", "Builder", "AFK", "HouseRob"},
+		{"s", "NoVehicle", "NoArrest", "NoJailed", "NoJetpack", "NoDead", "NoCustody", "NotInWater", "NotFlying"},
+	},
+	["PayNSpray"] = {
+		{"a", "BC", "Builder", "AFK", "HouseRob"},
+		{"s", "NoArrest", "NoJailed", "NoJetpack", "NoDead", "NoCustody", "NotInWater"},
+	},
 }
 -- a = actions(interrupts)
 -- s = state(vehicle etc)
diff --git a/UCDcore/core.lua b/UCDcore/core.lua
index fa55868..d9d330c 100644
--- a/UCDcore/core.lua
+++ b/UCDcore/core.lua
@@ -25,10 +25,10 @@ function getGameVersion()
 	return tostring(ver[1].version)
 end
 
-setGameType("UCD "..getGameVersion())
+setGameType("Vanos "..getGameVersion())
 setMinuteDuration(6000)
 setFPSLimit(60)
-setServerPassword("")
+setServerPassword("onelove")
 setWeather(10)
 setTime(0, 0)
 for i = 0, 49 do setGarageOpen(i, true) end
diff --git a/UCDcriminal/f5.lua b/UCDcriminal/f5.lua
index c481c76..f30b8fa 100644
--- a/UCDcriminal/f5.lua
+++ b/UCDcriminal/f5.lua
@@ -4,12 +4,15 @@ local info =
 {
 	["House Robbing"] = "To rob a house, enter the house marker and press 'N'. You will then enter the house. Once in, there are two markers that will appear somewhere in the house. Go find them and collect the loot there. Exit the house and make your way to a truck blip. Here you can sell your stolen goods for money.",
 	["Turfing"] = "To capture turfs and participate in gang wars, you must go to Las Venturas. Here you can battle it out with other groups for control over various areas in LV called turfs. Las Venturas is a city not bound by law. The police rarely enter for fear of their own lives, so you're free to do as you please here. Las Venturas is also a KoS zone (kill on sight), meaning you can kill anyone. But be careful, you may also get hunted. It is recommended to use guns in Las Venturas as it's a very dangerous area.",
-	["Briefcase"] = "",
+	["Briefcase"] = "To deliver the briefcase to Woozie within time to get a good reward based on the distance you have travelled. If 10 minutes pass and you haven't delivered it yet, Woozie will -unfotunately- leave you alone for SF.",
 	["Bank Robbery"] = "The bank robbery is the activity that separates the boys from the men. Only the best criminals can possibly rob the bank. To rob the bank you will need lots of guns and a getaway. Travel to the LS bank marked by a $ (dollar sign) on your map to rob the bank. Bring a getaway vehicle and park it out the front of the bank. You will need this for later when you escape. Enter the bank and wait for the robbery to begin. Once in, capture all the checkpoint markers and hold them for 4 minutes. You will need to kill any police that get in your way. Work together on this. After you have successfully held the bank, exit and escape. You have to get far away from the bank to receive your reward.",
 	["Drifting"] = "",
 	["Street Racing"] = "",
 }
 
+-- Update timers for constant updates
+local constantBC = {}
+
 addEventHandler("onClientResourceStart", resourceRoot,
 	function ()
 		F5.window = GuiWindow(772, 390, 423, 322, "UCD | Criminal Panel", false)
@@ -23,6 +26,7 @@ addEventHandler("onClientResourceStart", resourceRoot,
 		guiLabelSetColor(F5.label["progress"], 1, 0, 0)
 		guiLabelSetHorizontalAlign(F5.label["progress"], "center", false)
 		guiLabelSetVerticalAlign(F5.label["progress"], "center")
+		guiLabelSetColor(F5.label["progress"], 255, 255, 255)
 		
 		F5.button = GuiButton(330, 287, 82, 25, "Close", false, F5.window)
 		F5.label["level"] = GuiLabel(9, 28, 78, 30, "Level", false, F5.window)
@@ -39,7 +43,7 @@ addEventHandler("onClientResourceStart", resourceRoot,
 		F5.label["br"] = GuiLabel(10, 10, 384, 23, "Bank Robbery: ", false, F5.tab["events"])
 		guiSetFont(F5.label["br"], "clear-normal")
 		guiLabelSetVerticalAlign(F5.label["br"], "center")
-		F5.label["bc"] = GuiLabel(10, 43, 384, 23, "Briefcase: <feature not completed>", false, F5.tab["events"])
+		F5.label["bc"] = GuiLabel(10, 43, 384, 23, "Briefcase: ", false, F5.tab["events"])
 		guiSetFont(F5.label["bc"], "clear-normal")
 		guiLabelSetVerticalAlign(F5.label["bc"], "center")
 		F5.label["streetrace"] = GuiLabel(10, 76, 384, 23, "Street Race: <feature not completed>", false, F5.tab["events"])
@@ -105,6 +109,11 @@ function toggleGUI(data)
 			
 			if (data.bc) then
 				F5.label["bc"].text = "Briefcase: "..tostring(data.bc)
+				if (constantBC.t and isTimer(constantBC.t)) then
+					constantBC.t:destroy()
+					constantBC.t = nil
+				end
+				constantBC = {t = Timer(constantUpdate, 1000, 0, data.bc, data.bcMsg), r = getTickCount()}
 			end
 		else
 			if (F5.window.visible) then
@@ -120,3 +129,17 @@ addCommandHandler("crimpanel", toggleGUI)
 bindKey("F5", "up", "crimpanel")
 addEvent("UCDcriminal.updateGUI", true)
 addEventHandler("UCDcriminal.updateGUI", root, toggleGUI)
+
+function constantUpdate(timestamp, msg)
+	local curr = getTickCount() - constantBC.r
+	local newTime = timestamp - curr
+	
+	if (newTime <= 0) then
+		F5.label["bc"].text = "Briefcase: Available to take"
+		constantBC.t:destroy()
+		constantBC.t = nil
+		return
+	end
+	
+	F5.label["bc"].text = "Briefcase: "..tostring(exports.UCDutil:formatMil(newTime)).." "..tostring(msg)
+end
diff --git a/UCDcriminal/f5.slua b/UCDcriminal/f5.slua
index 3e3c66a..6dcc0cc 100644
--- a/UCDcriminal/f5.slua
+++ b/UCDcriminal/f5.slua
@@ -33,8 +33,9 @@ function fetchData()
 	local rank = getPlayerCriminalRank(client) or 0
 	local xp = exports.UCDaccounts:GAD(client, "crimXP") or 0
 	local nextXP = math.geoprog(rank + 1) or math.geoprog(1)
-	local bc = exports.UCDbc:bcGetTime()
-	local temp = {rank = rank, nextXP = nextXP, xp = xp, bank = bank, bc = bc}
+	local bc = exports.UCDbc:bcGetTimeRaw()
+	local bcMsg = exports.UCDbc:bcGetTimeMsg()
+	local temp = {rank = rank, nextXP = nextXP, xp = xp, bank = bank, bc = bc, bcMsg = bcMsg}
 	triggerLatentClientEvent(client, "UCDcriminal.updateGUI", client, temp)
 end
 addEvent("UCDcriminal.fetchData", true)
diff --git a/UCDcriminal/meta.xml b/UCDcriminal/meta.xml
index a956af8..008eec8 100644
--- a/UCDcriminal/meta.xml
+++ b/UCDcriminal/meta.xml
@@ -1,3 +1,3 @@
 <meta>
	<min_mta_version server="1.4" client="1.4"/>
 	<info author="Noki" description="Criminal job" type="script" version="Alpha" />
-	<script src="server.lua" type="server"/>
	<script src="client.lua" type="client"/>
	
	<script src="f5.slua" type="server"/>
	<script src="f5.lua" type="client"/>
	<oop>true</oop>
</meta>
\ No newline at end of file
+	<script src="server.lua" type="server"/>
	<script src="client.lua" type="client"/>
	
	<script src="f5.slua" type="server"/>
	<script src="f5.lua" type="client"/>
	
	<export function="getPlayerCriminalRank" type="server"/>
	<oop>true</oop>
</meta>
\ No newline at end of file
diff --git a/UCDdx/bar_c.lua b/UCDdx/bar_c.lua
index cb7562d..038d106 100644
--- a/UCDdx/bar_c.lua
+++ b/UCDdx/bar_c.lua
@@ -33,11 +33,7 @@ function add(key, text, red, green, blue, ind)
 	return true
 end
 --add("x", "The mitochrondria is the powerhouse of the cell", 255, 255, 255)
-addEventHandler("onClientRender", root,
-	function ()
-		add("ucd", "UCD Alpha", 255, 255, 255, 1)
-	end
-)
+add("ucd", "UCD Alpha", 255, 255, 255)
 
 addEvent("UCDdx.bar:add", true)
 addEventHandler("UCDdx.bar:add", root, add)
diff --git a/UCDdx/client.lua b/UCDdx/client.lua
index aa4937c..2d389c8 100644
--- a/UCDdx/client.lua
+++ b/UCDdx/client.lua
@@ -1,5 +1,16 @@
 sX, sY = guiGetScreenSize()
+local enabled = exports.UCDsettings:getSetting("dxmsgs") == "Yes" and true or false
 
+local Shout = { -- hell yeah
+	enabled = true,
+	scale = 2.5,
+	life = 10000,
+	extralife = 150,
+	color = {255, 140, 0},
+	uppercase = false,
+	font = "default-bold",
+	entries = {}
+}
 ContextBar = {
 	height = 23,
 	speed = 20,
@@ -19,6 +30,10 @@ function ContextBar.add(text, r, g, b)
 	--local y = sY - ContextBar.height
 	--y = sY - (#ContextBar.entries * ContextBar.height) - ContextBar.height
 	--y = sY - y
+	if (not enabled) then
+		outputChatBox(tostring(text), r, g, b)
+		return
+	end
 	local y = -23
 	
 	--if text == "" or text == nil then return false end
@@ -58,6 +73,10 @@ end
 --addCommandHandler("dx", function () ContextBar.add("The quick brown fox jumps over the lazy dog "..exports.UCDutil:randomstring(2), math.random(0, 255), math.random(0, 255), math.random(0, 255)) end)
 addCommandHandler("getdx", function () outputDebugString(#ContextBar.entries) end)
 
+function enable(new)
+	enabled = new == "Yes" and true or false
+end
+
 addCommandHandler("cleardx",
 	function ()
 		ContextBar.entries = {}
@@ -153,14 +172,45 @@ addEventHandler("onClientRender", root,
 						end
 					end
 				end
-			end 
+			end
 			
 		end
+		
+		for i, v in ipairs(Shout.entries) do
+			if (i ~= 1) then Shout.entries[i][2] = getTickCount() return end -- draw one only, others delayed
+			local scale = Shout.scale
+			local tX, tY = (sX - dxGetTextWidth(v[1], scale, Shout.font)) / 2, sY - dxGetFontHeight(scale, Shout.font)
+			if (tX <= 0) then -- for large ones that would be cut
+				scale = scale - 1.25
+				tX, tY = (sX - dxGetTextWidth(v[1], scale, Shout.font)) / 2, sY - dxGetFontHeight(scale, Shout.font)
+			end
+			local alpha = (((Shout.life + (#v[1] * Shout.extralife)) - (getTickCount() - v[2])) / (Shout.life + (#v[1] * Shout.extralife))) * 255
+			-- idk how did i do all of this math but it works :D
+			dxDrawText(v[1], tX + 1, tY + 1, _, _, tocolor(0, 0, 0, alpha), scale, Shout.font, _, _, _, _, true)
+			dxDrawText(v[1], tX + 1, tY + 1, _, _, tocolor(0, 0, 0, alpha), scale, Shout.font, _, _, _, _, true)
+			dxDrawText(v[1], tX - 1, tY - 1, _, _, tocolor(0, 0, 0, alpha), scale, Shout.font, _, _, _, _, true)
+			dxDrawText(v[1], tX - 1, tY - 1, _, _, tocolor(0, 0, 0, alpha), scale, Shout.font, _, _, _, _, true)
+			dxDrawText(v[1], tX, tY, _, _, tocolor(Shout.color[1], Shout.color[2], Shout.color[3], alpha), scale, Shout.font, _, _, _, _, true)
+			if ((getTickCount() - v[2]) > (Shout.life + (#v[1] * Shout.extralife))) then
+				table.remove(Shout.entries, i)
+			end
+		end
+		
 	end
 )
 
+function shout(text)
+	if (not text or not tostring(text)) then return false, "text missing" end
+	if (not Shout.enabled) then new(text, 255, 0, 0) return false, "dx instead" end
+	if (Shout.uppercase) then text = text:upper() end
+	table.insert(Shout.entries, {text, getTickCount()})
+end
+addEvent("UCDdx.shout", true)
+addEventHandler("UCDdx.shout", resourceRoot, shout)
+-- shout(exports.ucdutil:randomstring(18))
+
 function new(text, r, g, b)
 	ContextBar.add(text, r, g, b)
 end
-addEvent("CSGdx.createNewDxMessage", true)
-addEventHandler("CSGdx.createNewDxMessage", localPlayer, new)
+addEvent("UCDdx.createNewDxMessage", true)
+addEventHandler("UCDdx.createNewDxMessage", localPlayer, new)
diff --git a/UCDdx/meta.xml b/UCDdx/meta.xml
index 59bd2e0..6f10f1b 100644
--- a/UCDdx/meta.xml
+++ b/UCDdx/meta.xml
@@ -1,19 +1,20 @@
 <meta>
 	<script src="server.lua" type="server"/>
 	<script src="client.lua" type="client"/>
+	<script src="money.lua" type="client"/>
 	<script src="bar_c.lua" type="client"/>
 	<script src="bar_s.lua" type="server"/>
 
 	<export function="new" type="client"/>
-	
+	<export function="new" type="server"/>
+	<export function="shout" type="client"/>
+	<export function="shout" type="server"/>
 	<export function="add" type="client"/>
 	<export function="add" type="server"/>
 	<export function="del" type="client"/>
 	<export function="del" type="server"/>
 	<export function="isText" type="client"/>
-	
-	<export function="new" type="server"/>
-	<export function="createNewDxMessageBot" type="client"/>
-	<export function="createNewDxMessageBot" type="server"/>
+	<export function="enable" type="client"/>
+
 	<oop>true</oop>
 </meta>
diff --git a/UCDdx/money.lua b/UCDdx/money.lua
new file mode 100644
index 0000000..078e0d5
--- /dev/null
+++ b/UCDdx/money.lua
@@ -0,0 +1,57 @@
+local data = {}
+local disappearTime = 10000
+
+function foo()
+	if (not Resource.getFromName("UCDaccounts") or not exports.UCDaccounts or not exports.UCDaccounts:isPlayerLoggedIn(localPlayer)) then
+		return false
+	end
+	
+	playerMoney = getPlayerMoney(localPlayer)
+	
+	-- Only want one change at a time
+	if (#data > 1) then	
+		data = {}
+	end
+end
+addEventHandler("onClientPreRender", root, foo)
+
+function hasPlayerMoneyChanged()
+	if (not Resource.getFromName("UCDaccounts") or not exports.UCDaccounts or not exports.UCDaccounts:isPlayerLoggedIn(localPlayer)) then
+		return false
+	end
+	
+	-- Check if the money changed
+	if (playerMoney ~= getPlayerMoney(localPlayer)) then	
+		-- Since their money changed, we need to gather some info
+		local newMoney = getPlayerMoney(localPlayer)
+		
+		-- Determine if the player lost, or gained money (little things like calculating the difference on the client save the server a lot of CPU)
+		if (tonumber(newMoney) and tonumber(playerMoney))then
+			if (newMoney > playerMoney) then
+				local difference = playerMoney - newMoney
+				table.insert(data, {newMoney, playerMoney, tick})
+			else
+				local difference = newMoney - playerMoney
+				table.insert(data, {newMoney, playerMoney, tick})
+			end
+		else
+			return
+		end
+		
+		local sign, r, g, b
+		if (newMoney > playerMoney) then
+			sign = "+"
+			r, g, b = 0, 200, 0
+		else
+			sign = "-"
+			r, g, b = 200, 0, 0
+		end
+		exports.UCDdx:add("UCDmoneyChange", sign..tostring(exports.UCDutil:tocomma(math.abs(newMoney - playerMoney))), r, g, b)
+		Timer(
+			function () 
+				exports.UCDdx:del("UCDmoneyChange") 
+			end, disappearTime, 1
+		)
+	end
+end
+addEventHandler("onClientRender", root, hasPlayerMoneyChanged)
diff --git a/UCDdx/server.lua b/UCDdx/server.lua
index af1e5e3..7dfe21d 100644
--- a/UCDdx/server.lua
+++ b/UCDdx/server.lua
@@ -1,21 +1,15 @@
-function new(p,text,r,g,b)
+function new(p, text, r, g, b)
 	local e = false
 	if (p) and (text) then if isElement(text) then e = text else e=p end end
-	if not(isElement(e)) then return end
+	if (not isElement(e)) then return end
 	if e == text then
-		triggerClientEvent(e,"CSGdx.createNewDxMessage",e,p,r,g,b)
+		triggerClientEvent(e, "UCDdx.createNewDxMessage", e, p, r, g, b)
 	else
-		triggerClientEvent(e,"CSGdx.createNewDxMessage",e,text,r,g,b)
+		triggerClientEvent(e, "UCDdx.createNewDxMessage", e, text, r, g, b)
 	end
 end
 
-function createNewDxMessageBot(p,text,r,g,b)
-	local e = false
-	if (p) and (text) then if isElement(text) then e = text else e=p end end
-	if not(isElement(e)) then return end
-	if e == text then
-		triggerClientEvent(e,"CSGdx.createNewDxMessageBot",e,p,r,g,b)
-	else
-		triggerClientEvent(e,"CSGdx.createNewDxMessageBot",e,text,r,g,b)
-	end
-end
+function shout(p, text)
+	if (not text or not tostring(text) or not p or not isElement(p) or (p.type ~= "player" and p ~= root)) then return end
+	triggerClientEvent(p, "UCDdx.shout", resourceRoot, text)
+end
\ No newline at end of file
diff --git a/UCDgroups/core.lua b/UCDgroups/core.lua
index 26ca0df..62df709 100644
--- a/UCDgroups/core.lua
+++ b/UCDgroups/core.lua
@@ -232,7 +232,7 @@ function createGroup(name)
 		--end
 		
 		local d, t = exports.UCDutil:getTimeStamp()
-		db:exec("INSERT INTO `groups_` SET `groupName` = ?, `colour` = ?, `chatColour` = ?, `info` = ?, `created` = ?", groupName, toJSON(settings.default_colour), toJSON(settings.default_chat_colour), settings.default_info_text, d.." "..t) -- Perform the inital group creation	
+		db:exec("INSERT INTO `groups_` SET `groupName` = ?, `colour` = ?, `chatColour` = ?, `info` = ?, `created` = ?, `gmotd` = ?, `gmotd_setter` = ?", groupName, toJSON(settings.default_colour), toJSON(settings.default_chat_colour), settings.default_info_text, d.." "..t, "", "") -- Perform the inital group creation	
 		db:exec("INSERT INTO `groups_members` (`account`, `groupName`, `rank`, `lastOnline`, `joined`, `timeOnline`, `warningLevel`) VALUES (?, ?, ?, ?, ?, ?, ?)", client.account.name, groupName, "Founder", getRealTime().yearday, d, getPlayerOnlineTime(client), 0) -- Make the client's membership official and grant founder status
 		setDefaultRanks(groupName)
 		
@@ -992,7 +992,7 @@ function groupChat(plr, _, ...)
 		messageGroup(getPlayerGroup(plr), "("..tostring(getPlayerGroup(plr))..") "..plr.name.." #FFFFFF"..msg, "chat")
 		for _, plr2 in ipairs(Element.getAllByType("player")) do
 			if (getPlayerGroup(plr2) == getPlayerGroup(plr)) then
-				exports.UCDchat:listInsert(plr2, "group", plr, msg)
+				exports.UCDchat:insert(plr2, "group", plr, msg)
 			end
 		end
 	end
@@ -1048,7 +1048,7 @@ function handleLogin2(qh, plr, account)
 	playerGroupCache[account][5] = getRealTime().yearday
 	local group_ = playerGroupCache[account][1]
 	local r, g, b = getGroupChatColour(group_)
-	local gmotd = groupTable[group_].gmotd
+	local gmotd = (groupTable[group_] and groupTable[group_].gmotd) or ""
 	
 	outputDebugString("handleLogin2: groupName = "..tostring(group_))
 	plr:setData("group", group_)
@@ -2093,7 +2093,7 @@ function allianceChat(plr, _, ...)
 			--messageGroup(groupName, "("..tostring(g_alliance[getPlayerGroup(plr)])..") "..plr.name.." #FFFFFF"..msg, "chat")
 			for _, plr2 in ipairs(getGroupOnlineMembers(groupName)) do
 				outputChatBox("("..tostring(alliance)..") "..plr.name.." #FFFFFF"..msg, plr2, 50, 100, 0, true)
-				exports.UCDchat:listInsert(plr2, "alliance", plr, msg)
+				exports.UCDchat:insert(plr2, "alliance", plr, msg)
 			end
 		end
 	end
diff --git a/UCDhud/c_hud.lua b/UCDhud/c_hud.lua
index a172262..c00fdf6 100644
--- a/UCDhud/c_hud.lua
+++ b/UCDhud/c_hud.lua
@@ -39,12 +39,12 @@ addEventHandler("onClientRender", root,
 						timeString = days.." days, "..hours.." hours, "..minutes.." minutes"
 					end
 				end
-			
-				dxDrawText("Uptime: "..timeString.." || FPS: "..fps.." || Ping: "..ping, 0 - 1, 0 - 1, (sX - 5) - 1, 16 - 1, tocolor(0, 0, 0, 255), 1, "default-bold", "right", "top", false, false, false, false, false)
-				dxDrawText("Uptime: "..timeString.." || FPS: "..fps.." || Ping: "..ping, 0 + 1, 0 - 1, (sX - 5) + 1, 16 - 1, tocolor(0, 0, 0, 255), 1, "default-bold", "right", "top", false, false, false, false, false)
-				dxDrawText("Uptime: "..timeString.." || FPS: "..fps.." || Ping: "..ping, 0 - 1, 0 + 1, (sX - 5) - 1, 16 + 1, tocolor(0, 0, 0, 255), 1, "default-bold", "right", "top", false, false, false, false, false)
-				dxDrawText("Uptime: "..timeString.." || FPS: "..fps.." || Ping: "..ping, 0 + 1, 0 + 1, (sX - 5) + 1, 16 + 1, tocolor(0, 0, 0, 255), 1, "default-bold", "right", "top", false, false, false, false, false)
-				dxDrawText("Uptime: "..timeString.." || FPS: "..fps.." || Ping: "..ping, 0, 0, (sX - 5), 16, tocolor(255, 255, 255, 255), 1, "default-bold", "right", "top", false, false, false, false, false)
+
+				dxDrawText("Uptime: "..timeString.." ─ FPS: "..fps.." ─ Ping: "..ping, 0 - 1, 0 - 1, (sX - 5) - 1, 16 - 1, tocolor(0, 0, 0, 255), 1, "default-bold", "right", "top", false, false, false, false, false)
+				dxDrawText("Uptime: "..timeString.." ─ FPS: "..fps.." ─ Ping: "..ping, 0 + 1, 0 - 1, (sX - 5) + 1, 16 - 1, tocolor(0, 0, 0, 255), 1, "default-bold", "right", "top", false, false, false, false, false)
+				dxDrawText("Uptime: "..timeString.." ─ FPS: "..fps.." ─ Ping: "..ping, 0 - 1, 0 + 1, (sX - 5) - 1, 16 + 1, tocolor(0, 0, 0, 255), 1, "default-bold", "right", "top", false, false, false, false, false)
+				dxDrawText("Uptime: "..timeString.." ─ FPS: "..fps.." ─ Ping: "..ping, 0 + 1, 0 + 1, (sX - 5) + 1, 16 + 1, tocolor(0, 0, 0, 255), 1, "default-bold", "right", "top", false, false, false, false, false)
+				dxDrawText("Uptime: "..timeString.." ─ FPS: "..fps.." ─ Ping: "..ping, 0, 0, (sX - 5), 16, tocolor(255, 255, 255, 255), 1, "default-bold", "right", "top", false, false, false, false, false)
 			end
 		end
 	end
diff --git a/UCDjobVehicles/client.lua b/UCDjobVehicles/client.lua
index 486ca69..09ef36a 100644
--- a/UCDjobVehicles/client.lua
+++ b/UCDjobVehicles/client.lua
@@ -2,12 +2,14 @@ local GUI = {}
 local _data
 local _marker
 local spawnerData = {}
+local sX, sY = guiGetScreenSize()
 
 GUI.window = guiCreateWindow(819, 448, 259, 256, "UCD | Jobs - Vehicles", false)
 GUI.window.sizeable = false
 GUI.window.visible = false
 GUI.window.alpha = 255
-exports.UCDutil:centerWindow(GUI.window)
+--exports.UCDutil:centerWindow(GUI.window)
+GUI.window:setPosition(sX - 259, (sY / 2) - (256 / 2), false)
 GUI.gridlist = guiCreateGridList(9, 26, 240, 182, false, GUI.window)
 guiGridListSetSortingEnabled(GUI.gridlist, false)
 guiGridListAddColumn(GUI.gridlist, "Vehicle", 0.9)
@@ -26,6 +28,26 @@ function init()
 		spawnerData[mkr] = {info.vt, info.rot, info.vehs, i}
 		addEventHandler("onClientMarkerHit", mkr, markerHit)
 		addEventHandler("onClientMarkerLeave", mkr, removeText)
+		
+		local msg = ""
+		
+		if (#info.vt == 0) then
+			msg = "Free Vehicles"
+		elseif (#info.vt > 1) then
+			-- Teams always go last in the vt
+			msg = tostring(info.vt[#info.vt]).." Vehicles"
+		else
+			msg = info.vt[1].." Vehicles"
+			
+			if (info.a == "s") then
+				msg = "Aviator Vehicles (Small)"
+			elseif (info.a == "h") then
+				msg = "Aviator Vehicles (Helicopters)"
+			elseif (info.a == "l") then
+				msg = "Aviator Vehicles (Large)"
+			end
+		end
+		mkr:setData("displayText", tostring(msg))
 	end
 end
 addEventHandler("onClientResourceStart", resourceRoot, init)
diff --git a/UCDjobVehicles/server.lua b/UCDjobVehicles/server.lua
index 3a6b57c..10587aa 100644
--- a/UCDjobVehicles/server.lua
+++ b/UCDjobVehicles/server.lua
@@ -1,4 +1,4 @@
-spawnerData = {} -- Table of spawner data
+-- spawnerData = {} -- Table of spawner data (because binds are easier)
 PJV = {} -- Table of player spawned vehicles
 
 -- Handled client-side for now (because binds are easier)
diff --git a/UCDjobVehicles/vehicleTable.lua b/UCDjobVehicles/vehicleTable.lua
index 26a70f9..7399404 100644
--- a/UCDjobVehicles/vehicleTable.lua
+++ b/UCDjobVehicles/vehicleTable.lua
@@ -33,35 +33,39 @@ jobVehicles =
 	{x = -2196.4719, y = -2304.1282, z = 30.625, rot = 321.9, vt = {}, colour = {r = 255, g = 255, b = 255}, vehs = {457, 481, 468}},
 	{x = 1238.2509, y = 335.6484, z = 19.7578, rot = 336.4438, vt = {}, colour = {r = 255, g = 255, b = 255}, vehs = {457, 481, 468}},
 	
-	-- Aviator
+	-- Aviator 
+	-- 		We have an 'a' value
+	-- 		a = l -> large
+	-- 		a = s -> smalll
+	-- 		a = h -> heli
 	-- Small planes (Beagle, Dodo, Shamal, Stuntplane)
-	{x = 1364.3641, y = 1756.73, z = 10.8203, rot = 270, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {511, 593, 513, 519}}, -- Las Venturas
-	{x = 1364.3641, y = 1714.88, z = 10.8203, rot = 270, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}}, -- Las Venturas
-	{x = 1677.8402, y = 1627.1708, z = 10.8203, rot = 180, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}}, -- Las Venturas
-	{x = 1609.5867, y = 1627.1708, z = 10.8203, rot = 180, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}}, -- Las Venturas
-	{x = 414.5836, y = 2503.1677, z = 16.4844, rot = 90, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}}, -- Verdant Meadows
-	{x = 382.5719, y = 2539.615, z = 16.5391, rot = 180, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}}, -- Verdant Meadows
-	{x = -1246.6765, y = -97.359, z = 14.1484, rot = 135, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}}, -- San Fierro
-	{x = -1207.1486, y = -145.5417, z = 14.1484, rot = 135, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}}, -- San Fierro
-	{x = -1272.3878, y = -618.8027, z = 14.1484, rot = 0, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}}, -- San Fierro
-	{x = -1334.7905, y = -619.1797, z = 14.1484, rot = 0, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}}, -- San Fierro
-	{x = -1397.5046, y = -619.4011, z = 14.1484, rot = 0, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}}, -- San Fierro
-	{x = -1459.6853, y = -620.0172, z = 14.1484, rot = 0, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}}, -- San Fierro
-	{x = 1986.1161, y = -2315.9116, z = 13.5469, rot = 90, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}}, -- Los Santos
-	{x = 1986.1161, y = -2382.366, z = 13.5469, rot = 90, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}}, -- Los Santos
+	{x = 1364.3641, y = 1756.73, z = 10.8203, rot = 270, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {511, 593, 513, 519}, a = "s"}, -- Las Venturas
+	{x = 1364.3641, y = 1714.88, z = 10.8203, rot = 270, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}, a = "s"}, -- Las Venturas
+	{x = 1677.8402, y = 1627.1708, z = 10.8203, rot = 180, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}, a = "s"}, -- Las Venturas
+	{x = 1609.5867, y = 1627.1708, z = 10.8203, rot = 180, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}, a = "s"}, -- Las Venturas
+	{x = 414.5836, y = 2503.1677, z = 16.4844, rot = 90, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}, a = "s"}, -- Verdant Meadows
+	{x = 382.5719, y = 2539.615, z = 16.5391, rot = 180, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}, a = "s"}, -- Verdant Meadows
+	{x = -1246.6765, y = -97.359, z = 14.1484, rot = 135, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}, a = "s"}, -- San Fierro
+	{x = -1207.1486, y = -145.5417, z = 14.1484, rot = 135, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}, a = "s"}, -- San Fierro
+	{x = -1272.3878, y = -618.8027, z = 14.1484, rot = 0, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}, a = "s"}, -- San Fierro
+	{x = -1334.7905, y = -619.1797, z = 14.1484, rot = 0, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}, a = "s"}, -- San Fierro
+	{x = -1397.5046, y = -619.4011, z = 14.1484, rot = 0, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}, a = "s"}, -- San Fierro
+	{x = -1459.6853, y = -620.0172, z = 14.1484, rot = 0, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}, a = "s"}, -- San Fierro
+	{x = 1986.1161, y = -2315.9116, z = 13.5469, rot = 90, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}, a = "s"}, -- Los Santos
+	{x = 1986.1161, y = -2382.366, z = 13.5469, rot = 90, vt = {"Aviator"}, colour = {r = 255,  g = 215, b = 0}, vehs = {511, 593, 513, 519}, a = "s"}, -- Los Santos
 	-- Heliopters (Maverick, Leviathan, Sparrow, Raindance, Cargobob)
-	{x = 1378.4188, y = 1770.0908, z = 10.8203, rot = 180, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {487, 417, 469, 563, 548}}, -- Las Venturas
-	{x = 1399.5907, y = 1770.0908, z = 10.8203, rot = 180, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {487, 417, 469, 563, 548}}, -- Las Venturas 
-	{x = -1250.0161, y = -33.7229, z = 14.1484, rot = 135, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {487, 417, 469, 563, 548}}, -- San Fierro
-	{x = 1765.7296, y = -2286.4512, z = 26.796, rot = 180, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {487, 417, 469, 563, 548}}, -- Los Santos
-	{x = 2010.6317, y = -2447.6052, z = 13.5469, rot = 180, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {487, 417, 469, 563, 548}}, -- Los Santos
+	{x = 1378.4188, y = 1770.0908, z = 10.8203, rot = 180, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {487, 417, 469, 563, 548}, a = "h"}, -- Las Venturas
+	{x = 1399.5907, y = 1770.0908, z = 10.8203, rot = 180, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {487, 417, 469, 563, 548}, a = "h"}, -- Las Venturas 
+	{x = -1250.0161, y = -33.7229, z = 14.1484, rot = 135, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {487, 417, 469, 563, 548}, a = "h"}, -- San Fierro
+	{x = 1765.7296, y = -2286.4512, z = 26.796, rot = 180, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {487, 417, 469, 563, 548}, a = "h"}, -- Los Santos
+	{x = 2010.6317, y = -2447.6052, z = 13.5469, rot = 180, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {487, 417, 469, 563, 548}, a = "h"}, -- Los Santos
 	-- Large planes (Nevada, Andromada, AT-400, Shamal)
-	{x = 1477.429, y = 1739.6221, z = 10.8125, rot = 180, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {553, 577, 592, 519}}, -- Las Venturas
-	{x = 1477.429, y = 1245.4187, z = 10.8125, rot = 0, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {553, 577, 592, 519}}, -- Las Venturas
-	{x = 1564.7855, y = 1283.6118, z = 10.8125, rot = 45, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {553, 577, 592, 519}}, -- Las Venturas
-	{x = -1323.0562, y = -208.1613, z = 14.1484, rot = 315, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {553, 577, 592, 519}}, -- San Fierro
-	{x = -1657.6765, y = -164.9684, z = 14.1484, rot = 315, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {553, 577, 592, 519}}, -- San Fierro
-	{x = 2113.0366, y = -2467.2312, z = 13.5469, rot = 180, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {553, 577, 592, 519}}, -- Los Santos
+	{x = 1477.429, y = 1739.6221, z = 10.8125, rot = 180, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {553, 577, 592, 519}, a = "l"}, -- Las Venturas 
+	{x = 1477.429, y = 1245.4187, z = 10.8125, rot = 0, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {553, 577, 592, 519}, a = "l"}, -- Las Venturas
+	{x = 1564.7855, y = 1283.6118, z = 10.8125, rot = 45, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {553, 577, 592, 519}, a = "l"}, -- Las Venturas
+	{x = -1323.0562, y = -208.1613, z = 14.1484, rot = 315, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {553, 577, 592, 519}, a = "l"}, -- San Fierro
+	{x = -1657.6765, y = -164.9684, z = 14.1484, rot = 315, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {553, 577, 592, 519}, a = "l"}, -- San Fierro
+	{x = 2113.0366, y = -2467.2312, z = 13.5469, rot = 180, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {553, 577, 592, 519}, a = "l"}, -- Los Santos
 	-- Complimentary vehicles (Tug, Baggage)
 	{x = 1443.3219, y = -2290.1899, z = 13.5469, rot = 90, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {485, 583}}, -- Outside LS interior entry
 	{x = 1443.3219, y = -2284.1802, z = 13.5469, rot = 90, vt = {"Aviator"}, colour = {r = 255, g = 215, b = 0}, vehs = {485, 583}}, -- Outside LS interior entry
@@ -114,18 +118,18 @@ jobVehicles =
 	{x = 2273.4031, y = 2460.9648, z = 10.8203, rot = 180, vt = {"Police Officer", "Law"}, colour = {r = 30, g = 144, b = 255}, vehs = {596, 597, 598, 599}},
 	{x = 2273.3943, y = 2443.0896, z = 10.8203, rot = 0, vt = {"Police Officer", "Law"}, colour = {r = 30, g = 144, b = 255}, vehs = {596, 597, 598, 599}},
 	{x = 2255.873, y = 2443.0896, z = 10.8203, rot = 0, vt = {"Police Officer", "Law"}, colour = {r = 30, g = 144, b = 255}, vehs = {596, 597, 598, 599}},
-	-- Paramedic, LS All Saint
+	-- Paramedic, LS All Saints
 	{x = 1180.4978, y = -1338.8416, z = 13.8005, rot = -90, vt = {"Paramedic"}, colour = {r = 0, g = 255, b = 255}, vehs = {416}},
 	{x = 1180.4978, y = -1308.5029, z = 13.8005, rot = -90, vt = {"Paramedic"}, colour = {r = 0, g = 255, b = 255}, vehs = {416}},
 	-- Paramedic, LS Jefferson
 	{x = 2032.86, y = -1446.4751, z = 17.2407, rot = 90, vt = {"Paramedic"}, colour = {r = 0, g = 255, b = 255}, vehs = {416}},
 	{x = 2002.0824, y = -1414.672, z = 16.9922, rot = 180, vt = {"Paramedic"}, colour = {r = 0, g = 255, b = 255}, vehs = {416}},
-	-- Paramedic, SF
+	-- Paramedic, San Fierro
 	{x = -2682.0452, y = 610.0144, z = 14.4531, rot = 180, vt = {"Paramedic"}, colour = {r = 0, g = 255, b = 255}, vehs = {416}},
 	{x = -2634.4585, y = 610.0144, z = 14.4531, rot = 180, vt = {"Paramedic"}, colour = {r = 0, g = 255, b = 255}, vehs = {416}},
 	-- Paramedic, Fort Carson
 	{x = -295.5605, y = 1044.6532, z = 19.5938, rot = 0.97, vt = {"Paramedic"}, colour = {r = 0, g = 255, b = 255}, vehs = {416}},
-	-- Paramedic, LV
+	-- Paramedic, Las Venturas
 	{x = 1624.7664, y = 1851.087, z = 10.8203, rot = 180, vt = {"Paramedic"}, colour = {r = 0, g = 255, b = 255}, vehs = {416}},
 	{x = 1590.7393, y = 1851.087, z = 10.8203, rot = 180, vt = {"Paramedic"}, colour = {r = 0, g = 255, b = 255}, vehs = {416}},
 	-- Paramedic, Montgomery
diff --git a/UCDjobs/employment.lua b/UCDjobs/employment.lua
new file mode 100644
index 0000000..dd7420b
--- /dev/null
+++ b/UCDjobs/employment.lua
@@ -0,0 +1,40 @@
+employment = {}
+local sX, sY = guiGetScreenSize()
+
+employment.window = GuiWindow(0, 0, 269, 80, "UCD | Employment", false)
+employment.window.sizeble = false
+employment.window.visible = false
+employment.window:setPosition(sX / 2 - 269 / 2, sY - 80, false, false)
+employment.toggle = GuiButton(9, 26, 120, 43, "Start/End Shift", false, employment.window)
+employment.quit = GuiButton(139, 26, 120, 43, "Quit Job", false, employment.window)
+
+function toggleGUI()
+	if (not exports.UCDaccounts:isPlayerLoggedIn(localPlayer)) then
+		return
+	end
+	employment.window.visible = not employment.window.visible
+	if (F5.window.visible and not employment.window.visible) then return end
+	showCursor(employment.window.visible)
+end
+addCommandHandler("jobgui", toggleGUI, false, false)
+addCommandHandler("jobsgui", toggleGUI, false, false)
+addCommandHandler("jobui", toggleGUI, false, false)
+addCommandHandler("jobsui", toggleGUI, false, false)
+bindKey("F3", "up", "jobgui")
+
+function forceClose()
+	employment.window.visible = false
+	showCursor(false)
+end
+addEvent("UCDjobs.forceClose", true)
+addEventHandler("UCDjobs.forceClose", root, forceClose)
+
+function onClick()
+	if (source == employment.toggle) then
+		triggerServerEvent("UCDjobs.onPlayerToggleShift", localPlayer)
+	else
+		exports.UCDutil:createConfirmationWindow("UCDjobs.onAttemptQuitJob", nil, true, "Quit Job?", "Are you sure you want to quit your job?")
+	end
+end
+addEventHandler("onClientGUIClick", employment.toggle, onClick, false)
+addEventHandler("onClientGUIClick", employment.quit, onClick, false)
diff --git a/UCDjobs/employment_s.lua b/UCDjobs/employment_s.lua
new file mode 100644
index 0000000..ba6eb6a
--- /dev/null
+++ b/UCDjobs/employment_s.lua
@@ -0,0 +1,58 @@
+local vowels = {a = true, e = true, i = true, o = true, u = true}
+local disallowedOffShift = {["Criminal"] = true, ["Gangster"] = true, ["Unoccupied"] = true} -- Add more at will
+local offShift = {}
+
+function onPlayerToggleShift()
+	if (source and source.type == "player" and exports.UCDaccounts:isPlayerLoggedIn(source)) then
+		if (not exports.UCDchecking:canPlayerDoAction(source, "EndShift")) then
+			return false
+		end
+		
+		local account = source.account.name
+		if (offShift[account]) then
+			-- They are off shift already
+			local data = offShift[account]
+			setPlayerJob(source, data, exports.UCDaccounts:GAD(account, "jobModel"))
+			data = nil
+			offShift[account] = nil
+		else
+			-- Need to check if they're allowed to go off-shift
+			local jobCurr = getPlayerJob(source)
+			if (disallowedOffShift[jobCurr]) then
+				exports.UCDdx:new(source, "You are not allowed to end your shift in this job/occupation", 255, 0, 0)
+				return false
+			end
+			offShift[account] = jobCurr
+			local k = setPlayerJob(source, "Unoccupied")
+		end
+	end
+end
+addEvent("UCDjobs.onPlayerToggleShift", true)
+addEventHandler("UCDjobs.onPlayerToggleShift", root, onPlayerToggleShift)
+
+function onAttemptQuitJob()
+	if (source and source.type == "player" and exports.UCDaccounts:isPlayerLoggedIn(source)) then
+		if (not exports.UCDchecking:canPlayerDoAction(source, "QuitJob")) then
+			return false
+		end
+		local jobCurr = getPlayerJob(source)
+		if (not jobCurr or jobCurr == "") then
+			jobCurr = "Unemployed"
+		end
+		
+		local article = "a"
+		if (vowels[jobCurr:lower():sub(1, 1)]) then
+			article = "an"
+		end
+		
+		local jobSet = setPlayerJob(source, "") -- Set them to no job
+		if (not jobSet) then
+			exports.UCDdx:new(source, "Could not quit job", 255, 0, 0)
+			return false
+		end
+		exports.UCDdx:new(source, "You have quit your job as "..tostring(article).." "..tostring(jobCurr), 255, 0, 0)
+	end
+	triggerLatentClientEvent(source, "UCDjobs.forceClose", source)
+end
+addEvent("UCDjobs.onAttemptQuitJob", true)
+addEventHandler("UCDjobs.onAttemptQuitJob", root, onAttemptQuitJob)
\ No newline at end of file
diff --git a/UCDjobs/f5.lua b/UCDjobs/f5.lua
index bd28e9e..a8119e0 100644
--- a/UCDjobs/f5.lua
+++ b/UCDjobs/f5.lua
@@ -1,4 +1,4 @@
-local F5 = {label = {}}
+F5 = {label = {}}
 local jobs = exports.UCDjobsTable:getJobTable()
 local sX, sY = guiGetScreenSize()
 
@@ -31,7 +31,6 @@ guiProgressBarSetProgress(F5.progressbar, 100)
 F5.label["prog"] = GuiLabel(9, 83, 282, 23, "130/240", false, F5.window)
 guiLabelSetHorizontalAlign(F5.label["prog"], "center", true)
 guiLabelSetVerticalAlign(F5.label["prog"], "center")
-guiLabelSetColor(F5.label["prog"], 0, 0, 0)
 
 function togglePanel(data)
 	if (not exports.UCDaccounts:isPlayerLoggedIn(localPlayer)) then return end
@@ -67,6 +66,7 @@ function togglePanel(data)
 	else
 		if (F5.window.visible) then
 			F5.window.visible = false
+			if (employment.window.visible) then return end
 			showCursor(false)
 		else
 			local jobName = localPlayer:getData("Occupation") or ""
diff --git a/UCDjobs/meta.xml b/UCDjobs/meta.xml
index 5a41f51..fccca07 100644
--- a/UCDjobs/meta.xml
+++ b/UCDjobs/meta.xml
@@ -1 +1 @@
-<meta>
	<min_mta_version server="1.5.2" client="1.5.2"/>
	<include resource="UCDjobsTable"/>
	<script src="jobs.lua" type="client"/>
	<script src="f5.lua" type="client"/>
	<script src="f5_s.lua" type="server"/>
	<script src="server.lua" type="server"/>
	
	<script src="exports_s.lua" type="server"/>
	<script src="exports.lua" type="client"/>
	
	<export function="setPlayerJob" type="server"/>
	<export function="getPlayerJob" type="server"/>
	<export function="isPlayerOnDuty" type="server"/>
	<export function="getPlayerJobRank" type="server"/>
	<export function="getPlayerJobData" type="server"/>
	
	<oop>true</oop>
</meta>
\ No newline at end of file
+<meta>
	<min_mta_version server="1.5.2" client="1.5.2"/>
	<include resource="UCDjobsTable"/>
	<script src="jobs.lua" type="client"/>
	<script src="f5.lua" type="client"/>
	<script src="f5_s.lua" type="server"/>
	<script src="server.lua" type="server"/>
	<script src="employment_s.lua" type="server"/>
	<script src="employment.lua" type="client"/>
	
	<script src="exports_s.lua" type="server"/>
	<script src="exports.lua" type="client"/>
	
	<export function="setPlayerJob" type="server"/>
	<export function="getPlayerJob" type="server"/>
	<export function="isPlayerOnDuty" type="server"/>
	<export function="getPlayerJobRank" type="server"/>
	<export function="getPlayerJobData" type="server"/>
	
	<oop>true</oop>
</meta>
\ No newline at end of file
diff --git a/UCDjobs/server.lua b/UCDjobs/server.lua
index 2a76c36..b319a29 100644
--- a/UCDjobs/server.lua
+++ b/UCDjobs/server.lua
@@ -67,6 +67,7 @@ function setPlayerJob(plr, jobName, skinID)
 	if (skinID and skinID ~= plr.model) then
 		-- Model
 		plr:setModel(skinID)
+		if (jobName == "Unoccupied") then return end
 		exports.UCDaccounts:SAD(plr, "jobModel", skinID)
 	else
 		--local _s = exports.UCDaccounts:GAD(plr, "model")
@@ -81,6 +82,7 @@ function setPlayerJob(plr, jobName, skinID)
 	local oldJob = plr:getData("Occupation")
 	-- Element data
 	plr:setData("Occupation", jobName)
+	plr:setData("job", jobName)
 	
 	-- Server event
 	triggerEvent("onPlayerGetJob", plr, jobName, oldJob)
diff --git a/UCDjobsTable/jobsTable.lua b/UCDjobsTable/jobsTable.lua
index 89d0627..a8eca39 100644
--- a/UCDjobsTable/jobsTable.lua
+++ b/UCDjobsTable/jobsTable.lua
@@ -13,6 +13,10 @@ local jobsTable =
 	{
 		team = "Citizens",
 	},
+	["Unoccupied"] = 
+	{
+		team = "Unoccupied",
+	},
 	
 	-- Proper jobs
 	["Aviator"] = 
@@ -142,7 +146,7 @@ local jobsTable =
 		markers = 
 		{
 			{x = 248.9846, y = 67.7826, z = 1003.6406, interior = 6, dimension = 50000}, -- LSPD
-			{x = -1615.7192, y = 685.8612, z = 7.1875, interior = 0, dimension = 0},-- SFPD (temp)
+			{x = -1615.7192, y = 685.8612, z = 7.1875, interior = 0, dimension = 0}, -- SFPD (temp)
 		},
 		skins = 
 		{
@@ -154,7 +158,7 @@ local jobsTable =
 		},
 		colour = {r = 30, g = 144, b = 255},
 		blipID = 56,
-		desc = "da popo fuark",
+		desc = "A police officer's job is to keep the law. Stop the crime at all costs. Police officers must keep citizens safe and comfortable. Police officers' job must not damage any citizen -no matter how big the damage is-. Easy in, easy out.",
 	},
 	["Traffic Officer"] = 
 	{
@@ -170,7 +174,7 @@ local jobsTable =
 		},
 		colour = {r = 30, g = 144, b = 255},
 		blipID = nil,
-		desc = "traffic gonna get fuked lol",
+		desc = "A traffic officer's job is to make sure there are no traffic rules being broken. Hunt traffic rule breakers. Take them out -eliminate- if needed.",
 	},
 	["Detective"] = 
 	{
@@ -187,7 +191,7 @@ local jobsTable =
 		},
 		colour = {r = 30, g = 144, b = 255},
 		blipID = nil,
-		desc = "detectivate some niggas lmao",
+		desc = "A detective's job is to investigate cases. Detect the criminal, you must be focused and clever. With the help of forensic medicine, your job is to know the criminal with evidences.",
 	},
 }
 
@@ -237,6 +241,10 @@ function getJobRanks(jobName)
 	return jobsRanks[jobName]
 end
 
+function getJobsRanks()
+	return jobsRanks
+end
+
 -- If certain jobs only have vehicles with a certain colour
 local vehicleColours = 
 {
diff --git a/UCDjobsTable/meta.xml b/UCDjobsTable/meta.xml
index 9ead81b..e398cda 100644
--- a/UCDjobsTable/meta.xml
+++ b/UCDjobsTable/meta.xml
@@ -1,3 +1,3 @@
 <meta>
	<min_mta_version server="1.5.1" client="1.5.1"/>
 	<info author="Noki" description="" type="script" version="1" />
-	<script src="jobsTable.lua" type="shared" />
	<export function="getJobTable" type="shared"/>
	<export function="getJobRanks" type="shared"/>
	<export function="getRestricedVehicles" type="shared"/>
	<export function="getVehicleColours" type="shared"/>
</meta>
\ No newline at end of file
+	<script src="jobsTable.lua" type="shared" />
	<export function="getJobTable" type="shared"/>
	<export function="getJobRanks" type="shared"/>
	<export function="getJobsRanks" type="shared"/>
	<export function="getRestricedVehicles" type="shared"/>
	<export function="getVehicleColours" type="shared"/>
</meta>
\ No newline at end of file
diff --git a/UCDlogging/client.lua b/UCDlogging/client.lua
deleted file mode 100644
index 6677d19..0000000
--- a/UCDlogging/client.lua
+++ /dev/null
@@ -1,62 +0,0 @@
-local sX, sY = guiGetScreenSize()
-local window = GuiWindow(0, (sY * 0.39833334088326), sX, sY, "UCD | Logging", false)
-window:setSize(sX, (sY - (sY * 0.39833334088326)), false)
-window.visible = false
-local list = GuiGridList(0, 20, sX, sY, false, window)
-list.sortingEnabled = false
-list:addColumn("Name", 0.1)
-list:addColumn("Account", 0.05)
-list:addColumn("Action", 0.25+0.21)
-list:addColumn("Date", 0.08)
-list:addColumn("Type 1", 0.05)
-list:addColumn("Type 2", 0.05)
-list:addColumn("Serial", 0.18)
-
-function table.reverse(t)
-    local reversedTable = {}
-    local itemCount = #t
-    for k, v in ipairs(t) do
-        reversedTable[itemCount + 1 - k] = v
-    end
-    return reversedTable
-end
-
-function formatTick(tick)
-	tick = getRealTime(tonumber(tick))
-	return string.format("%02d:%02d:%02d - %02d/%02d/%04d",
-		tick.second,
-		tick.minute,
-		tick.hour,
-		tick.monthday,
-		tick.month + 1,
-		tick.year + 1900
-	)
-end
-
-function logsView(logs)
-	list:clear()
-	logs = table.reverse(logs)
-	for _, log in ipairs(logs) do
-		for k, v in pairs(log) do
-			log[k] = tostring(v)
-		end
-		local row = list:addRow()
-		list:setItemText(row, 1, log.name, false, false)
-		list:setItemText(row, 2, log.acc, false, false)
-		list:setItemText(row, 3, log.action, false, false)
-		list:setItemText(row, 4, formatTick(log.tick), false, false)
-		list:setItemText(row, 5, log.type, false, false)
-		list:setItemText(row, 6, log.type2, false, false)
-		list:setItemText(row, 7, log.serial, false, false)
-	end
-end
-addEvent("logsView", true)
-addEventHandler("logsView", resourceRoot, logsView)
-
-addCommandHandler("logs",
-	function ()
-		if (localPlayer.name == "[UCD]Risk" or localPlayer.name == "[UCD]Hans") then
-			window.visible = not window.visible
-		end
-	end
-)
\ No newline at end of file
diff --git a/UCDlogging/meta.xml b/UCDlogging/meta.xml
index 492b695..02fcd35 100644
--- a/UCDlogging/meta.xml
+++ b/UCDlogging/meta.xml
@@ -1,3 +1,3 @@
 <meta>
	<min_mta_version server="1.5" client="1.5"/>
 	<info author="Noki" description="Logging system" type="script" version="1" />
	
-	<script src="logging.slua" type="server"/>
	<export function="new" type="server" />
	<export function="adminLog" type="server" />
	<script src="client.lua" type="client"/>
	
	<oop>true</oop>
</meta>
\ No newline at end of file
+	<script src="logging.slua" type="server"/>
	<export function="new" type="server" />
	<export function="adminLog" type="server" />
	
	<oop>true</oop>
</meta>
\ No newline at end of file
diff --git a/UCDmafiaWars/LV/server.lua b/UCDmafiaWars/LV/server.lua
index 2861c36..06ed154 100644
--- a/UCDmafiaWars/LV/server.lua
+++ b/UCDmafiaWars/LV/server.lua
@@ -2,7 +2,7 @@ addEventHandler("onColShapeHit", LV,
 	function (ele, matchingDimension)
 		if (not ele or not isElement(ele)) then return end
 		if (ele.type == "player" and matchingDimension) then
-			outputDebugString("Entered LV")
+			--outputDebugString("Entered LV")
 			triggerEvent("onPlayerEnterLV", ele)
 		end
 	end
@@ -12,7 +12,7 @@ addEventHandler("onColShapeLeave", LV,
 	function (ele, matchingDimension)
 		if (not ele) then return end
 		if (ele.type == "player" and matchingDimension) then
-			outputDebugString("Left LV")
+			--outputDebugString("Left LV")
 			triggerEvent("onPlayerLeaveLV", ele)
 		end
 	end
diff --git a/UCDmafiaWars/server.lua b/UCDmafiaWars/server.lua
index 3728170..12c8861 100644
--- a/UCDmafiaWars/server.lua
+++ b/UCDmafiaWars/server.lua
@@ -59,27 +59,30 @@ db = exports.UCDsql:getConnection()
 
 addEventHandler("onResourceStart", resourceRoot,
 	function ()
-		--for turfID, v in ipairs(turfCoordinates) do
-		local result = db:query("SELECT * FROM turfing"):poll(-1)
-		for turfID, v in ipairs(result) do
-			--db:exec("UPDATE turfing SET x = ?, y = ?, z = ?, w = ?, l = ?, h = ? WHERE turfID = ?", v.x, v.y, v.z, v.w, v.l, v.h, turfID)
-			local col = createColCuboid(v.x, v.y, v.z, v.w, v.l, v.h)
-			provoking[col] = {}
-			level[col] = {}
-			
-			level[col][v.owner] = 100
-			col:setData("turfOwner", v.owner)
-			
-			idToCol[turfID] = col
-			colToArea[col] = createRadarArea(v.x, v.y, v.w, v.l, 255, 255, 255, 175)
-			col:setData("id", turfID)
-			addEventHandler("onColShapeHit", col, onEnterTurf)
-			addEventHandler("onColShapeLeave", col, onExitTurf)
-		end
-		Timer(corrections, 1000, 0)
+		db:query(cacheTurfs, {}, "SELECT * FROM turfing")
 	end
 )
 
+function cacheTurfs(qh)
+	local result = qh:poll(0)
+	for turfID, v in ipairs(result) do
+		--db:exec("UPDATE turfing SET x = ?, y = ?, z = ?, w = ?, l = ?, h = ? WHERE turfID = ?", v.x, v.y, v.z, v.w, v.l, v.h, turfID)
+		local col = createColCuboid(v.x, v.y, v.z, v.w, v.l, v.h)
+		provoking[col] = {}
+		level[col] = {}
+		
+		level[col][v.owner] = 100
+		col:setData("turfOwner", v.owner)
+		
+		idToCol[turfID] = col
+		colToArea[col] = createRadarArea(v.x, v.y, v.w, v.l, 255, 255, 255, 175)
+		col:setData("id", turfID)
+		addEventHandler("onColShapeHit", col, onEnterTurf)
+		addEventHandler("onColShapeLeave", col, onExitTurf)
+	end
+	Timer(corrections, 5000, 0)
+end
+
 function getGroupTurfs(groupName)
 	local temp = {}
 	for _, col in pairs(idToCol) do
diff --git a/UCDmechanic/mechanic.slua b/UCDmechanic/mechanic.slua
index 706a4c5..9ecae85 100644
--- a/UCDmechanic/mechanic.slua
+++ b/UCDmechanic/mechanic.slua
@@ -1,102 +1,104 @@
-function isMechInRange(mech, vehicle, range)
-	local dist = Vector3(vehicle.position - mech.position):getLength()
-	if (dist > range) then
-		return false
-	end
-	return true
-end
-
-function requestRepair(vehicle, owner)
-	if (not exports.UCDchecking:canPlayerDoAction(client, "RepairVehicle")) then
-		return
-	end
-	if (client.team.name ~= "Citizens" or client:getData("Occupation") ~= "Mechanic") then
-		return
-	end
-	if (math.floor(vehicle.health / 10) == 100) then
-		exports.UCDdx:new(client, "This vehicle does not need to be repaired", 255, 0, 0)
-		return
-	end
-	if (vehicle.interior ~= client.interior or vehicle.dimension ~= client.dimension) then
-		return
-	end
-	if (owner and isElement(owner) and owner.type == "player") then
-		if (owner == client) then
-			triggerEvent("UCDmechanic.repair", resourceRoot, vehicle, client, owner)
-			return
-		end
-		triggerClientEvent(owner, "UCDmechanic.authenticateRepair", owner, vehicle, client)
-		--outputDebugString("sending auth client side to "..owner.name)
-	else
-		triggerEvent("UCDmechanic.repair", resourceRoot, vehicle, client)
-		--outputDebugString("2nd option")
-	end
-end
-addEvent("UCDmechanic.requestRepair", true)
-addEventHandler("UCDmechanic.requestRepair", root, requestRepair)
-
-function onDeclineRequest(mech)
-	outputDebugString("mech - "..tostring(mech.type).." "..tostring(mech.name))
-	exports.UCDdx:new(mech, client.name.." has declined your request to repair their vehicle", 255, 0, 0)
-end
-addEvent("UCDmechanic.onDeclineRequest", true)
-addEventHandler("UCDmechanic.onDeclineRequest", root, onDeclineRequest)
-
-function onStartRepair(vehicle, mech, owner)
-	if (vehicle and mech) then
-		if (mech.team.name ~= "Citizens" or mech:getData("Occupation") ~= "Mechanic") then
-			return
-		end
-		if (not isMechInRange(mech, vehicle, 5)) then
-			exports.UCDdx:new(mech, "This vehicle is too far away to be repaired", 255, 0, 0)
-			return
-		end
-		vehicle.frozen = true
-		mech.frozen = true
-		exports.UCDactions:setAction(mech, "RepairVehicle")
-		exports.UCDdx:new(mech, "Wait 10 seconds while this vehicle gets repaired", 0, 255, 255)
-		mech:setAnimation("MISC", "Plunger_01", -1, true, false, false)
-		Timer(
-			function (mech, vehicle)
-				mech.frozen = false
-				vehicle.frozen = false
-				mech:setAnimation(false)
-			end, 10000, 1, mech, vehicle
-		)
-		Timer(onFinishRepair, 10050, 1, vehicle, mech, owner)
-	end
-end
-addEvent("UCDmechanic.onStartRepair", true)
-addEventHandler("UCDmechanic.onStartRepair", root, onStartRepair)
-
-function onFinishRepair(vehicle, mech, owner)
-	exports.UCDactions:clearAction(mech)
-	--outputDebugString("health = "..tostring(math.floor(vehicle.health / 10)))
-	if (not vehicle or not isElement(vehicle) or not isMechInRange(mech, vehicle, 5)) then
-		exports.UCDdx:new(mech, "Couldn't finish reparing the vehicle", 255, 0, 0)
-		return
-	end
-	if (not client) then client = mech end
-	if (client.team.name ~= "Citizens" or client:getData("Occupation") ~= "Mechanic") then
-		return
-	end
-	local amount = math.random(400, 800)
-	if (owner and isElement(owner) and mech ~= owner) then
-		if (owner.money < amount) then
-			exports.UCDdx:new(owner, "You don't have enough money to have this vehicle repaired ($"..amount..")", 255, 0, 0)
-			return
-		end
-		owner.money = owner.money - amount
-		exports.UCDdx:new(owner, "You have paid $"..tostring(exports.UCDutil:tocomma(amount + 250)).." for "..mech.name.." to repair your "..vehicle.name, 255, 0, 0)
-	end
-	if (mech ~= owner) then
-		mech.money = mech.money + (amount + 250)
-		exports.UCDdx:new(mech, "You have been paid $"..tostring(exports.UCDutil:tocomma(amount + 250)).." for reparing that "..vehicle.name, 255, 0, 0)
-	else
-		mech.money = mech.money - amount
-		exports.UCDdx:new(mech, "You have paid $"..tostring(exports.UCDutil:tocomma(amount + 250)).." for reparing your "..vehicle.name, 255, 0, 0)
-	end
-	exports.UCDvehicles:fix(vehicle)
-end
-addEvent("UCDmechanic.onFinishRepair", true)
-addEventHandler("UCDmechanic.onFinishRepair", root, onFinishRepair)
+function isMechInRange(mech, vehicle, range)
+	local dist = Vector3(vehicle.position - mech.position):getLength()
+	if (dist > range) then
+		return false
+	end
+	return true
+end
+
+function requestRepair(vehicle, owner)
+	if (not exports.UCDchecking:canPlayerDoAction(client, "RepairVehicle")) then
+		return
+	end
+	if (client.team.name ~= "Citizens" or client:getData("Occupation") ~= "Mechanic") then
+		return
+	end
+	if (math.floor(vehicle.health / 10) == 100) then
+		exports.UCDdx:new(client, "This vehicle does not need to be repaired", 255, 0, 0)
+		return
+	end
+	if (vehicle.interior ~= client.interior or vehicle.dimension ~= client.dimension) then
+		return
+	end
+	if (owner and isElement(owner) and owner.type == "player") then
+		if (owner == client) then
+			triggerEvent("UCDmechanic.onStartRepair", resourceRoot, vehicle, client, owner)
+			return
+		end
+		triggerClientEvent(owner, "UCDmechanic.authenticateRepair", owner, vehicle, client)
+		--outputDebugString("sending auth client side to "..owner.name)
+	else
+		triggerEvent("UCDmechanic.onStartRepair", resourceRoot, vehicle, client)
+		--outputDebugString("2nd option")
+	end
+end
+addEvent("UCDmechanic.requestRepair", true)
+addEventHandler("UCDmechanic.requestRepair", root, requestRepair)
+
+function onDeclineRequest(mech)
+	outputDebugString("mech - "..tostring(mech.type).." "..tostring(mech.name))
+	exports.UCDdx:new(mech, client.name.." has declined your request to repair their vehicle", 255, 0, 0)
+end
+addEvent("UCDmechanic.onDeclineRequest", true)
+addEventHandler("UCDmechanic.onDeclineRequest", root, onDeclineRequest)
+
+function onStartRepair(vehicle, mech, owner)
+	if (vehicle and mech) then
+		if (mech.team.name ~= "Citizens" or mech:getData("Occupation") ~= "Mechanic") then
+			return
+		end
+		if (not isMechInRange(mech, vehicle, 5)) then
+			exports.UCDdx:new(mech, "This vehicle is too far away to be repaired", 255, 0, 0)
+			return
+		end
+		vehicle.frozen = true
+		mech.frozen = true
+		exports.UCDactions:setAction(mech, "RepairVehicle")
+		exports.UCDdx:new(mech, "Wait 10 seconds while this vehicle gets repaired", 0, 255, 255)
+		mech:setAnimation("MISC", "Plunger_01", -1, true, false, false)
+		Timer(
+			function (mech, vehicle)
+				mech.frozen = false
+				vehicle.frozen = false
+				mech:setAnimation(false)
+			end, 10000, 1, mech, vehicle
+		)
+		Timer(onFinishRepair, 10050, 1, vehicle, mech, owner)
+	end
+end
+addEvent("UCDmechanic.onStartRepair", true)
+addEventHandler("UCDmechanic.onStartRepair", root, onStartRepair)
+
+function onFinishRepair(vehicle, mech, owner)
+	exports.UCDactions:clearAction(mech)
+	--outputDebugString("health = "..tostring(math.floor(vehicle.health / 10)))
+	if (not vehicle or not isElement(vehicle) or not isMechInRange(mech, vehicle, 5)) then
+		exports.UCDdx:new(mech, "Couldn't finish reparing the vehicle", 255, 0, 0)
+		return
+	end
+	if (not client) then
+		client = mech
+	end
+	if (client.team.name ~= "Citizens" or client:getData("Occupation") ~= "Mechanic") then
+		return
+	end
+	local amount = math.random(400, 800)
+	if (owner and isElement(owner) and mech ~= owner) then
+		if (owner.money < amount) then
+			exports.UCDdx:new(owner, "You don't have enough money to have this vehicle repaired ($"..amount..")", 255, 0, 0)
+			return
+		end
+		owner.money = owner.money - amount
+		exports.UCDdx:new(owner, "You have paid $"..tostring(exports.UCDutil:tocomma(amount + 250)).." for "..mech.name.." to repair your "..vehicle.name, 255, 0, 0)
+	end
+	if (mech ~= owner) then
+		mech.money = mech.money + (amount + 250)
+		exports.UCDdx:new(mech, "You have been paid $"..tostring(exports.UCDutil:tocomma(amount + 250)).." for reparing that "..vehicle.name, 255, 0, 0)
+	else
+		mech.money = mech.money - amount
+		exports.UCDdx:new(mech, "You have paid $"..tostring(exports.UCDutil:tocomma(amount + 250)).." for reparing your "..vehicle.name, 255, 0, 0)
+	end
+	exports.UCDvehicles:fix(vehicle)
+end
+addEvent("UCDmechanic.onFinishRepair", true)
+addEventHandler("UCDmechanic.onFinishRepair", root, onFinishRepair)
diff --git a/UCDmisc/server.lua b/UCDmisc/server.lua
index a875c5e..36b902d 100644
--- a/UCDmisc/server.lua
+++ b/UCDmisc/server.lua
@@ -17,17 +17,17 @@ function eject(plr, _, plr2)
 			if (occupants) then
 				for _, plr2 in ipairs(plr.vehicle.occupants) do
 					plr2:removeFromVehicle(plr.vehicle)
-					exports.UCDdx:new(plr2, "You got ejected from the vehicle by "..plr.name, 255, 0, 0)
+					exports.UCDdx:new(plr2, "You got ejected from the vehicle by "..tostring(plr.name), 255, 0, 0)
 				end
-				exports.UCDdx:new(plr, "You ejected all players inside your vehicle", 0, 255, 0)
+				exports.UCDdx:new(plr, "You have ejected all players inside your vehicle", 0, 255, 0)
 			end
 		elseif (tostring(plr2)) then
 			local plr2 = getPlayerFromPartialName(plr2)
 			if (isElement(plr2)) then
 				if (plr2.vehicle == plr.vehicle) then
 					plr2:removeFromVehicle(plr.vehicle)
-					exports.UCDdx:new(plr2, "You got ejected from the vehicle by "..plr.name, 255, 0, 0)
-					exports.UCDdx:new(plr, "You ejected "..plr2.name.." from the vehicle", 0, 255, 0)
+					exports.UCDdx:new(plr2, "You got ejected from the vehicle by "..tostring(plr.name), 255, 0, 0)
+					exports.UCDdx:new(plr, "You have ejected "..tostring(plr2.name).." from the vehicle", 0, 255, 0)
 				end
 			end
 		end
diff --git a/UCDmoney/client.lua b/UCDmoney/client.lua
index 09810e7..eaeca50 100644
--- a/UCDmoney/client.lua
+++ b/UCDmoney/client.lua
@@ -2,7 +2,7 @@ local data = {}
 local disappearTime = 10000
 
 function foo()
-	if (not exports.UCDaccounts or not exports.UCDaccounts:isPlayerLoggedIn(localPlayer)) then
+	if (not Resource.getFromName("UCDaccounts") or not exports.UCDaccounts or not exports.UCDaccounts:isPlayerLoggedIn(localPlayer)) then
 		return false
 	end
 	
@@ -16,7 +16,7 @@ end
 addEventHandler("onClientPreRender", root, foo)
 
 function hasPlayerMoneyChanged()
-	if (not exports.UCDaccounts or not exports.UCDaccounts:isPlayerLoggedIn(localPlayer)) then
+	if (not Resource.getFromName("UCDaccounts") or not exports.UCDaccounts or not exports.UCDaccounts:isPlayerLoggedIn(localPlayer)) then
 		return false
 	end
 	
diff --git a/UCDphone/apps/anims/anims_c.lua b/UCDphone/apps/anims/anims_c.lua
new file mode 100644
index 0000000..f3fd4a8
--- /dev/null
+++ b/UCDphone/apps/anims/anims_c.lua
@@ -0,0 +1,121 @@
+Anims = {}
+Anims.open = false
+
+local animsTable =
+	-- ["Category"] = {["Name"] = {"blockname", "animname"}}
+{
+	["Carry"] =
+	{
+		["Carry partial"] = {"carry", "crry_prtial"},
+	},
+	["Pull"] =
+	{
+		["Pull upleft"] = {"airport", "thrw_barl_thrw"},
+	},
+}
+
+function Anims.create()
+	phone.anims = {button = {}}
+	
+	phone.anims.gridlist = GuiGridList(19, 90, 272, 355, false, phone.image["phone_window"])
+	phone.anims.gridlist.sortingEnabled = false
+	phone.anims.gridlist:addColumn("Animation/category name", 0.94)
+	for category, anims in pairs(animsTable) do
+		phone.anims.gridlist:setItemText(phone.anims.gridlist:addRow(), 1, category, true, false)
+		for name, data in pairs(anims) do
+			local row = phone.anims.gridlist:addRow()
+			phone.anims.gridlist:setItemText(row, 1, name, false, false)
+			phone.anims.gridlist:setItemData(row, 1, data[1].." "..data[2], false, false)
+		end
+	end
+	
+	phone.anims.button["do"] = GuiButton(19, 450, 272, 35, "Do animation", false, phone.image["phone_window"])
+	
+	phone.anims.button["stop"] = GuiButton(19, 490, 272, 35, "Stop animation", false, phone.image["phone_window"])
+	
+	Anims.all = {phone.anims.gridlist, phone.anims.button["do"], phone.anims.button["stop"]}
+	
+	for _, gui in pairs(Anims.all) do
+		gui.visible = false
+	end
+end
+Anims.create()
+
+function Anims.toggle()
+	for _, gui in pairs(Anims.all) do
+		gui.visible = not gui.visible
+		Anims.open = gui.visible
+	end
+end
+
+function Anims.perform(anim, block)
+	if (not localPlayer.onGround or localPlayer.inWater or localPlayer:getData("a") == "HouseRob") then
+		return false
+	end
+	if (not anim) then
+		local block, anim = localPlayer:getAnimation()
+		for category, anims in pairs(animsTable) do
+			for name, data in pairs(anims) do
+				if (data[1] == block and data[2] == anim) then
+					triggerServerEvent("onPlayerPerformAnimation", resourceRoot)
+					break
+				end
+			end
+		end
+		return false
+	end
+	triggerServerEvent("onPlayerPerformAnimation", resourceRoot, anim, block)
+end
+
+function Anims.cmd(cmd)
+	-- /stopanim(performing)
+	if (cmd == "stopanim") then
+		Anims.perform()
+	end
+	-- Anims with cmds(performing)
+	for category, anims in pairs(animsTable) do
+		for name, data in pairs(anims) do
+			if (name:gsub(" ", ""):lower() == cmd) then
+				Anims.perform(data[1], data[2])
+			end
+		end
+	end
+end
+
+function Anims.cmds()
+	-- /stopanim(adding command)
+	addCommandHandler("stopanim", Anims.cmd)
+	-- Anims with cmds(adding commands)
+	for category, anims in pairs(animsTable) do
+		for name, data in pairs(anims) do
+			addCommandHandler(name:lower():gsub(" ", ""), Anims.cmd)
+		end
+	end
+end
+Anims.cmds()
+
+Anims["do"] = function(button)
+	if (source ~= phone.anims.button["do"] or button ~= "left") then
+		return false
+	end
+	if (not localPlayer:getAnimation()) then
+		local row = phone.anims.gridlist:getSelectedItem()
+		if (not row or row == -1) then
+			return false
+		end
+		local str = split(phone.anims.gridlist:getItemData(row, 1), " ")
+		local block, anim = str[1], str[2]
+		Anims.perform(block, anim)
+	end
+end
+addEventHandler("onClientGUIClick", phone.anims.button["do"], Anims["do"])
+
+function Anims.stop(button)
+	if (source ~= phone.anims.button["stop"] or button ~= "left") then
+		return false
+	end
+	if (localPlayer:getAnimation()) then
+		Anims.perform()
+	end
+end
+addEventHandler("onClientGUIClick", phone.anims.button["stop"], Anims.stop)
\ No newline at end of file
diff --git a/UCDphone/apps/anims/anims_s.lua b/UCDphone/apps/anims/anims_s.lua
new file mode 100644
index 0000000..a76d749
--- /dev/null
+++ b/UCDphone/apps/anims/anims_s.lua
@@ -0,0 +1,8 @@
+function doAnim(block, anim)
+	if (not exports.UCDchecking:canPlayerDoAction(client, "DoAnim")) then
+		return false
+	end
+	client:setAnimation(block, anim)
+end
+addEvent("onPlayerPerformAnimation", true)
+addEventHandler("onPlayerPerformAnimation", resourceRoot, doAnim)
\ No newline at end of file
diff --git a/UCDphone/apps/apps.lua b/UCDphone/apps/apps.lua
index 5aea762..3e52bef 100644
--- a/UCDphone/apps/apps.lua
+++ b/UCDphone/apps/apps.lua
@@ -3,13 +3,17 @@ allapps =
 	[1] = IM,
 	[2] = Music,
 	[3] = Browser,
+	[4] = Settings,
 	[5] = Notes,
 	[6] = Clock,
 	[9] = Money,
 	[10] = Mark,
 	[11] = Weather,
 	[12] = Stocks,
+	[13] = Housing,
 	[14] = Friends,
+	[15] = Mail,
+	[16] = Anims,
 }
 
 function toggleApp(i)
diff --git a/UCDphone/apps/browser/browser_c.lua b/UCDphone/apps/browser/browser_c.lua
index daed898..6a1da0a 100644
--- a/UCDphone/apps/browser/browser_c.lua
+++ b/UCDphone/apps/browser/browser_c.lua
@@ -1,4 +1,5 @@
 Browser = {}
+Browser.open = false
 
 function Browser.toggle()
 	-- Add check because of old operating systems
diff --git a/UCDphone/apps/clock/clock_c.lua b/UCDphone/apps/clock/clock_c.lua
index 086356d..75a4d17 100644
--- a/UCDphone/apps/clock/clock_c.lua
+++ b/UCDphone/apps/clock/clock_c.lua
@@ -1,4 +1,5 @@
 Clock = {}
+Clock.open = false
 Clock.data = 
 {
 	weekdays =
@@ -36,6 +37,7 @@ Clock.create()
 function Clock.toggle()
 	for _, gui in pairs(Clock.all) do
 		gui.visible = not gui.visible
+		Clock.open = gui.visible
 	end
 	if (phone.clock.label["hms"].visible) then
 		Clock.update()
diff --git a/UCDphone/apps/clock/clock_c.luac b/UCDphone/apps/clock/clock_c.luac
new file mode 100644
index 0000000..3aa0f47
Binary files /dev/null and b/UCDphone/apps/clock/clock_c.luac differ
diff --git a/UCDphone/apps/friends/friends_c.lua b/UCDphone/apps/friends/friends_c.lua
index be3b9ea..50e0064 100644
--- a/UCDphone/apps/friends/friends_c.lua
+++ b/UCDphone/apps/friends/friends_c.lua
@@ -1,4 +1,5 @@
 Friends = {}
+Friends.open = false
 
 function Friends.create()
 	phone.friends = {button = {}, gridlist = {}}
@@ -32,6 +33,8 @@ end
 Friends.create()
 
 function Friends.toggle()
+	Friends.open = not Friends.open
+	-- o = opened
 	local o = 0
 	for _, gui in pairs(Friends.all) do
 		if (gui.visible) then
@@ -49,6 +52,7 @@ function Friends.GUI(state)
 	for _, gui in pairs(Friends.all) do
 		gui.visible = state
 	end
+	Friends.open = state
 end
 
 function Friends.switchView(view)
@@ -56,16 +60,7 @@ function Friends.switchView(view)
 		outputDebugString("v")
 		return
 	end
-	
-	-- Check if any friends gui element is open
-	--local o = 0
-	--for _, gui in pairs(Friends.all) do
-	--	if (gui.visible) then
-	--		o = o + 1
-	--	end
-	--end
-	--if (o == 0) then return end
-	
+	Friends.open = true	
 	for v, t in pairs(Friends.views) do
 		for _, gui in pairs(t) do
 			if (v == view) then
@@ -84,5 +79,5 @@ function Friends.onReceivedFriendsList(data)
 		guiGridListSetItemText(phone.friends.gridlist["friends"], row, 1, tostring(data[2]).." ("..tostring..data[1]..")")
 	end
 end
-addEvent("UCDphone.friends.onReceivedFriendsList", true)
-addEventHandler("UCDphone.friends.onReceivedFriendsList", root, Friends.onReceivedFriendsList)
+addEvent("CSGphone.friends.onReceivedFriendsList", true)
+addEventHandler("CSGphone.friends.onReceivedFriendsList", root, Friends.onReceivedFriendsList)
diff --git a/UCDphone/apps/friends/friends_c.luac b/UCDphone/apps/friends/friends_c.luac
new file mode 100644
index 0000000..72e658a
Binary files /dev/null and b/UCDphone/apps/friends/friends_c.luac differ
diff --git a/UCDphone/apps/friends/friends_s.lua b/UCDphone/apps/friends/friends_s.lua
index 1293e67..20ea285 100644
--- a/UCDphone/apps/friends/friends_s.lua
+++ b/UCDphone/apps/friends/friends_s.lua
@@ -10,7 +10,7 @@ function requestFriendsList()
 	for acc, perms in pairs(friends[source.account.name]) do
 		local onlineLast = 2 --getLastOnline(account)
 		local online = false
-		local display = exports.UCDaccounts:GAD(acc, "lastUsedName") or acc
+		local display = exports.CSGaccounts:GAD(acc, "lastUsedName") or acc
 		if (Account(acc) and Account(acc).player) then
 			online = true
 			onlineLast = "Today"
@@ -20,8 +20,8 @@ function requestFriendsList()
 	end
 	triggerLatentClientEvent(source, "SAURfriends.displayFriends", resourceRoot, temp)
 end
-addEvent("UCDphone.friends.requestFriendsList", true)
-addEventHandler("UCDphone.friends.requestFriendsList", root, requestFriendsList)
+addEvent("CSGphone.friends.requestFriendsList", true)
+addEventHandler("CSGphone.friends.requestFriendsList", root, requestFriendsList)
 
 function requestRequests()
 	local account = source.account.name
@@ -34,11 +34,11 @@ function requestRequests()
 		if (Account(acc) and Account(acc).player) then
 			display = Account(acc).player.name
 		else
-			display = exports.UCDaccounts:GAD(acc, "lastUsedName") or acc
+			display = exports.CSGaccounts:GAD(acc, "lastUsedName") or acc
 		end
 		table.insert(reqs, {acc, display})
 	end
-	triggerLatentClientEvent(source, "UCDphone.friends.onReceivedFriendsList", source, reqs)
+	triggerLatentClientEvent(source, "CSGphone.friends.onReceivedFriendsList", source, reqs)
 end
 addEvent("SAURfriends.requestRequests", true)
 addEventHandler("SAURfriends.requestRequests", root, requestRequests)
diff --git a/UCDphone/apps/housing/housing_c.lua b/UCDphone/apps/housing/housing_c.lua
new file mode 100644
index 0000000..55a08fb
--- /dev/null
+++ b/UCDphone/apps/housing/housing_c.lua
@@ -0,0 +1,142 @@
+Housing = {}
+Housing.cache = {}
+Housing.blips = {}
+Housing.open = false
+
+function Housing.create()
+	phone.housing = {label = {}}
+	
+	phone.housing.gridlist = guiCreateGridList(27, 96, 254, 207, false, phone.image["phone_window"])
+	phone.housing.gridlist:addColumn("House ID", 0.2)
+	phone.housing.gridlist:addColumn("House", 0.5)
+	phone.housing.gridlist:addColumn("Location", 0.2)
+	guiGridListSetSortingEnabled(phone.housing.gridlist, false)
+	
+	phone.housing.button = GuiButton(39, 484, 232, 37, "Toggle Marking", false, phone.image["phone_window"])
+	
+	phone.housing.label["OwnedHouses"] = GuiLabel(27, 303, 254, 15, "Owned Houses: ", false, phone.image["phone_window"])
+	phone.housing.label["HouseName"] = GuiLabel(27, 322, 254, 23, "House Name: ", false, phone.image["phone_window"])
+	phone.housing.label["InteriorID"] = GuiLabel(27, 345, 254, 23, "Interior ID:", false, phone.image["phone_window"])
+	phone.housing.label["InitialPrice"] = GuiLabel(27, 368, 254, 23, "Initial Price:", false, phone.image["phone_window"])
+	phone.housing.label["BoughtFor"] = GuiLabel(27, 391, 254, 23, "Bought For:", false, phone.image["phone_window"])
+	phone.housing.label["CurrentPrice"] = GuiLabel(27, 414, 254, 23, "Current Price:", false, phone.image["phone_window"])
+	phone.housing.label["Sale"] = GuiLabel(27, 437, 254, 23, "Sale:", false, phone.image["phone_window"])
+	phone.housing.label["Open"] = GuiLabel(27, 460, 254, 23, "Open:", false, phone.image["phone_window"])
+	
+	guiLabelSetHorizontalAlign(phone.housing.label["OwnedHouses"], "center", false)
+	guiSetFont(phone.housing.label["OwnedHouses"], "default-bold-small")
+	
+	Housing.all = {
+		phone.housing.gridlist, phone.housing.label["HouseName"], phone.housing.label["InteriorID"], phone.housing.label["InitialPrice"],
+		phone.housing.label["BoughtFor"], phone.housing.label["CurrentPrice"], phone.housing.label["Sale"], phone.housing.label["Open"],
+		phone.housing.label["OwnedHouses"], phone.housing.button
+	}
+	for _, gui in pairs(Housing.all) do
+		gui.visible = false
+	end
+end
+Housing.create()
+
+function Housing.toggle()
+	for _, gui in pairs(Housing.all) do
+		gui.visible = not gui.visible
+		Housing.open = gui.visible
+	end
+end
+
+function Housing.populate(cache)
+	phone.housing.gridlist:clear()
+	--Housing.destroyAllBlips()
+	
+	local checkBlips = {} -- Use this to retain blips, even when a house sells
+	local houseCount = 0
+	for houseID, data in pairs(cache) do
+		checkBlips[houseID] = true
+		
+		local zone
+		if (not exports.UCDutil or not exports.UCDutil:getCityZoneFromXYZ(data.Loc.x, data.Loc.y, data.Loc.z)) then
+			zone = "SA"
+		else
+			zone = exports.UCDutil:getCityZoneFromXYZ(data.Loc.x, data.Loc.y, data.Loc.z)
+		end
+		
+		local row = phone.housing.gridlist:addRow(houseID, data.HouseName, zone)
+		guiGridListSetItemData(phone.housing.gridlist, row, 1, houseID)
+		Housing.cache[houseID] = {
+			HouseName = data.HouseName,
+			InteriorID = data.InteriorID,
+			InitialPrice = data.InitialPrice,
+			BoughtFor = data.BoughtFor,
+			CurrentPrice = data.CurrentPrice,
+			Sale = data.Sale,
+			Open = data.Open,
+			x = data.Loc.x,
+			y = data.Loc.y,
+			z = data.Loc.z,
+		}
+		houseCount = houseCount + 1
+	end	
+	phone.housing.label["OwnedHouses"].text = "Owned Houses: "..tostring(houseCount or "0")
+	
+	for houseID in pairs(Housing.blips) do
+		if (not checkBlips[houseID]) then
+			Housing.blips[houseID]:destroy()
+			Housing.blips[houseID] = nil
+		end
+	end
+end
+addEvent("UCDphone.housing.populate", true)
+addEventHandler("UCDphone.housing.populate", root, Housing.populate)
+
+function Housing.onHouseGridClick()
+	local row = guiGridListGetSelectedItem(phone.housing.gridlist, 1)
+	if (row and row ~= -1) then
+		local houseID = guiGridListGetItemData(phone.housing.gridlist, row, 1)
+		local houseData = Housing.cache[houseID]
+		
+		if (houseData.Sale == 1) then houseData.Sale = "Yes" else houseData.Sale = "No" end
+		if (houseData.Open == 1) then houseData.Open = "Yes" else houseData.Open = "No" end
+		
+		phone.housing.label["HouseName"].text = "House Name: "..tostring(houseData.HouseName)
+		phone.housing.label["InteriorID"].text = "Interior ID: "..tostring(houseData.InteriorID)
+		phone.housing.label["InitialPrice"].text = "Initial Price: $"..tostring(exports.UCDutil:tocomma(houseData.InitialPrice))
+		phone.housing.label["BoughtFor"].text = "Bought For: $"..tostring(exports.UCDutil:tocomma(houseData.BoughtFor))
+		phone.housing.label["CurrentPrice"].text = "Current Price: $"..tostring(exports.UCDutil:tocomma(houseData.CurrentPrice))
+		phone.housing.label["Sale"].text = "Sale: "..tostring(houseData.Sale)
+		phone.housing.label["Open"].text = "Open: "..tostring(houseData.Open)
+	else
+		phone.housing.label["HouseName"].text = "House Name:"
+		phone.housing.label["InteriorID"].text = "Interior ID:"
+		phone.housing.label["InitialPrice"].text = "Initial Price:"
+		phone.housing.label["BoughtFor"].text = "Bought For:"
+		phone.housing.label["CurrentPrice"].text = "Current Price:"
+		phone.housing.label["Sale"].text = "Sale:"
+		phone.housing.label["Open"].text = "Open:"
+	end
+end
+addEventHandler("onClientGUIClick", phone.housing.gridlist, Housing.onHouseGridClick)
+
+function Housing.destroyAllBlips()
+	for _, blip in pairs(Housing.blips) do
+		blip:destroy()
+	end
+	Housing.blips = {}
+end
+
+function Housing.onToggleHouseBlip()
+	local row = guiGridListGetSelectedItem(phone.housing.gridlist, 1)
+	if (row and row ~= -1) then
+		local houseID = guiGridListGetItemData(phone.housing.gridlist, row, 1)
+		local houseData = Housing.cache[houseID]
+		local housePos = Vector3(houseData.x, houseData.y, houseData.z)
+		if (Housing.blips[houseID]) then
+			Housing.blips[houseID]:destroy()
+			Housing.blips[houseID] = nil
+		else
+			Housing.blips[houseID] = Blip(housePos, 31, nil, nil, nil, nil, nil, 0, 100000)
+		end
+	else
+		exports.UCDdx:new("You must select a house from the grid list", 255, 0, 0)
+	end
+end
+addEventHandler("onClientGUIClick", phone.housing.button, Housing.onToggleHouseBlip, false)
diff --git a/UCDphone/apps/housing/housing_s.lua b/UCDphone/apps/housing/housing_s.lua
new file mode 100644
index 0000000..d9a6655
--- /dev/null
+++ b/UCDphone/apps/housing/housing_s.lua
@@ -0,0 +1,108 @@
+Housing = {}
+Housing.cache = {}
+db = exports.UCDsql:getConnection()
+
+addEventHandler("onPlayerLogin", root,
+	function ()
+		if (not exports.UCDaccounts:isPlayerLoggedIn(source)) then
+			return false
+		end
+		if (not Housing.cache[source.account.name]) then
+			cacheFor(source.account.name)
+		end
+	end
+)
+
+addEventHandler("onResourceStart", resourceRoot,
+	function ()
+		Timer(
+			function ()
+				for _, plr in ipairs(Element.getAllByType("player")) do
+					if (exports.UCDaccounts:isPlayerLoggedIn(plr)) then
+						cacheFor(plr.account.name)
+					end
+				end
+			end, 1000, 1
+		)
+	end
+)
+
+function doCache(qh, account)
+	local result = qh:poll(0)
+	if (#result >= 1) then
+		for _, data in ipairs(result) do
+			table.insert(Housing.cache[account], data.houseID)
+		end
+	end
+	if (Account(account) and Account(account).player) then
+		triggerEvent("UCDphone.housing.requestHouses", Account(account).player)
+	end
+end
+
+function cacheFor(account)
+	Housing.cache[account] = {}
+	db:query(doCache, {account}, "SELECT `houseID` FROM `housing` WHERE `owner` = ? AND `owner` <> 'UCDhousing'", account)
+end
+
+function Housing.requestHouses()
+	if (source and source.type == "player") then
+		if (not exports.UCDaccounts:isPlayerLoggedIn(source)) then
+			return false
+		end
+		
+		local toSend = {}
+		
+		if (not Housing.cache[source.account.name]) then
+			cacheFor(source.account.name)
+		end
+		if (#Housing.cache[source.account.name] >= 1) then
+			for _, houseID in ipairs(Housing.cache[source.account.name]) do
+				toSend[houseID] = {
+					["HouseName"] = exports.UCDhousing:getHouseData(houseID, "houseName"),
+					["InteriorID"] = exports.UCDhousing:getHouseData(houseID, "interiorID"),
+					["InitialPrice"] = exports.UCDhousing:getHouseData(houseID, "initialPrice"),
+					["BoughtFor"] = exports.UCDhousing:getHouseData(houseID, "boughtForPrice"),
+					["CurrentPrice"] = exports.UCDhousing:getHouseData(houseID, "currentPrice"),
+					["Sale"] = exports.UCDhousing:getHouseData(houseID, "sale"),
+					["Open"] = exports.UCDhousing:getHouseData(houseID, "open"),
+					["Loc"] = {
+						x = exports.UCDhousing:getHouseData(houseID, "x"),
+						y = exports.UCDhousing:getHouseData(houseID, "y"),
+						z = exports.UCDhousing:getHouseData(houseID, "z"),
+					},
+				}
+			end
+		end
+		triggerLatentClientEvent(source, "UCDphone.housing.populate", source, toSend)
+	end
+end
+addEvent("UCDphone.housing.requestHouses", true)
+addEventHandler("UCDphone.housing.requestHouses", root, Housing.requestHouses)
+
+function Housing.onExchangeHouse(houseID, previousOwner) 
+	--outputDebugString("houseID => "..tostring(houseID).." : previousOwner => "..tostring(previousOwner)) -- done
+	if (previousOwner ~= "UCDhousing") then
+		--[[
+		if (Housing.cache[previousOwner]) then
+			for i, data in ipairs(Housing.cache[previousOwner]) do
+				if (data == houseID) then
+					table.remove(Housing.cache[previousOwner], i)
+					break
+				end
+			end
+			if (not Housing.cache[source.account.name]) then
+				Housing.cache[source.account.name] = {}
+			end
+			table.insert(Housing.cache[source.account.name], houseID)
+		end
+		--]]
+		-- It's async, we can afford to do this
+		-- Besides, how often do houses really get purchased?
+		cacheFor(previousOwner)
+	end
+	cacheFor(source.account.name)
+end
+addEvent("onPlayerBuyHouse")
+addEventHandler("onPlayerBuyHouse", root, Housing.onExchangeHouse)
+addEvent("onPlayerSellHouseToBank")
+addEventHandler("onPlayerSellHouseToBank", root, Housing.onExchangeHouse)
diff --git a/UCDphone/apps/im/im_c.lua b/UCDphone/apps/im/im_c.lua
index c84a44e..4700000 100644
--- a/UCDphone/apps/im/im_c.lua
+++ b/UCDphone/apps/im/im_c.lua
@@ -1,5 +1,6 @@
 IM = {}
 IM.f2a = {}
+IM.open = false
 
 -- Request list on resource start (in case the resource is restarted while the player is online)
 addEventHandler("onClientResourceStart", resourceRoot, 
@@ -57,6 +58,7 @@ IM.create()
 function IM.toggle()
 	for _, gui in pairs(IM.all) do
 		gui.visible = not gui.visible
+		IM.open = gui.visible
 	end
 end
 
diff --git a/UCDphone/apps/im/im_c.luac b/UCDphone/apps/im/im_c.luac
new file mode 100644
index 0000000..9790893
Binary files /dev/null and b/UCDphone/apps/im/im_c.luac differ
diff --git a/UCDphone/apps/mail/mail_c.lua b/UCDphone/apps/mail/mail_c.lua
new file mode 100644
index 0000000..c6bbb98
--- /dev/null
+++ b/UCDphone/apps/mail/mail_c.lua
@@ -0,0 +1,202 @@
+Mail = {}
+Mail.open = false
+
+addCommandHandler("mo", function () outputDebugString(tostring(Mail.open)) end)
+
+function Mail.create()
+	phone.mail = {button = {}, checkbox = {}, label = {}, memo = {}}	
+
+		-- Main view
+		phone.mail.gridlist = guiCreateGridList(19, 124, 272, 291, false, phone.image["phone_window"])
+		guiGridListAddColumn(phone.mail.gridlist, "Player", 0.3)
+		guiGridListAddColumn(phone.mail.gridlist, "Message", 0.6)
+        
+        phone.mail.label["instruct"] = GuiLabel(19, 89, 274, 17, "Double click on a message to view", false, phone.image["phone_window"])
+        guiLabelSetHorizontalAlign(phone.mail.label["instruct"], "center", false)
+		
+		phone.mail.button["new"] = GuiButton(29, 483, 77, 36, "New Mail", false, phone.image["phone_window"])
+		phone.mail.button["delete"] = GuiButton(118, 483, 77, 36, "Delete Selected", false, phone.image["phone_window"])
+        phone.mail.button["settings"] = GuiButton(206, 483, 77, 36, "Mail Settings", false, phone.image["phone_window"])     
+		
+		-- Filters
+		
+		-- Search
+		phone.mail.edit = GuiEdit(79, 423, 211, 25, "", false, phone.image["phone_window"])
+        phone.mail.label["search"] = GuiLabel(19, 423, 60, 21, "Search:", false, phone.image["phone_window"])
+        guiLabelSetHorizontalAlign(phone.mail.label["search"], "center", false)
+        guiLabelSetVerticalAlign(phone.mail.label["search"], "center")
+		
+		-- Types
+		phone.mail.checkbox["filter_unread"] = GuiCheckBox(59, 458, 15, 15, "", false, false, phone.image["phone_window"])
+        phone.mail.label["filter_unread"] = GuiLabel(74, 458, 78, 15, "Unread Only", false, phone.image["phone_window"])
+        guiLabelSetHorizontalAlign(phone.mail.label["filter_unread"], "center", false)
+		
+		phone.mail.checkbox["filter_"] = GuiCheckBox(162, 458, 15, 15, "", false, false, phone.image["phone_window"])
+		phone.mail.label["filter_"] = GuiLabel(177, 458, 84, 15, "Unread Only", false, phone.image["phone_window"])
+        guiLabelSetHorizontalAlign(phone.mail.label["filter_"], "center", false)
+		
+		-- 
+		---
+		----
+		phone.mail.scrollpane = GuiScrollPane(16, 110, 278, 177, false, phone.image["phone_window"])
+		phone.mail.label["conversing_with"] = GuiLabel(16, 89, 278, 16, "Conversation with lastUsedName (accountName)", false, phone.image["phone_window"])
+		guiLabelSetHorizontalAlign(phone.mail.label["conversing_with"], "center", false)
+		
+		phone.mail.memo["msg"] = GuiMemo(16, 287, 278, 55, "w * n\nw = width = 15px\nn = number of lines\ncharacters in 1 line = ~33 (new line at 30?)", false, phone.image["phone_window"])
+		phone.mail.button["msg_delete"] = GuiButton(16, 352, 132, 36, "Delete Selected (55)", false, phone.image["phone_window"])
+		phone.mail.button["msg_send"] = GuiButton(162, 352, 132, 36, "Send", false, phone.image["phone_window"])
+		
+		
+	Mail.views = {
+		main = {
+			phone.mail.gridlist, phone.mail.label["instruct"], phone.mail.button["new"], phone.mail.button["delete"], phone.mail.button["settings"],
+			phone.mail.edit, phone.mail.label["search"], phone.mail.checkbox["filter_unread"], phone.mail.label["filter_unread"],
+			phone.mail.checkbox["filter_"], phone.mail.label["filter_"]
+		},
+		conversation = {
+			phone.mail.scrollpane, phone.mail.label["conversing_with"], phone.mail.memo["msg"], phone.mail.button["msg_delete"], phone.mail.button["msg_send"], 
+		},
+	}
+	
+	Mail.all = {
+		phone.mail.label["search"], phone.mail.edit, phone.mail.label["filter_unread"], phone.mail.gridlist, phone.mail.label["instruct"],
+		phone.mail.button["new"], phone.mail.button["delete"], phone.mail.button["settings"], phone.mail.checkbox["filter_unread"],
+		phone.mail.checkbox["filter_"], phone.mail.label["filter_"], phone.mail.scrollpane, phone.mail.label["conversing_with"],
+		phone.mail.memo["msg"], phone.mail.button["msg_delete"], phone.mail.button["msg_send"],
+	}
+	
+	for _, gui in pairs(Mail.all) do
+		gui.visible = false
+	end
+end
+Mail.create()
+
+function Mail.toggle()
+	-- o = opened
+	local o = 0
+	for _, gui in pairs(Mail.views.main) do
+		if (gui.visible) then
+			o = o + 1
+		end
+	end
+	if (o == 0) then
+		Mail.switchView("main")
+		return
+	end
+	Mail.GUI(false)
+end
+
+function Mail.GUI(state)
+	for _, gui in pairs(Mail.all) do
+		gui.visible = state
+	end
+	Mail.open = state
+end
+
+function Mail.switchView(view)
+	if (not Mail.views[view]) then
+		outputDebugString("view "..tostring(view).. " doesnt exist")
+		return
+	end
+	Mail.open = true -- Force it to be true here
+	for v, t in pairs(Mail.views) do
+		for _, gui in pairs(t) do
+			if (v == view) then
+				gui.visible = true
+			else
+				gui.visible = false
+			end
+		end
+	end
+end
+addCommandHandler("switchv", function (_, view) Mail.switchView(view) end)
+
+function Mail.onDoubleClickMessageList()
+	
+end
+
+function Mail.openThread()
+	
+end
+
+-- PROTOTYPE - DO NOT TOUCH
+--[[
+
+phone.mail = {
+    checkbox = {},
+    scrollpane = {},
+    label = {},
+    edit = {},
+    button = {},
+    window = {},
+    gridlist = {},
+    memo = {}
+}
+addEventHandler("onClientResourceStart", resourceRoot,
+    function()
+        phone.mail.window[1] = guiCreateWindow(535, 411, 311, 599, "", false)
+        guiWindowSetSizable(phone.mail.window[1], false)
+        guiSetAlpha(phone.mail.window[1], 0.90)
+
+        phone.mail.gridlist[1] = guiCreateGridList(19, 124, 274, 291, false, phone.mail.window[1])
+        guiGridListAddColumn(phone.mail.gridlist[1], "From", 0.3)
+        guiGridListAddColumn(phone.mail.gridlist[1], "Message", 0.3)
+        guiGridListAddColumn(phone.mail.gridlist[1], "Date", 0.3)
+        phone.mail.button[1] = guiCreateButton(29, 483, 77, 36, "New Mail", false, phone.mail.window[1])
+        guiSetProperty(phone.mail.button[1], "NormalTextColour", "FFAAAAAA")
+        phone.mail.label[1] = GuiLabel(19, 89, 274, 17, "Double click on a message to view", false, phone.mail.window[1])
+        guiLabelSetHorizontalAlign(phone.mail.label[1], "center", false)
+        phone.mail.button[2] = guiCreateButton(206, 483, 77, 36, "Mail Settings", false, phone.mail.window[1])
+        guiSetProperty(phone.mail.button[2], "NormalTextColour", "FFAAAAAA")
+        phone.mail.button[3] = guiCreateButton(118, 483, 77, 36, "Delete Selected", false, phone.mail.window[1])
+        guiSetProperty(phone.mail.button[3], "NormalTextColour", "FFAAAAAA")
+        phone.mail.checkbox[1] = guiCreateCheckBox(59, 458, 15, 15, "", false, false, phone.mail.window[1])
+        phone.mail.edit[1] = guiCreateEdit(79, 423, 214, 25, "", false, phone.mail.window[1])
+        phone.mail.label[2] = GuiLabel(19, 423, 60, 21, "Search:", false, phone.mail.window[1])
+        guiLabelSetHorizontalAlign(phone.mail.label[2], "center", false)
+        guiLabelSetVerticalAlign(phone.mail.label[2], "center")
+        phone.mail.label[3] = GuiLabel(74, 458, 78, 15, "Unread Only", false, phone.mail.window[1])
+        guiLabelSetHorizontalAlign(phone.mail.label[3], "center", false)
+        phone.mail.checkbox[2] = guiCreateCheckBox(162, 458, 15, 15, "", false, false, phone.mail.window[1])
+        phone.mail.label[4] = GuiLabel(177, 458, 84, 15, "Unread Only", false, phone.mail.window[1])
+        guiLabelSetHorizontalAlign(phone.mail.label[4], "center", false)
+
+
+        phone.mail.window[2] = guiCreateWindow(1199, 459, 311, 599, "", false)
+        guiWindowSetSizable(phone.mail.window[2], false)
+        guiSetAlpha(phone.mail.window[2], 0.90)
+
+        phone.mail.memo[1] = guiCreateMemo(16, 109, 278, 168, "[2016-12-12 @ 1:43pm]\n Risk > Me: ddddddddddddd\n\n[2016-12-12 @ 1:43pm]\nMe > Risk: ahahahah no\n\n[2016-12-12 @ 1:43pm]\nMe > Risk: hi\n", false, phone.mail.window[2])
+        phone.mail.label[5] = GuiLabel(16, 89, 278, 16, "Conversation with [CSG]Risk (Risk)", false, phone.mail.window[2])
+        guiLabelSetHorizontalAlign(phone.mail.label[5], "center", false)
+        phone.mail.memo[2] = guiCreateMemo(16, 287, 278, 55, "", false, phone.mail.window[2])
+        phone.mail.button[4] = guiCreateButton(16, 352, 132, 36, "Clear", false, phone.mail.window[2])
+        guiSetProperty(phone.mail.button[4], "NormalTextColour", "FFAAAAAA")
+        phone.mail.button[5] = guiCreateButton(162, 352, 132, 36, "Send", false, phone.mail.window[2])
+        guiSetProperty(phone.mail.button[5], "NormalTextColour", "FFAAAAAA")
+
+
+        phone.mail.window[3] = guiCreateWindow(878, 459, 311, 599, "", false)
+        guiWindowSetSizable(phone.mail.window[3], false)
+        guiSetAlpha(phone.mail.window[3], 0.90)
+
+        phone.mail.label[6] = GuiLabel(16, 89, 278, 16, "Conversation with [CSG]Risk (Risk)", false, phone.mail.window[3])
+        guiLabelSetHorizontalAlign(phone.mail.label[6], "center", false)
+        phone.mail.memo[3] = guiCreateMemo(16, 287, 278, 55, "w * n\nw = width = 15px\nn = number of lines\ncharacters in 1 line = ~33 (new line at 30?)", false, phone.mail.window[3])
+        phone.mail.button[6] = guiCreateButton(16, 352, 132, 36, "Delete Selected (55)", false, phone.mail.window[3])
+        guiSetProperty(phone.mail.button[6], "NormalTextColour", "FFAAAAAA")
+        phone.mail.button[7] = guiCreateButton(162, 352, 132, 36, "Send", false, phone.mail.window[3])
+        guiSetProperty(phone.mail.button[7], "NormalTextColour", "FFAAAAAA")
+        phone.mail.scrollpane[1] = guiCreateScrollPane(16, 110, 278, 177, false, phone.mail.window[3])
+
+        phone.mail.checkbox[3] = guiCreateCheckBox(0, 0, 15, 15, "", false, false, phone.mail.scrollpane[1])
+        phone.mail.label[7] = GuiLabel(25, 0, 233, 45, "[2016-12-12 @ 1:43pm]\nRisk > Me: ddddddddddddd\n123456789012345678901234567890123", false, phone.mail.scrollpane[1])
+        guiLabelSetHorizontalAlign(phone.mail.label[7], "left", true)
+        phone.mail.label[8] = GuiLabel(25, 55, 240, 45, "[2016-12-12 @ 1:43pm]\nRisk > Me: ddddddddddddd\n1234567890123456789012345678901234", false, phone.mail.scrollpane[1])
+        guiLabelSetHorizontalAlign(phone.mail.label[8], "left", true)
+        phone.mail.label[9] = GuiLabel(25, 110, 240, 45, "[2016-12-12 @ 1:43pm]\nRisk > Me: ddddddddddddd\n1234567890123456789012345678901234", false, phone.mail.scrollpane[1])
+        guiLabelSetHorizontalAlign(phone.mail.label[9], "left", true)    
+    end
+)
+
+]]
diff --git a/UCDphone/apps/mail/mail_c.luac b/UCDphone/apps/mail/mail_c.luac
new file mode 100644
index 0000000..a55ae04
Binary files /dev/null and b/UCDphone/apps/mail/mail_c.luac differ
diff --git a/UCDphone/apps/mail/mail_s.lua b/UCDphone/apps/mail/mail_s.lua
new file mode 100644
index 0000000..e69de29
diff --git a/UCDphone/apps/mark/mark_c.lua b/UCDphone/apps/mark/mark_c.lua
index f231635..78b6547 100644
--- a/UCDphone/apps/mark/mark_c.lua
+++ b/UCDphone/apps/mark/mark_c.lua
@@ -1,10 +1,11 @@
 Mark = {}
 Mark.blips = {}
+Mark.open = false
 
 function Mark.create()
 	phone.mark = {button = {}, edit = {}, gridlist = {}}
 	
-	phone.mark.edit["search_players"] = GuiEdit(18, 95, 274, 32, "", false, phone.image["phone_window"])
+	phone.mark.edit["search_players"] = GuiEdit(18, 97, 274, 28, "", false, phone.image["phone_window"])
 	phone.mark.gridlist["players"] = GuiGridList(20, 135, 271, 333, false, phone.image["phone_window"])
 	guiGridListAddColumn(phone.mark.gridlist["players"], "Players", 0.9)
 	phone.mark.button["toggle_mark"] = GuiButton(39, 476, 232, 37, "Toggle marking of specified player", false, phone.image["phone_window"])
@@ -21,6 +22,7 @@ Mark.create()
 function Mark.toggle()
 	for _, gui in ipairs(Mark.all) do
 		gui.visible = not gui.visible
+		Mark.open = gui.visible
 	end
 end
 
@@ -36,18 +38,18 @@ end
 
 function Mark.toggleBlip(ele)
 	if (#Mark.blips >= 5) then
-		exports.UCDdx:new("You can only have a maximum of 5 players blipped at a given time", 255, 0, 0)
+		exports.CSGdx:new("You can only have a maximum of 5 players blipped at a given time", 255, 0, 0)
 		return
 	end
 	local blipID = 58
 	if (Mark.blips[ele]) then
-		exports.UCDdx:new("Marking removed on "..ele.name, 0, 255, 0)
+		exports.CSGdx:new("Marking removed on "..ele.name, 0, 255, 0)
 		Mark.blips[ele]:destroy()
 		Mark.blips[ele] = nil
 		removeEventHandler("onClientPlayerQuit", ele, Mark.onQuit)
 		return
 	end
-	exports.UCDdx:new(ele.name.." is now marked", 0, 255, 0)
+	exports.CSGdx:new(ele.name.." is now marked", 0, 255, 0)
 	Mark.blips[ele] = Blip.createAttachedTo(ele, blipID)
 	addEventHandler("onClientPlayerQuit", ele, Mark.onQuit)
 end
diff --git a/UCDphone/apps/money/money_c.lua b/UCDphone/apps/money/money_c.lua
index c0450fd..310b2c9 100644
--- a/UCDphone/apps/money/money_c.lua
+++ b/UCDphone/apps/money/money_c.lua
@@ -1,4 +1,5 @@
 Money = {}
+Money.open = false
 
 function Money.create()
 	phone.money = {button = {}, edit = {}, gridlist = {}}
@@ -22,6 +23,7 @@ Money.create()
 function Money.toggle()
 	for _, gui in pairs(Money.all) do
 		gui.visible = not gui.visible
+		Money.open = gui.visible
 	end
 end
 
diff --git a/UCDphone/apps/music/music_c.lua b/UCDphone/apps/music/music_c.lua
index 404ec91..6f00448 100644
--- a/UCDphone/apps/music/music_c.lua
+++ b/UCDphone/apps/music/music_c.lua
@@ -13,6 +13,7 @@ Music.trackPlaying = nil
 Music.tracks = {
 	--[1] = {"Girls' Generation - Gee", "http://music.zorque.xyz/gg/gee.mp3"}
 }
+Music.open = false
 
 function Music.create()
 	phone.music = {tab = {}, staticimage = {}, tabpanel = {}, edit = {}, button = {}, label = {}, gridlist = {}, progress = {}}
@@ -69,12 +70,15 @@ Music.create()
 function Music.toggle()
 	for _, gui in pairs(Music.all) do
 		gui.visible = not gui.visible
+		Music.open = gui.visible
 	end
 end
 
 function Music.loadUserTracks()
 	phone.music.gridlist["Music"]:clear()
-	Music.stop()
+	if ((track and isElement(track)) or (stream and isElement(stream))) then
+		Music.stop()
+	end
 	for i = 1, #Music.tracks do
 		local row = guiGridListAddRow(phone.music.gridlist["Music"])
 		guiGridListSetItemText(phone.music.gridlist["Music"], row, 1, tostring(Music.tracks[i][1]), false, false)
diff --git a/UCDphone/apps/notes/notes_c.lua b/UCDphone/apps/notes/notes_c.lua
index c920428..43a9900 100644
--- a/UCDphone/apps/notes/notes_c.lua
+++ b/UCDphone/apps/notes/notes_c.lua
@@ -1,4 +1,5 @@
 Notes = {}
+Notes.open = false
 
 function Notes.create()
 	phone.notes = {memo = {}}
@@ -28,6 +29,7 @@ Notes.create()
 function Notes.toggle()
 	for _, gui in pairs(Notes.all) do
 		gui.visible = not gui.visible
+		Notes.open = gui.visible
 	end
 end
 
diff --git a/UCDphone/apps/notes/notes_c.luac b/UCDphone/apps/notes/notes_c.luac
new file mode 100644
index 0000000..05a2044
Binary files /dev/null and b/UCDphone/apps/notes/notes_c.luac differ
diff --git a/UCDphone/apps/settings/settings_c.lua b/UCDphone/apps/settings/settings_c.lua
new file mode 100644
index 0000000..d00038d
--- /dev/null
+++ b/UCDphone/apps/settings/settings_c.lua
@@ -0,0 +1,155 @@
+Settings = {}
+Settings.open = false
+
+function Settings.create()
+	phone.settings = {}
+	
+	phone.settings.gridlist = GuiGridList(19, 90, 272, 275, false, phone.image["phone_window"])
+	phone.settings.gridlist.sortingEnabled = false
+	phone.settings.gridlist:addColumn("Setting/category name", 0.55)
+	phone.settings.gridlist:addColumn("Setting value", 0.35)
+	
+	phone.settings.memo = GuiMemo(19, 370, 272, 60, "Select a setting to view its description here", false, phone.image["phone_window"])
+	phone.settings.memo.readOnly = true
+	
+	phone.settings.combobox = GuiComboBox(19, 432.5, 272, 35, "Select a setting first", false, phone.image["phone_window"])
+	phone.settings.combobox.enabled = false
+	
+	phone.settings.editbox = GuiEdit(19, 457.5, 272, 25, "Select a setting first", false, phone.image["phone_window"])
+	phone.settings.editbox.enabled = false
+	
+	phone.settings.button = GuiButton(19, 485, 272, 25, "Set setting value(right click = default)", false, phone.image["phone_window"])
+	phone.settings.button.enabled = false
+	
+	phone.settings.label = GuiLabel(19, 510, 272, 25, "Info goes here", false, phone.image["phone_window"])
+	phone.settings.label:setHorizontalAlign("center")
+	phone.settings.label:setColor(255, 140, 0)
+	
+	Settings.all = {
+		phone.settings.gridlist, phone.settings.memo, phone.settings.combobox, phone.settings.editbox, phone.settings.button, phone.settings.label
+	}
+	for _, gui in ipairs(Settings.all) do
+		gui.visible = false
+	end
+end
+Settings.create()
+
+function Settings.toggle()
+	for _, gui in pairs(Settings.all) do
+		gui.visible = not gui.visible
+		Settings.open = gui.visible
+	end
+	if (Settings.open) then
+		Settings.load()
+	end
+end
+
+function Settings.load(button)
+	phone.settings.gridlist:clear()
+	-- It gets cleared, we go default
+	phone.settings.memo.text = "Select a setting to view its description here"
+	phone.settings.combobox.enabled = false
+	phone.settings.combobox:clear()
+	phone.settings.combobox.text = "Select a setting first"
+	phone.settings.editbox.enabled = false
+	phone.settings.editbox.text = "Select a setting first"
+	phone.settings.button.enabled = false
+	if (button) then
+		local x, y = guiGetPosition(phone.image["phone_window"], false)
+		x, y = x + 19 + (272 / 2), y + 510
+		setCursorPosition(x, y) -- So it gets disabled fully
+	else
+		phone.settings.label.text = "Info goes here"
+		phone.settings.label:setColor(255, 140, 0)
+	end
+	local settings = exports.UCDsettings:getAllSettings()
+	for category, settingsInCategory in pairs(settings) do
+		local row = phone.settings.gridlist:addRow()
+		phone.settings.gridlist:setItemText(row, 1, category, true, false)
+		for setting, value in pairs(settingsInCategory) do
+			local row = phone.settings.gridlist:addRow()
+			local data = exports.UCDsettings:getSettingData(setting)
+			if (data) then
+				phone.settings.gridlist:setItemText(row, 1, data.name, false, false)
+				phone.settings.gridlist:setItemData(row, 1, setting)
+				phone.settings.gridlist:setItemText(row, 2, value, false, false)
+			end
+		end
+	end
+end
+
+function Settings.select(button)
+	if (source ~= phone.settings.gridlist or button ~= "left") then
+		return false
+	end
+	local row = phone.settings.gridlist:getSelectedItem()
+	if (not row or row == -1) then
+		-- No row selected, all goes default
+		phone.settings.memo.text = "Select a setting to view its description here"
+		phone.settings.combobox.enabled = false
+		phone.settings.combobox:clear()
+		phone.settings.combobox.text = "Select a setting first"
+		phone.settings.editbox.enabled = false
+		phone.settings.editbox.text = "Select a setting first"
+		phone.settings.button.enabled = false
+		return false
+	end
+	local setting = phone.settings.gridlist:getItemData(row, 1)
+	local data = exports.UCDsettings:getSettingData(setting)
+	phone.settings.memo.text = data.desc
+	-- Reset all things before enabling
+	phone.settings.combobox.enabled = false
+	phone.settings.combobox:clear()
+	phone.settings.editbox.enabled = false
+	phone.settings.editbox.text = ""
+	phone.settings.button.enabled = true
+	if (data.values) then
+		-- If it has specific values
+		phone.settings.editbox.text = "Can't be used with this setting"
+		phone.settings.combobox.enabled = true
+		phone.settings.combobox.text = "Select a value"
+		phone.settings.combobox:setSize(272, #data.values * 15 + 30, false)
+		for _, value in ipairs(data.values) do
+			phone.settings.combobox:addItem(value)
+		end
+	elseif (data.chars) then
+		-- Custom values by client
+		phone.settings.combobox.text = "Can't be used with this setting"
+		phone.settings.editbox.enabled = true
+	end
+end
+addEventHandler("onClientGUIClick", phone.settings.gridlist, Settings.select)
+
+function Settings.setValue(button)
+	if (source ~= phone.settings.button) then
+		return false
+	end
+	
+	local row = phone.settings.gridlist:getSelectedItem()
+	if (not row or row == -1) then
+		return false
+	end
+	local settingName = phone.settings.gridlist:getItemText(row, 1)
+	local setting = phone.settings.gridlist:getItemData(row, 1)
+	local value
+	if (button == "left") then
+		if (phone.settings.combobox.enabled) then
+			value = phone.settings.combobox:getItemText(phone.settings.combobox.selected)
+		elseif (phone.settings.editbox.enabled) then
+			value = phone.settings.editbox.text
+		end
+	elseif (button == "right") then
+		value = exports.UCDsettings:getSettingData(setting).default
+	end
+	local acceptable, msg = exports.UCDsettings:isValueAcceptableForSetting(value, setting)
+	if (acceptable) then
+		phone.settings.label.text = "Set '"..settingName.."' to '"..value.."'"
+		phone.settings.label:setColor(0, 255, 0)
+		exports.UCDsettings:setSetting(setting, value)
+		Settings.load(true)
+	else
+		phone.settings.label.text = msg or "ERROR 404"
+		phone.settings.label:setColor(255, 0, 0)
+	end
+end
+addEventHandler("onClientGUIClick", phone.settings.button, Settings.setValue)
\ No newline at end of file
diff --git a/UCDphone/apps/stocks/stocks_c.lua b/UCDphone/apps/stocks/stocks_c.lua
index e31c721..6b9bc3a 100644
--- a/UCDphone/apps/stocks/stocks_c.lua
+++ b/UCDphone/apps/stocks/stocks_c.lua
@@ -1,4 +1,5 @@
 Stocks = {}
+Stocks.open = false
 
 function Stocks.create()
 	phone.stocks = {gridlist = {}, button = {},	label = {}}
@@ -35,6 +36,7 @@ Stocks.create()
 function Stocks.toggle()
 	for _, gui in pairs(Stocks.all) do
 		gui.visible = not gui.visible
+		Stocks.open = gui.visible
 	end
 end
 
@@ -43,10 +45,10 @@ function Stocks.populate(all, own)
 	phone.stocks.gridlist["all"]:clear()
 	
 	for i, info in pairs(all) do		
-		local curr = exports.UCDutil:mathround(info[2], 2)
-		local prev = exports.UCDutil:mathround(info[3], 2)
+		local curr = exports.CSGutil:mathround(info[2], 2)
+		local prev = exports.CSGutil:mathround(info[3], 2)
 		local diff = curr - prev
-		local per = exports.UCDutil:mathround((diff / prev) * 100, 2) -- delta over original muliplied by 100%
+		local per = exports.CSGutil:mathround((diff / prev) * 100, 2) -- delta over original muliplied by 100%
 		local sign
 		if (diff <= 0) then
 			sign = ""
@@ -77,31 +79,31 @@ function Stocks.populate(all, own)
 	for k, v in pairs(own) do
 		local row = guiGridListAddRow(phone.stocks.gridlist["own"])
 		guiGridListSetItemText(phone.stocks.gridlist["own"], row, 1, tostring(k), false, false)
-		guiGridListSetItemText(phone.stocks.gridlist["own"], row, 2, tostring(exports.UCDutil:tocomma(v[1])), false, false)
+		guiGridListSetItemText(phone.stocks.gridlist["own"], row, 2, tostring(exports.CSGutil:tocomma(v[1])), false, false)
 			
 		guiGridListSetItemColor(phone.stocks.gridlist["own"], row, 1, 0, 200, 200)
 		guiGridListSetItemColor(phone.stocks.gridlist["own"], row, 2, 0, 200, 200)
 	end
 end
-addEvent("UCDphone.populateStocks", true)
-addEventHandler("UCDphone.populateStocks", root, Stocks.populate)
+addEvent("CSGphone.populateStocks", true)
+addEventHandler("CSGphone.populateStocks", root, Stocks.populate)
 
 --[[
 addEvent("onClientPlayerLogin", true)
 addEventHandler("onClientPlayerLogin", localPlayer, 
 	function ()
-		triggerServerEvent("UCDphone.getStocks", localPlayer)
+		triggerServerEvent("CSGphone.getStocks", localPlayer)
 	end
 )
 --]]
 
 function Stocks.onOpen(i)
 	if (i == 12) then
-		triggerServerEvent("UCDstocks.getStocks", localPlayer, true)
+		triggerServerEvent("CSGstocks.getStocks", localPlayer, true)
 	end
 end
-addEvent("UCDphone.onOpenApp")
-addEventHandler("UCDphone.onOpenApp", root, Stocks.onOpen)
+addEvent("CSGphone.onOpenApp")
+addEventHandler("CSGphone.onOpenApp", root, Stocks.onOpen)
 
 function Stocks.market()
 	executeCommandHandler("stocks")
diff --git a/UCDphone/apps/stocks/stocks_c.luac b/UCDphone/apps/stocks/stocks_c.luac
new file mode 100644
index 0000000..09fdfd2
Binary files /dev/null and b/UCDphone/apps/stocks/stocks_c.luac differ
diff --git a/UCDphone/apps/weather/weather_c.lua b/UCDphone/apps/weather/weather_c.lua
index c0622c1..a93c571 100644
--- a/UCDphone/apps/weather/weather_c.lua
+++ b/UCDphone/apps/weather/weather_c.lua
@@ -41,6 +41,7 @@ Weather.r2t = {}
 Weather.r2w = {}
 Weather.freezeTimer = nil
 Weather.weatherID = nil -- For manusally set IDs (automatic weather system)
+Weather.open = false
 
 function Weather.create()
 	phone.weather = {button = {}, gridlist = {}, label = {}, edit = {}}
@@ -111,6 +112,7 @@ Weather.create()
 function Weather.toggle()
 	for _, gui in pairs(Weather.all) do
 		gui.visible = not gui.visible
+		Weather.open = gui.visible
 	end
 end
 
@@ -143,7 +145,7 @@ function Weather.onClickSetTime()
 		m = 0
 	end
 	if (not tonumber(h) or not tonumber(m)) then
-		exports.UCDdx:new("Please enter numbers into both boxes", 255, 0, 0)
+		exports.CSGdx:new("Please enter numbers into both boxes", 255, 0, 0)
 		return
 	end
 	local t = Weather.setTime(h, m)
@@ -195,12 +197,12 @@ function Weather.onClickSetWeather()
 	id = id:gsub("%a", ""):gsub(" ", "")
 	id = tonumber(id)
 	if (not id or id < -1 or id > 175) then
-		exports.UCDdx:new("Please enter a weather ID from 0 to 175", 255, 0, 0)
+		exports.CSGdx:new("Please enter a weather ID from 0 to 175", 255, 0, 0)
 		return false
 	end
 	if (id == -1) then
 		Weather.weatherID = nil
-		triggerServerEvent("UCDphone.weather.getCurrentCycle", resourceRoot)
+		triggerServerEvent("CSGphone.weather.getCurrentCycle", resourceRoot)
 		return
 	end
 	Weather.weatherID = id
@@ -210,12 +212,12 @@ addEventHandler("onClientGUIClick", phone.weather.button["setweather"], Weather.
 
 function Weather.command(_, id)
 	if (not tonumber(id)) then
-		exports.UCDdx:new("Syntax: /weather <id> (0 - 175)")
+		exports.CSGdx:new("Syntax: /weather <id> (0 - 175)")
 		return false
 	end
 	id = tonumber(id)
 	if (id < 0 or id > 175) then
-		exports.UCDdx:new("Syntax: /weather <id> (0 - 175)")
+		exports.CSGdx:new("Syntax: /weather <id> (0 - 175)")
 		return false
 	end
 	Weather.setWeather(id)
@@ -231,8 +233,8 @@ function Weather.onCycleChange(id)
 		setWeatherBlended(id)
 	end
 end
-addEvent("UCDphone.weather.onCycleChange", true)
-addEventHandler("UCDphone.weather.onCycleChange", root, Weather.onCycleChange)
+addEvent("CSGphone.weather.onCycleChange", true)
+addEventHandler("CSGphone.weather.onCycleChange", root, Weather.onCycleChange)
 
 function Weather.onClickWeather()
 	local row = guiGridListGetSelectedItem(phone.weather.gridlist["presetweather"])
diff --git a/UCDphone/apps/weather/weather_c.luac b/UCDphone/apps/weather/weather_c.luac
new file mode 100644
index 0000000..d616071
Binary files /dev/null and b/UCDphone/apps/weather/weather_c.luac differ
diff --git a/UCDphone/apps/weather/weather_s.lua b/UCDphone/apps/weather/weather_s.lua
index 703a058..ae2b471 100644
--- a/UCDphone/apps/weather/weather_s.lua
+++ b/UCDphone/apps/weather/weather_s.lua
@@ -16,14 +16,14 @@ function Weather.cycle()
 	Weather.prev = Weather.curr
 	Weather.curr = Weather.valid[i]
 	
-	triggerLatentClientEvent(Element.getAllByType("player"), "UCDphone.weather.onCycleChange", resourceRoot, Weather.curr)
+	triggerLatentClientEvent(Element.getAllByType("player"), "CSGphone.weather.onCycleChange", resourceRoot, Weather.curr)
 	
 	Timer(Weather.cycle, math.random(Weather.time - Weather.offset, Weather.time + Weather.offset), 1)
 end
 Timer(Weather.cycle, Weather.time, 1)
 
 function Weather.getCurrentCycle()
-	triggerLatentClientEvent(client, "UCDphone.weather.onCycleChange", resourceRoot, Weather.curr or 10)
+	triggerLatentClientEvent(client, "CSGphone.weather.onCycleChange", resourceRoot, Weather.curr or 10)
 end
-addEvent("UCDphone.weather.getCurrentCycle", true)
-addEventHandler("UCDphone.weather.getCurrentCycle", root, Weather.getCurrentCycle)
+addEvent("CSGphone.weather.getCurrentCycle", true)
+addEventHandler("CSGphone.weather.getCurrentCycle", root, Weather.getCurrentCycle)
diff --git a/UCDphone/client.lua b/UCDphone/client.lua
index 925f040..f84955a 100644
--- a/UCDphone/client.lua
+++ b/UCDphone/client.lua
@@ -89,7 +89,8 @@ addEventHandler("onClientGUIClick", phone.button["home"],
 			-- Loop through all the apps in allapps (/apps/apps.lua)
 			for i, v in pairs(allapps) do
 				-- If it's visible
-				if (v.all and v.all[1].visible) then
+				--if (v.all and v.all[1].visible) then
+				if (v.all and v.open) then
 					-- Close it and open the main window
 					toggleApp(i)
 				end
@@ -120,6 +121,8 @@ local apps =
 	
 	[13] = {"Housing", "housing.png", {2, 0}},
 	[14] = {"Friends", "friends.png", {2, 1}},
+	[15] = {"Mail", "mail.png", {2, 2}},
+	[16] = {"Anims", "", {2, 3}},
 }
 
 -- Home screen
@@ -171,7 +174,7 @@ function togglePhone()
 		end
 	end
 end
-bindKey("b", "up", togglePhone)
+bindKey("b", "down", togglePhone)
 
 function openPhone()	
 	local now = getTickCount()
@@ -230,4 +233,4 @@ function onClickApp()
 		triggerEvent("UCDphone.onOpenApp", localPlayer, index)
 	end
 end
-addEventHandler("onClientGUIClick", phone.image["phone_window"], onClickApp)
+addEventHandler("onClientGUIClick", phone.image["phone_window"], onClickApp)
\ No newline at end of file
diff --git a/UCDphone/client.luac b/UCDphone/client.luac
deleted file mode 100644
index 1b3c282..0000000
Binary files a/UCDphone/client.luac and /dev/null differ
diff --git a/UCDphone/images/background.png b/UCDphone/images/background.png
new file mode 100644
index 0000000..869ac22
Binary files /dev/null and b/UCDphone/images/background.png differ
diff --git a/UCDphone/images/mail.png b/UCDphone/images/mail.png
new file mode 100644
index 0000000..616edb3
Binary files /dev/null and b/UCDphone/images/mail.png differ
diff --git a/UCDphone/meta.xml b/UCDphone/meta.xml
index cb7114f..0573346 100644
--- a/UCDphone/meta.xml
+++ b/UCDphone/meta.xml
@@ -1,7 +1,9 @@
 <meta>
 	<min_mta_version server="1.5.1"></min_mta_version>
     <info author="Noki" type="" name="" />
+	
 	<file src="iphone3.png"/>
+	<file src="images/background.png"/>
 	<file src="images/im.png"/>
 	<file src="images/browser.png"/>
 	<file src="images/calc.png"/>
@@ -16,9 +18,10 @@
 	<file src="images/money.png"/>
 	<file src="images/housing.png"/>
 	<file src="images/friends.png"/>
+	<file src="images/mail.png"/>
+	<!--><file src="images/anims.png"/><--!>
 	
-	
-	<script src="client.luac" type="client"/>
+	<script src="client.lua" type="client"/>
 	<!--<script src="server.lua" type="server"/>-->
 	
 	<script src="apps/im/im_c.lua" type="client"/>
@@ -29,13 +32,19 @@
 	<script src="apps/notes/notes_c.lua" type="client"/>
 	<script src="apps/clock/clock_c.lua" type="client"/>
 	<script src="apps/music/music_c.lua" type="client"/>
-	<!--<script src="apps/stocks/stocks_s.lua" type="server"/>-->
 	<script src="apps/stocks/stocks_c.lua" type="client"/>
 	<script src="apps/browser/browser_c.lua" type="client"/>
 	<script src="apps/friends/friends_s.lua" type="server"/>
 	<script src="apps/friends/friends_c.lua" type="client"/>
 	<script src="apps/weather/weather_s.lua" type="server"/>
 	<script src="apps/weather/weather_c.lua" type="client"/>
+	<script src="apps/mail/mail_s.lua" type="server"/>
+	<script src="apps/mail/mail_c.lua" type="client"/>
+	<script src="apps/housing/housing_s.lua" type="server"/>
+	<script src="apps/housing/housing_c.lua" type="client"/>
+	<script src="apps/settings/settings_c.lua" type="client"/>
+	<script src="apps/anims/anims_c.lua" type="client"/>
+	<script src="apps/anims/anims_s.lua" type="server"/>
 	
 	<script src="apps/apps.lua" type="client"/>
 	
diff --git a/UCDpns/client.lua b/UCDpns/client.lua
index 2957bd2..572905a 100644
--- a/UCDpns/client.lua
+++ b/UCDpns/client.lua
@@ -38,6 +38,7 @@ addEventHandler("onClientResourceStart", resourceRoot,
 			Blip.createAttachedTo(m, 63, nil, nil, nil, nil, nil, 0, 350)
 			addEventHandler("onClientMarkerHit", m, onMarkerHit)
 			addEventHandler("onClientMarkerLeave", m, onMarkerLeave)
+			m:setData("displayText", "Pay N Spray")
 		end
 	end
 )
diff --git a/UCDpns/server.lua b/UCDpns/server.lua
index 8a77693..9395e58 100644
--- a/UCDpns/server.lua
+++ b/UCDpns/server.lua
@@ -4,6 +4,9 @@ function process()
 		if (not vehicle or math.floor(vehicle.health) == 1000) then
 			return
 		end
+		if (not exports.UCDchecking:canPlayerDoAction(client, "PayNSpray")) then
+			return false
+		end
 		
 		local sPrice, ePrice
 		if (vehicle.health >= 800) then
diff --git a/UCDsafeZones/client.lua b/UCDsafeZones/client.lua
index a469378..9083a50 100644
--- a/UCDsafeZones/client.lua
+++ b/UCDsafeZones/client.lua
@@ -1,12 +1,56 @@
-local LS = createColTube(1181, -1324, 10, 30, 10) -- All Saints Hospital
+--[[
+local LS = createColRectangle(1155.9263, -1353.4421, 60, 60) -- All Saints Hospital
 local LS2 = createColRectangle(1996.9545, -1451.0143, 106, 80) -- Jefferson Hospital
 local SF = createColRectangle(-2745, 576, 135, 100) -- SF Hospital
 local LV = createColPolygon(1559, 1801, 1559, 1801, 1558, 1910, 1674, 1910, 1681, 1806) -- LV Hospital
 local jail = createColRectangle(3587, -1215, 260, 150)
 local LVMech = createColRectangle(1937.5712, 2140.3237, 45, 40)
 local LVRecovery = createColRectangle(1718.4382, 1993.0917, 38, 50)
+--]]
 
-local sZone = {LS, JF, SF1, LV, LS2, jail, LVMech, LVRecovery}
+local zones = {
+	{createColRectangle, 3587, -1215, 260, 150}, -- #1 is always jail
+	
+	{createColRectangle, 1155.9263, -1353.4421, 60, 60},
+	{createColRectangle, 1996.9545, -1451.0143, 106, 80},
+	{createColRectangle, -2745, 576, 135, 100},
+	{createColRectangle, 1559, 1801, 115, 109},
+	{createColRectangle, 1937.5712, 2140.3237, 45, 40},
+	{createColRectangle, 1718.4382, 1993.0917, 38, 50},
+}
+
+local sZone = {}
+local jail, radarAreas
+
+for i, data in ipairs(zones) do
+	local zone = data[1](data[2], data[3], data[4], data[5])
+	table.insert(sZone, zone)
+	
+	if (i == 1) then
+		jail = zone
+	end
+end
+
+function enable(new)
+	if (new == "Yes") then
+		if (radarAreas) then return end
+		radarAreas = {}
+		for i, data in ipairs(zones) do
+			radarAreas[i] = createRadarArea(data[2], data[3], data[4], data[5], 0, 200, 0, 85)
+		end
+	else
+		if (not radarAreas) then return end
+		for i, v in ipairs(radarAreas) do
+			v:destroy()
+		end
+		radarAreas = nil
+	end
+end
+enable(exports.UCDsettings:getSetting("saferadarareas"))
+
+--local sZone = {LS, JF, SF1, LV, LS2, jail, LVMech, LVRecovery}
+
+-- addCommandHandler("safe", function() outputDebugString(tostring(LS.radius)) end)
 
 function isElementWithinSafeZone(element)
 	if not isElement(element) then return false end
diff --git a/UCDsafeZones/meta.xml b/UCDsafeZones/meta.xml
index 6202a1d..8a4b443 100644
--- a/UCDsafeZones/meta.xml
+++ b/UCDsafeZones/meta.xml
@@ -1,2 +1,2 @@
 <meta>
	<min_mta_version server="1.5.1" client="1.5.1"/>
-	<script src="server.lua" type="server"/>
	<script src="client.lua" type="client"/>
	
	<export function="isElementWithinSafeZone" type="client"/>
	<export function="isElementWithinSafeZone" type="server"/>
	<export function="getJail" type="server"/>
	
	<oop>true</oop>
</meta>
\ No newline at end of file
+	<script src="server.lua" type="server"/>
	<script src="client.lua" type="client"/>
	
	<export function="isElementWithinSafeZone" type="client"/>
	<export function="enable" type="client"/>
	<export function="isElementWithinSafeZone" type="server"/>
	<export function="getJail" type="server"/>
	
	<oop>true</oop>
</meta>
\ No newline at end of file
diff --git a/UCDsafeZones/server.lua b/UCDsafeZones/server.lua
index a26220f..d148836 100644
--- a/UCDsafeZones/server.lua
+++ b/UCDsafeZones/server.lua
@@ -1,16 +1,31 @@
-local LS = createColTube(1181, -1324, 10, 30, 10) -- All Saints Hospital
-local LS2 = createColRectangle(1996.9545, -1451.0143, 106, 80) -- Jefferson Hospital
-local SF = createColRectangle(-2745, 576, 135, 100) -- SF Hospital
-local LV = createColPolygon(1559, 1801, 1559, 1801, 1558, 1910, 1674, 1910, 1681, 1806) -- LV Hospital
-local jail = createColRectangle(3587, -1215, 260, 150)
-local LVMech = createColRectangle(1937.5712, 2140.3237, 45, 40)
-local LVRecovery = createColRectangle(1718.4382, 1993.0917, 38, 50)
+local zones = {
+	{createColRectangle, 3587, -1215, 260, 150}, -- #1 is always jail
+	
+	{createColRectangle, 1155.9263, -1353.4421, 60, 60},
+	{createColRectangle, 1996.9545, -1451.0143, 106, 80},
+	{createColRectangle, -2745, 576, 135, 100},
+	{createColRectangle, 1559, 1801, 115, 109},
+	{createColRectangle, 1937.5712, 2140.3237, 45, 40},
+	{createColRectangle, 1718.4382, 1993.0917, 38, 50},
+}
 
-local sZone = {LS, JF, SF1, LV, LS2, jail, LVMech, LVRecovery}
+local sZone = {}
+local jail
+
+for _, data in ipairs(zones) do
+	local col = data[1](data[2], data[3], data[4], data[5])
+	table.insert(sZone, col)
+	
+	if (i == 1) then
+		jail = col
+	end
+end
+
+--local sZone = {LS, JF, SF1, LV, LS2, jail, LVMech, LVRecovery}
 
 function isElementWithinSafeZone(element)
-	if (not isElement(element)) then return false end
-	if (getElementDimension(element) ~= 0 ) or ( getElementInterior( element ) ~= 0) then return false end
+	if not isElement(element) then return false end
+	if (element.dimension ~= 0 or element.interior ~= 0) then return false end
 	for i, sZone in pairs(sZone) do
 		if (isElementWithinColShape(element, sZone)) then return true end
 	end
diff --git a/UCDsettings/effects.lua b/UCDsettings/effects.lua
new file mode 100644
index 0000000..5225f84
--- /dev/null
+++ b/UCDsettings/effects.lua
@@ -0,0 +1,23 @@
+function effects(setting, old, new)
+	if (eventName == "onClientSettingChange") then
+		if (setting == "farclipdist") then
+			setFarClipDistance(new)
+		elseif (setting == "fpslimit") then
+			setFPSLimit(new)
+		elseif (setting == "dxmsgs") then
+			exports.UCDdx:enable(new)
+		elseif (setting == "indicatetexts") then
+			exports.UCDworld:enable(new)
+		elseif (setting == "saferadarareas") then
+			exports.UCDsafeZones:enable(new)
+		end
+		return
+	end
+	setFarClipDistance(getSetting("farclipdist"))
+	setFPSLimit(getSetting("fpslimit"))
+	exports.UCDdx:enable(getSetting("dxmsgs"))
+	exports.UCDworld:enable(getSetting("indicatetexts"))
+	exports.UCDsafeZones:enable(getSetting("saferadarareas"))
+end
+addEventHandler("onClientSettingChange", localPlayer, effects)
+addEventHandler("onClientLoadSettings", localPlayer, effects)
\ No newline at end of file
diff --git a/UCDsettings/meta.xml b/UCDsettings/meta.xml
new file mode 100644
index 0000000..119d89c
--- /dev/null
+++ b/UCDsettings/meta.xml
@@ -0,0 +1,17 @@
+<meta>
+	<info author="Risk" name="Settings" version="1" description="Settings script for UCD"/>
+	
+	<script src="settings.lua" type="client"/>
+	<script src="effects.lua" type="client"/>
+	
+	<export function="getSetting" type="client"/>
+	<export function="getSettingCategory" type="client"/>
+	<export function="getSettingsCategories" type="client"/>
+	<export function="getSettingsData" type="client"/>
+	<export function="getSettingData" type="client"/>
+	<export function="setSetting" type="client"/>
+	<export function="getAllSettings" type="client"/>
+	<export function="isValueAcceptableForSetting" type="client"/>
+	
+	<oop>true</oop>
+</meta>
\ No newline at end of file
diff --git a/UCDsettings/settings.lua b/UCDsettings/settings.lua
new file mode 100644
index 0000000..e59af93
--- /dev/null
+++ b/UCDsettings/settings.lua
@@ -0,0 +1,215 @@
+local settings = {
+	-- ["category"] = {["settingName"] = {default = value, len = length, chars = {{from, to}, individual}}}
+	-- USE STRING.BYTE(CHAR) FOR ASII NUMBERS OF CHARACTERS
+	-- A-Z = 65, 90 | a-z 97, 122 | 0-9 = 48, 57 | 1-9 = 49, 57
+	-- EXAMPLES:
+	-- ["test1"] = {
+		-- ["test11"] = {name = "Test 11", desc = "Whether you're a kid1 or not.", default = "kid", len = 12, chars = {{65, 90}, {97, 122}}},
+	-- },
+	-- ["test2"] = {
+		-- ["test22"] = {name = "Test 22", desc = "Whether you're a kid2 or not.", default = "yea", len = 12, chars = {{65, 90}, {97, 122}, 32}},
+	-- },
+	-- ["test3"] = {
+		-- ["test33"] = {name = "Test 33", desc = "Whether you're a kid3 or not.", default = "noe", len = 12, chars = {{65, 90}, {97, 122}, 32}},
+	-- },
+	-- ["test4"] = {
+		-- ["test44"] = {name = "Test 44", desc = "Whether you're a kid4 or not.", default = "Yes", values = {"Yes", "No", "Maybe"}},
+	-- },
+	-- SETTINGS:
+	["World & performance"] = {
+		["farclipdist"] = {
+			name = "Far Clip Distance",
+			desc = "Set far clip distance(numbers only)\nLowering it results into better performance\nbut would lower the view distance.\nMin: 300 | Max: 99999 | Default: 860",
+			default = 860,
+			len = 5,
+			chars = {{48, 57}},
+			min = 300,
+			max = 99999
+		},
+		["fpslimit"] = {
+			name = "FPS Limit",
+			desc = "Set FPS limit(numbers only)\nIf your PC performance is good, increase it\nup to 60.\nATTENTION: More than 60 would cause\nsync bugs that's why max is 60.\nMin: 25 | Max: 60 | Default: 45",
+			default = 45,
+			len = 2,
+			chars = {{48, 57}},
+			min = 25,
+			max = 60
+		},
+	},
+	["Miscellaneous"] = {
+		["dxmsgs"] = {
+			name = "Enable DX Messages",
+			desc = "If you set this to 'No', DX messages will appear in chatbox instead.\nDefault: Yes",
+			default = "Yes",
+			values = {"Yes", "No"}
+		},
+		["indicatetexts"] = {
+			name = "Enable Indicate Texts",
+			desc = "If you set this to 'No', 3D indicate texts above markers will not appear.\nDefault: Yes",
+			default = "Yes",
+			values = {"Yes", "No"}
+		},
+		["saferadarareas"] = {
+			name = "Enable Safe Radar Areas",
+			desc = "If you set this to 'No', radar areas which belong to safe zones (in green color) will not appear.\nDefault: Yes",
+			default = "Yes",
+			values = {"Yes", "No"}
+		},
+	},
+}
+local loadedSettings = {}
+
+function loadSettings()
+	local xml = XML.load("settings.xml")
+	if (not xml) then
+		xml = XML("settings.xml", "settings")
+		xml:saveFile()
+	end
+	for category, settingsInCategory in pairs(settings) do
+		for setting, data in pairs(settingsInCategory) do
+			if (not xml:findChild(setting, 0)) then
+				xml:createChild(setting).value = data.default
+			end
+		end
+	end
+	for i, child in ipairs(xml.children) do
+		if (getSettingsData()[child.name]) then
+			local y, n = isValueAcceptableForSetting(child.value, child.name)
+			if (isValueAcceptableForSetting(child.value, child.name)) then
+				loadedSettings[child.name] = child.value
+			else
+				loadedSettings[child.name] = getSettingData(child.name).default
+			end
+		end
+	end
+	xml:unload()
+	triggerEvent("onClientLoadSettings", localPlayer)
+end
+Timer(loadSettings, 1000, 1)
+addEvent("onClientLoadSettings", true)
+
+function getSetting(setting)
+	if (not setting or type(setting) ~= "string" or not getSettingsData()[setting]) then
+		return false
+	end
+	return loadedSettings[setting]
+end
+
+function getSettingCategory(setting)
+	if (not setting or type(setting) ~= "string" or not getSettingsData()[setting]) then
+		return false
+	end
+	for category, settingsInCategory in pairs(settings) do
+		if (settingsInCategory[setting]) then
+			return category
+		end
+	end
+end
+
+function getSettingsCategories()
+	local temp = {}
+	for category in pairs(settings) do
+		table.insert(temp, category)
+	end
+	return temp
+end
+
+function getSettingData(setting)
+	if (not setting or type(setting) ~= "string" or not getSettingsData()[setting]) then
+		return false
+	end
+	return getSettingsData()[setting]
+end
+
+function getSettingsData()
+	local settingsData = {}
+	for category in pairs(settings) do
+		for setting, data in pairs(settings[category]) do
+			settingsData[setting] = data
+		end
+	end
+	return settingsData
+end
+
+function getAllSettings()
+	local allSettings = {}
+	for setting, value in pairs(loadedSettings) do
+		local category = getSettingCategory(setting)
+		if (not allSettings[category]) then
+			allSettings[category] = {}
+		end
+		allSettings[category][setting] = value
+	end
+	return allSettings
+end
+
+function setSetting(setting, value)
+	if (not setting or not value or type(setting)~= "string"or type(value) ~= "string" or not (loadedSettings[setting])) then
+		return false
+	end
+	local acceptable, msg = isValueAcceptableForSetting(value, setting)
+	if (not acceptable) then
+		return acceptable, msg
+	end
+	triggerEvent("onClientSettingChange", localPlayer, setting, getSetting(setting), value)
+	loadedSettings[setting] = value
+	return true
+end
+addEvent("onClientSettingChange", true)
+
+function isValueAcceptableForSetting(value, setting)
+	if (not setting or not value or type(setting)~= "string" or type(value) ~= "string" or value == "" or value == " " or #value:gsub(" ", "") == 0 or not getSettingsData()[setting]) then
+		return false
+	end
+	local data = getSettingData(setting)
+	local valueCheck = value
+	if (data.values) then
+		for _, allowedValue in ipairs(data.values) do
+			if (allowedValue == value) then
+				return true
+			end
+		end
+		return false
+	elseif (data.chars) then
+		local maxLen = getSettingData(setting).len
+		if (#value > maxLen) then
+			return false, "(Chars written)"..#value.." > "..maxLen.."(Max amount of chars)"
+		end
+		for _, allowed in ipairs(data.chars) do
+			if (type(allowed) == "table") then
+				local from, to = allowed[1], allowed[2]
+				for asii = from, to do
+					local char = string.char(asii)
+					valueCheck = valueCheck:gsub(char, "")
+				end
+			else
+				valueCheck = valueCheck:gsub(string.char(allowed), "")
+			end
+		end
+	end
+	if (data.min or data.max) then
+		local valueNum = tonumber(value)
+		if (valueNum) then
+			if (data.min and valueNum < data.min) then
+				return false, "(Value written)"..value.." < "..data.min.."(Minimum)"
+			end
+			if (data.max and valueNum > data.max) then
+				return false, "(Value written)"..value.." > "..data.max.."(Maximum)"
+			end
+		end
+	end
+	if (#valueCheck ~= 0) then
+		return false, "Unallowed character"..(#value > 1 and "s were" or " was").." written: "..value
+	end
+	return true
+end
+
+function saveSettings()
+	local xml = XML("settings.xml", "settings")
+	for setting, val in pairs(loadedSettings) do
+		xml:createChild(setting).value = val
+	end
+	xml:saveFile()
+	xml:unload()
+end
+addEventHandler("onClientResourceStop", resourceRoot, saveSettings)
\ No newline at end of file
diff --git a/UCDsql/mysql.lua b/UCDsql/mysql.lua
index a1bee4c..55979c3 100644
--- a/UCDsql/mysql.lua
+++ b/UCDsql/mysql.lua
@@ -1,38 +1,17 @@
 -- Have to make this a normal person with ability to do everything but delete, truncate, drop, empty etc
 local dbname = "mta"
-local host = "127.0.0.1"
-local usr = "noki"
-local passwd = "Network.114"
+local host = "noki.zorque.xyz"
+local usr = "root"
+local passwd = "Amazing69"
 
 db = Connection("mysql", "dbname="..dbname..";host="..host..";port=3306", usr, passwd)
---forum = Connection("mysql", "dbname=forum;host="..host..";port=3306", usr, passwd)
 
 function returnConnection()
-	if (not db) then
-		outputDebugString("Connection to the MySQL database [via 127.0.0.1:3306] failed! Trying ucdmta.com:3306...")
-		db = Connection("mysql", "dbname=mta;host=ucdmta.com;port=3306", "noki", "Network.114")
-		if (not db) then
-			outputDebugString("Connection to the MySQL database [via ucdmta.com:3306] failed! Trying noki.zorque.xyz:3306...")
-			db = Connection("mysql", "dbname=mta;host=noki.zorque.xyz;port=3306", "root", "Network.114")
-			if (not db) then
-				outputDebugString("Connection to the MySQL database [via noki.zorque.xyz:3306] failed! Trying 192.168.0.2:3306...")
-				db = Connection("mysql", "dbname=mta;host=192.168.0.2;port=3306", "root", "Network.114")
-				if (not db) then
-					outputDebugString("Connection to the MySQL database [via 192.168.0.2:3306] failed!")
-				else
-					outputDebugString("Connection to the MySQL database [via 192.168.0.2:3306] successful!")
-				end
-				return
-			else
-				outputDebugString("Connection to the MySQL database [via noki.zorque.xyz:3306] successful!")
-			end	
-			return
-		end
-		outputDebugString("Connection to the MySQL database [via ucdmta.com:3306] successful!")
+	if (db) then
+		outputDebugString("Connection to the MySQL established")
 		return
-	else
-		outputDebugString("Connection to the MySQL database [via localhost:3306] successful!")
 	end
+	outputDebugString("Couldn't connect to MySQL")
 end
 addEventHandler("onResourceStart", resourceRoot, returnConnection)
 
diff --git a/UCDstats/client.lua b/UCDstats/client.lua
index 912cf1b..38d3de2 100644
--- a/UCDstats/client.lua
+++ b/UCDstats/client.lua
@@ -25,10 +25,20 @@ local defaults = {
 	"Houses Robbed: ",
 	"Attempted Bank Robbieries: ", -- 25
 	"Successful Bank Robbieries: ", -- 26
+	"Criminal Rank: ", -- 27
 	"▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬",
-	"Total Drift Points: ", -- 28
-	"Best Drift: ", -- 29
+	"Total Drift Points: ", -- 29
+	"Best Drift: ", -- 30
+	"▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬",
+}
+--[[
+local nonJobs = {
+	[""] = true,
+	["Criminal"] = true,
+	["Gangster"] = true,
+	["Unoccupied"] = true,
 }
+--]]
 
 local selections = 0
 function resetSelections()
@@ -53,6 +63,16 @@ for i = 1, #defaults do
 end
 exports.UCDutil:centerWindow(GUIEditor.window)
 
+--function addJobRanks()	
+	local jobRankTable = exports.UCDjobsTable:getJobsRanks()
+	local i = #defaults + 1
+	for job in pairs(jobRankTable) do
+		GUIEditor.label[job] = GuiLabel(0, (i * 15) - 15, 262, 15, tostring(job).." Rank: ", false, GUIEditor.scrollpane[1])
+		i = i + 1
+	end
+--end
+--addEventHandler("onClientResourceStart", resourceRoot, addJobRanks)
+
 addEventHandler("onClientPlayerLogin", localPlayer,
 	function ()
 		refreshGridlist()
@@ -87,7 +107,6 @@ function toggleStatsWindow()
 	if (not exports.UCDaccounts:isPlayerLoggedIn(localPlayer)) then
 		return
 	end
-	
 	GUIEditor.window.visible = not GUIEditor.window.visible
 	if (GUIEditor.window.visible) then
 		showCursor(true)
@@ -95,7 +114,7 @@ function toggleStatsWindow()
 	end
 	showCursor(false)
 end
-addCommandHandler("stats", toggleStatsWindow)
+addCommandHandler("stats", toggleStatsWindow, false, false)
 addEventHandler("onClientGUIClick", GUIEditor.button[2], toggleStatsWindow, false)
 
 function selectPlayer()
@@ -148,7 +167,7 @@ function loadStats(data)
 		pt = tostring(h).."h, "..tostring(m).."m"
 	end
 	
-	GUIEditor.label[1].text = defaults[1]..source.name
+	GUIEditor.label[1].text = defaults[1]..tostring(source.name)
 	GUIEditor.label[2].text = defaults[2]..tostring(data["accName"])
 	GUIEditor.label[3].text = defaults[3]..tostring(source:getData("Occupation"))
 	GUIEditor.label[4].text = defaults[4]..tostring(data["group"])
@@ -171,8 +190,14 @@ function loadStats(data)
 	GUIEditor.label[24].text = defaults[24]..tostring(data["housesRobbed"])
 	GUIEditor.label[25].text = defaults[25]..tostring(data["attemptBR"])
 	GUIEditor.label[26].text = defaults[26]..tostring(data["successBR"])
-	GUIEditor.label[28].text = defaults[28]..tostring(data["totalDrift"])
-	GUIEditor.label[29].text = defaults[29]..tostring(data["bestDrift"])
+	GUIEditor.label[27].text = defaults[27]..tostring(data["crimRank"]).." ("..tostring(exports.UCDutil:tocomma(data["crimXP"])).." XP)"
+	GUIEditor.label[29].text = defaults[29]..tostring(data["totalDrift"])
+	GUIEditor.label[30].text = defaults[30]..tostring(data["bestDrift"])
+	for job, rank in pairs(data["jobRanks"]) do
+		if (GUIEditor.label[job]) then
+			GUIEditor.label[job].text = tostring(tostring(job).." Rank: L"..tostring(rank or 0).." ("..tostring(jobRankTable[job][rank].name)..")")
+		end
+	end
 end
 addEvent("UCDstats.loadStats", true)
 addEventHandler("UCDstats.loadStats", root, loadStats)
diff --git a/UCDstats/server.lua b/UCDstats/server.lua
index 6e354ed..81237ca 100644
--- a/UCDstats/server.lua
+++ b/UCDstats/server.lua
@@ -33,13 +33,23 @@ function getPlayerStats(plr)
 		local successBR = getPlayerAccountStat(plr, "successBR") or 0
 		local attemptBR = getPlayerAccountStat(plr, "attemptBR") or 0
 		local money = plr.money or 0
+		local crimRank = exports.UCDcriminal:getPlayerCriminalRank(plr) or 0
+		local crimXP = exports.UCDaccounts:GAD(plr, "crimXP")
+		
+		local jobRanks = exports.UCDjobsTable:getJobsRanks()
+		local ranksTable = {}
+		for job in pairs(jobRanks) do
+			local rank = exports.UCDjobs:getPlayerJobRank(plr, job)
+			ranksTable[job] = rank
+		end
 		
 		local temp = {
 			group = group, groupRank = rank, wanted = wanted, cash, country, ping, accName = plr.account.name,
 			kills = kills, deaths = deaths, kdr = kdr, totalfired = totalfired, totalguns = totalguns, wl = wl,
 			ap = ap, arrests = arrests,	timesArrested = timesArrested, lifetimeWanted = lifetimeWanted,
 			killArrests = killArrests, housesRobbed = housesRobbed, bestDrift = bestDrift, totalDrift = totalDrift,
-			attemptBR = attemptBR, successBR = successBR, money = money
+			attemptBR = attemptBR, successBR = successBR, money = money, jobRanks = ranksTable, crimXP = crimXP,
+			crimRank = crimRank
 		}
 		triggerLatentClientEvent(client, "UCDstats.loadStats", plr, temp or {})
 	end
diff --git a/UCDstocks/server.lua b/UCDstocks/server.lua
index 4529424..ff4d1f3 100644
--- a/UCDstocks/server.lua
+++ b/UCDstocks/server.lua
@@ -259,28 +259,42 @@ end
 addEvent("onStockMarketUpdate")
 addEventHandler("onStockMarketUpdate", root, onStockMarketUpdate)
 
+function calculatePrice(name)
+	if (not name) then
+		return false
+	end
+	if (not stocks or not stocks[name]) then
+		return false
+	end
+	if (not stocks[name]["price"]) then
+		return false
+	end
+	
+	local currPrice = stocks[name]["price"]
+	local percent = {}
+	
+	percent[90] = currPrice * 0.9
+	percent[110] = currPrice * 1.1
+	
+	local low = math.random(percent[90], currPrice)
+	local high = math.random(currPrice, percent[110])
+	
+	local newPrice = math.random(low, high)
+	
+	return newPrice
+end
+
 function updateStockMarket()
 	for name in pairs(stocks) do
-		local currPrice = stocks[name]["price"]
-		local percent = {}
-		percent[80] = currPrice * 0.8
-		percent[120] = currPrice * 1.2
-		local low = math.random(percent[80], currPrice)
-		local high = math.random(currPrice, percent[120])
-		
-		-- If stocks fuck up, let's given them a bit of a boost and get them out of that low range
-		if (percent[80] < 1) then
-			percent[80] = 2
-		end
-		if (percent[120] < 1) then
-			percent[120] = 5
-		end
-		local newPrice = math.random(low, high)
-		if (newPrice < 1) then
-			newPrice = 2
+		if (not stocks or not stocks[name]) then
+			return false
 		end
+	
+		local newPrice
+		repeat newPrice = calculatePrice(name)
+		until newPrice >= 50
 		
-		stocks[name]["prev"] = currPrice
+		stocks[name]["prev"] = stocks[name]["price"]
 		stocks[name]["price"] = newPrice
 		appendStockHistory(name)
 	end
@@ -289,7 +303,7 @@ function updateStockMarket()
 	for _, plr in ipairs(Element.getAllByType("player")) do exports.UCDdx:new(plr, "The stock market has updated - press F7 to view", 255, 255, 255) end
 end
 addCommandHandler("fuckstocks", function (plr) if (exports.UCDadmin:isPlayerAdmin(plr)) then updateStockMarket() end end)
-Timer(updateStockMarket, 900000, 0)
+--Timer(updateStockMarket, 900000, 0)
 
 function appendStockHistory(stockName)
 	local price = stocks[stockName]["price"]
@@ -311,3 +325,21 @@ function getHistory(stockName)
 end
 addEvent("UCDstocks.getHistory", true)
 addEventHandler("UCDstocks.getHistory", root, getHistory)
+
+function refundAll(plr)
+	if (exports.UCDadmin:isPlayerAdmin(plr)) then
+		local result = db:query("SELECT acronym, amount, account FROM stocks__holders"):poll(-1)
+		for k, v in ipairs(result) do
+			local price = v.amount * stocks[v.acronym]["price"]
+			if (Account(v.account)) then
+				if (Account(v.account).player) then
+					Account(v.account).player.money = Account(v.account).player.money + price
+				else
+					exports.UCDaccounts:SAD(v.account, "money", exports.UCDaccounts:GAD(v.account, "money") + price)
+				end
+				outputDebugString("Refunding "..tostring(v.account).." $"..tostring(exports.UCDutil:tocomma(price)).." ("..tostring(v.amount)..") worth of "..tostring(v.acronym))
+			end
+		end
+	end
+end
+addCommandHandler("refunderino", refundAll)
diff --git a/UCDutil/clientExports.lua b/UCDutil/clientExports.lua
index 59ed643..b6e7b87 100644
--- a/UCDutil/clientExports.lua
+++ b/UCDutil/clientExports.lua
@@ -1,3 +1,10 @@
+function formatMil(mil)
+	if not mil then mil = 0 end
+	local secs = math.floor(mil / 1000 % 60)
+	local mins = math.floor(mil / 1000 / 60 % 60)
+	return string.format("%02d:%02d", mins, secs)
+end
+
 function getCityZoneFromXYZ(x, y, z)
 	local theZone = getZoneName(x, y, z, true)
 	if (theZone) then
diff --git a/UCDutil/meta.xml b/UCDutil/meta.xml
index 21e0571..6120701 100644
--- a/UCDutil/meta.xml
+++ b/UCDutil/meta.xml
@@ -22,6 +22,8 @@
 	<export function="getTimeStamp" type="server"/>
 	<export function="mathround" type="client"/>
 	<export function="mathround" type="server"/>
+	<export function="formatMil" type="client"/>
+	<export function="formatMil" type="server"/>
 	<export function="randomstring" type="server"/>
 	<export function="randomstring" type="client"/>
 	<export function="centerWindow" type="client"/>
diff --git a/UCDutil/serverExports.lua b/UCDutil/serverExports.lua
index 9a93a27..cddc423 100644
--- a/UCDutil/serverExports.lua
+++ b/UCDutil/serverExports.lua
@@ -1,3 +1,10 @@
+function formatMil(mil)
+	if not mil then mil = 0 end
+	local secs = math.floor(mil / 1000 % 60)
+	local mins = math.floor(mil / 1000 / 60 % 60)
+	return string.format("%02d:%02d", mins, secs)
+end
+
 function getCityZoneFromXYZ(x, y, z)
 	local theZone = getZoneName(x, y, z, true)
 	if (theZone) then
@@ -101,8 +108,8 @@ end
 function secondsToHoursMinutes(seconds)
 	local hours   = math.floor (seconds / (60 * 60))
 	local minutes = math.floor ((seconds / 60) % 60)
-	local hours         = (hours < 10 and 0 .. hours) or hours
-	local minutes       = (minutes < 10 and 0 .. minutes) or minutes
+	local hours   = (hours < 10 and 0 .. hours) or hours
+	local minutes = (minutes < 10 and 0 .. minutes) or minutes
 	return hours..":"..minutes
 end
 
diff --git a/UCDvehicleShops/client.lua b/UCDvehicleShops/client.lua
index 3f9461b..afcecb7 100644
--- a/UCDvehicleShops/client.lua
+++ b/UCDvehicleShops/client.lua
@@ -62,7 +62,9 @@ for i, info in ipairs(markers) do
 		exports.UCDblips:setCustomBlipStreamRadius(b, 50)
 	else
 		Blip.createAttachedTo(m, blips[info.t], 2, 0, 0, 0, 0, 0, 300)
-	end	
+	end
+	
+	m:setData("displayText", "Vehicle Store ("..tostring(info.t)..")")
 	
 	addEventHandler("onClientMarkerHit", m, onHitShopMarker)
 	addEventHandler("onClientMarkerLeave", m, onLeaveShopMarker)
diff --git a/UCDwanted/server.lua b/UCDwanted/server.lua
index e28ebc3..0d3ef4e 100644
--- a/UCDwanted/server.lua
+++ b/UCDwanted/server.lua
@@ -58,7 +58,9 @@ function setWantedPoints(plr, wp)
 		plr:setData("w", wantedPoints[a])
 		triggerEvent("onPlayerWPChange", plr, wantedPoints[a])
 		-- For MDTs
-		triggerClientEvent(Team.getFromName("Law").players, "UCDmdt.onPlayerWPChange", plr)
+		if (Team.getFromName("Law") and Team.getFromName("Law").players and #Team.getFromName("Law").players >= 1) then
+			triggerClientEvent(Team.getFromName("Law").players or {}, "UCDmdt.onPlayerWPChange", plr)
+		end
 		return true
 	end
 end
@@ -100,6 +102,7 @@ function onPlayerWPChange(wp)
 	else
 		exports.UCDdx:del(source, "wp")
 	end
+	triggerClientEvent("UCDmdt.onPlayerWPChange", resourceRoot)
 end
 addEvent("onPlayerWPChange")
 addEventHandler("onPlayerWPChange", root, onPlayerWPChange)
diff --git a/UCDworld/c_world.lua b/UCDworld/c_world.lua
deleted file mode 100644
index af0675a..0000000
--- a/UCDworld/c_world.lua
+++ /dev/null
@@ -1,60 +0,0 @@
-setBlurLevel(0)
-setBirdsEnabled(false)
-
---[[function setWaterColour(cmd, r, g, b)
-	if not (r) then outputChatBox("You must enter 3 numbers between 0 and 255") return end
-	setWaterColor(tonumber(r), tonumber(g), tonumber(b))
-	outputChatBox("You changed the water colour to: "..r..", "..g..", "..b.."")
-end
-addCommandHandler("water", setWaterColour)
-
-function setWeatherToNumber(cmd, id)
-	if not id then outputChatBox("You must enter a number") return end
-	setWeather(tonumber(id))
-	outputChatBox("Weather changed to: "..id.."")
-end
-addCommandHandler("weather", setWeatherToNumber)]]--
-
--- Backup
---[[
-function setClientTime(cmd, newTime)
-    newTime = tonumber(newTime)
-    if not newTime then outputChatBox("Enter a number between 0 and 23") return end
-    if (newTime > 23) or (newTime < 0) then
-        outputChatBox("You must enter a number between 0 and 23.")
-        return
-    end
-    setTime(tonumber(newTime), 0)
-end
-addCommandHandler("settime", setClientTime)
---]]
-
-function setClientTime(cmd, newHr, newMin)
-	newHr, newMin = tonumber(newHr), tonumber(newMin)
-	if (not newHr) then
-		exports.UCDdx:new("You must enter a new time", 255, 0, 0)
-		return false
-	end
-	if (newHr > 24) or (newHr < 0) then
-		exports.UCDdx:new("There's 24 hours in a day...", 255, 0, 0)
-		return false
-	end
-	if (newMin) and (not newHr) then
-		-- This is probably really fucking stupid so idk why it's in here
-		return false
-	end
-    setTime(newHr, newMin)
-end
-addCommandHandler("settime", setClientTime)
-
-function movePlayerHead()
-	for _, players in ipairs(Element.getAllByType("player")) do
-		local w, h = guiGetScreenSize()
-		local lookatX, lookatY, lookatZ = getWorldFromScreenPosition(w / 2, h / 2, 10)
-		if (type(lookatX) ~= "number" or type(lookatY) ~= "number" or type(lookatZ) ~= "number") then return end
-		setPedLookAt(players, lookatX, lookatY, lookatZ)
-	end
-end
-addEventHandler("onClientRender", root, movePlayerHead)
-
------------------------------------------
diff --git a/UCDworld/markers.lua b/UCDworld/markers.lua
new file mode 100644
index 0000000..06092b6
--- /dev/null
+++ b/UCDworld/markers.lua
@@ -0,0 +1,33 @@
+function goThroughMarkers()
+	for i, m in ipairs(Element.getAllByType("marker")) do
+		if (m:getData("displayText")) then
+			local x, y, z = m.position.x, m.position.y, m.position.z
+			local offset = 75
+			local distance = getDistanceBetweenPoints3D(x, y, z, localPlayer.position)
+			local cx, cy, cz = getCameraMatrix()
+			if (distance <= offset) then
+				if (isLineOfSightClear(cx, cy, cz, x, y, z + 1, _, _, _, _, _, _, _, localPlayer)) then
+					local sX, sY = getScreenFromWorldPosition(x, y, z + 1, 0.06)
+					if (sX and sY) then
+						local scale = 1 / ((1 / 3) * (distance / offset))
+
+						dxDrawText(tostring(m:getData("displayText")), sX + 1, sY - 30 + 1, sX + 1, sY - 30 + 1, tocolor(0, 0, 0, 255), math.min (0.4 * (offset/distance) * 1.4, 4), "default-bold", "center", "bottom", false, false, false)
+						dxDrawText(tostring(m:getData("displayText")), sX + 1, sY - 30 + 1, sX - 1, sY - 30 + 1, tocolor(0, 0, 0, 255), math.min (0.4 * (offset/distance) * 1.4, 4), "default-bold", "center", "bottom", false, false, false)
+						dxDrawText(tostring(m:getData("displayText")), sX - 1, sY - 30 - 1, sX + 1, sY - 30 - 1, tocolor(0, 0, 0, 255), math.min (0.4 * (offset/distance) * 1.4, 4), "default-bold", "center", "bottom", false, false, false)
+						dxDrawText(tostring(m:getData("displayText")), sX - 1, sY - 30 - 1, sX - 1, sY - 30 - 1, tocolor(0, 0, 0, 255), math.min (0.4 * (offset/distance) * 1.4, 4), "default-bold", "center", "bottom", false, false, false)
+
+						dxDrawText(tostring(m:getData("displayText")), sX, sY - 30, sX, sY - 30, tocolor(255, 255, 255, 255), math.min (0.4 * (offset/distance) * 1.4, 4), "default-bold", "center", "bottom", false, false, false)
+					end
+				end
+			end
+		end
+	end
+end
+
+function enable(new)
+	removeEventHandler("onClientRender", root, goThroughMarkers)
+	if (new == "Yes") then
+		addEventHandler("onClientRender", root, goThroughMarkers)
+	end
+end
+enable(exports.UCDsettings:getSetting("indicatetexts"))
\ No newline at end of file
diff --git a/UCDworld/meta.xml b/UCDworld/meta.xml
index c7bf4ac..ff8ad23 100644
--- a/UCDworld/meta.xml
+++ b/UCDworld/meta.xml
@@ -1,7 +1,10 @@
 <meta>
 	<info author="Noki" version="1" name="world" type="script" />
-	<script src="world.lua" type="server" />
-	<script src="c_world.lua" type="client" />
+	
+	<script src="markers.lua" type="client" />
 	<script src="exploitObjects.lua" type="client" />
+	
+	<export function="enable" type="client"/>
+	
 	<oop>true</oop>
 </meta>
diff --git a/UCDworld/world.lua b/UCDworld/world.lua
deleted file mode 100644
index 50cdcbd..0000000
--- a/UCDworld/world.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-removeWorldModel( 16740, 5000, 0, 0, 0 )
-removeWorldModel( 16741, 5000, 0, 0, 0 )
-removeWorldModel( 16742, 5000, 0, 0, 0 )
-removeWorldModel( 16743, 5000, 0, 0, 0 )
-removeWorldModel( 16744, 5000, 0, 0, 0 )
-removeWorldModel( 16745, 5000, 0, 0, 0 )
-removeWorldModel( 16746, 5000, 0, 0, 0 )
-removeWorldModel( 16747, 5000, 0, 0, 0 )
-
-removeWorldModel( 16735, 5000, 0, 0, 0 )
-removeWorldModel( 16736, 5000, 0, 0, 0 )
-removeWorldModel( 16737, 5000, 0, 0, 0 )
-removeWorldModel( 16738, 5000, 0, 0, 0 )
-removeWorldModel( 16739, 5000, 0, 0, 0 )
\ No newline at end of file
diff --git a/login idea.txt b/login idea.txt
deleted file mode 100644
index fe3c1fd..0000000
--- a/login idea.txt	
+++ /dev/null
@@ -1,7 +0,0 @@
-login panel, have two methods of logging in
-
-1. account name 
-2. last used name
-
-misc ideas
-- when someone is mentioned in chat, have a sound that plays to that specific person who got mentioned
\ No newline at end of file
diff --git a/rules.txt b/rules.txt
index 98775e8..7c61816 100644
--- a/rules.txt
+++ b/rules.txt
@@ -7,4 +7,4 @@ Union of Clarity and Diversity
 5. Transactions which are not automated (ie not processed through an in-game system) are not allowed.
 6. Speak only English in the general chats (global, team and support). Languages other than English may be spoken in other chats.
 7. Respect all rational requests given by an administrator.
-8. Do not deathmatch players or vehicles outside of Las Venturas.
\ No newline at end of file
+8. Do not deathmatch players or vehicles outside of Las Venturas.
diff --git a/updates.txt b/updates.txt
new file mode 100644
index 0000000..f9dfef8
--- /dev/null
+++ b/updates.txt
@@ -0,0 +1,207 @@
+Saturday, 17th December 2016
+- Various bug fixes in groups panel. (Risk)
+- Optimized chat slightly. (Risk)
+- Admins now can use view player weapons and shout functions. (Risk)
+
+Friday, 16th December 2016
+- Fixed some features having no effects when they restart. (Risk)
+- Added a setting to disable safe zones radar areas. (Risk)
+- Made settings panel in phone wider now so you see full setting names. (Risk)
+- Fixed most of 3D texts on markers not showing. (Risk)
+- Added a setting to disable 3D texts on markers. (Risk)
+- Optimized warp points code. (Risk)
+- Moved the vehicle spawn GUI to the right of the screen to be less obtrustive to a player's view. (Noki)
+- Optimized mafia wars slightly. (Noki)
+- There is now 3D text on some markers indicating what they are (eg: 'Aviator Vehicles (Small)', 'Pay N Spray', 'Free Vehicles'), so as to avoid confusion. (Noki)
+- Added radar areas to all safe zones around San Andreas. Text on the F11 map and radar will be added as to not confuse them with turfs. (Noki)
+- Added extra security checks to Pay N Spray. (Noki)
+- Miscellaneous fixes and appendages to the admin panel. (Noki)
+- Improvements to the set job panel, fixed cursor showing bug. (Noki + Risk)
+
+Thursday, 15th December 2016
+- Admins now can disable vehicles through admin panel. (Risk)
+- Admins now can view player punishments through admin panel. (Risk)
+
+Tuesday, 13th December 2016
+- Optimized admin panel code slightly. (Risk)
+- Fixed cursor showing bugs in F5 and set job panels. (Risk)
+- Added employment panel to start/end shift and quit job. (Noki + Risk)
+
+Monday, 12th December 2016
+- F5 criminal panel now displays a live countdown on the briefcase. (Noki)
+- Added a script that displays changes in your money on the side bar. (Noki)
+- Various bug fixes. (Risk + Noki)
+- Completed the housing app in the phone. (Noki)
+- We're back, baby. (Noki + Risk)
+
+Wednesday, 3rd August 2016
+- Changed the way the vehicle panel operates (Noki)
+- Various bug fixes (Risk)
+
+Tuesday, 2nd August 2016
+- Fixed the stock market appearing to have lost all of your stocks. It was just a small math error (Noki)
+- Fixed anyone being able to repair vehicles, not only mechanics (Noki)
+- Since people don't listen and don't take screenshots of their weapons and cry when they lose them, added a script that logs all your weapons everytime you disconnect, die or log in. Create a topic in the support board if yoy lose your weapons and do not cry in main chat about it (Noki)
+- Added a bank to deposit your money in (Risk)
+- Added /eject for ejecting people out of your vehicle (Risk)
+- Fixed turf levels being higher than 100 (Risk)
+
+Monday, 1st August 2016
+- Lowered the price of all weapons and their ammunition, except the minigun (Noki)
+- Robbing houses now gives a more appropriate amount of WP and criminal XP (Noki)
+- Enabled dual Uzis and Tec-9s but reduced the damage they give slightly (Noki)
+- Buffed the accuracy of the MP5 (Noki)
+- Reduced minigun damage and removed the ability to move and shoot with it (Noki)
+- Added /cleardx (Noki)
+- Modified the jail duration algorithm to be fairer. It is now WP * 6. So if you had 60 WP, you would be in jail for 360 seconds (Noki)
+- Fixed being able to take civilian jobs with high WP (Noki + Risk)
+- Fixed countries on the scoreboard being terribly inaccurate (Noki)
+- Changed the stocks algorithm to change in smaller amounts as compensation for it changing more often (Noki)
+- Fixed stock prices not updating and made them update every 15 minutes instead of 25 (Noki)
+- Aviator and trucker: You now get given 5% bonus if your vehicle has less than 5% damage and you lose 10% if your vehicle has more than 40% damage (Noki + alberto)
+- Fixed a bug where you could farm criminal XP and money by drifting (Noki)
+- Slightly lowered the pay aviator gives and upped the pay trucker gives (Noki)
+- Added the mechanic job (Noki)
+- Added a tazer for law enforcement (Risk)
+- Slightly increased the WP gained from taking a turf (Noki)
+- You now lose 1 wanted point per minute (Risk)
+- Added a safezone to the LV mechanic job (Noki + Jady)
+- Risk promoted to L3 (Noki)
+- Added a jail release for Las Venturas (Noki)
+- If there are less than 10 players in-game, you will receive 2k when taking a turf (Risk)
+- Added a side bar message showing your wanted points when you are wanted (Risk)
+- Added some more map fixes (Risk + Nixon)
+- Added spawn protection to turf respawns (Risk)
+- Added a briefcase delivery mission for criminals (Risk)
+- Added the ability to respawn in your group's turfs (Noki)
+- Fixed a typo in the aviator job (Noki + Cold)
+- Fixed not being able to unglue from vehicles (Noki)
+- Attempted a fix at losing weapons. Take screenshots of your weapons in case you lose them (Noki)
+- Reduced the WP the bankrob gives you, added crim XP for completing a bankrob and fixed a few other bankrob bugs (Noki)
+- Added /ircpm (Risk + Noki)
+- Fixed a few map bugs (Nixon + Noki)
+
+Sunday, 31st July 2016
+- A sound now plays every time you receive an IM (Noki)
+- Players who die in LV now always get respawned at the LV hospital instead of the Montgomery hospital (Noki)
+- You now get WP and criminal XP for taking turfs (Noki + Foley)
+- Fixed a paramedic money exploit, courtesy of Zorky (Risk)
+- Fixed being able to glue to vehicles to escape from jail (Noki + Risk)
+- Added some explanations and scenarios to the rules in order to help people understand them a bit more (Noki)
+- Fixed a bug where entering the bank rob marker would open the walkstyle GUI (Risk)
+- Increased the kilometres needed for each aviator rank (Noki)
+- Added to rule #3: "Maliciously disrupting other players' gameplay is strictly forbidden. This includes intentionally avoiding in-game situations." (Noki + Ruller)
+- You don't receive money for holding turfs if there are less than 10 players online (Noki)
+- Added walking styles and fighting styles to gyms around San Andreas (Risk)
+- Fixed a bug in turfing where you had to be constantly moving to receive payment (Noki)
+- Turfs now save to the database, including who owns the turf. So we can make changes and you won't lose your turfs (Noki)
+- Ruller promoted to L4 (Noki)
+
+Saturday, 30th July 2016
+- Fixed an ammunation bug that allowed people to get any weapon for free (Noki)
+- Fixed some job vehicles spawning into the ground (Noki)
+- Changed the blip for marking your own vehicles to the bulldozer to avoid confusion with the vehicle shops (Noki + HellStunter)
+- Added some more vehicle spawner locations (Metall)
+- Fixed a bug where you could not promote/demote/warn members with special characters in their account name like dots or hyphens (Noki)
+- Fixed not being able to sell stocks (Noki)
+- AFK players will not longer receive turfing payouts every 5 minutes (Noki)
+- Fixed not being able to repair planes at airport Pay N Sprays (Noki)
+- Fixed your vehicle being destroyed when going between LS and LV as a criminal/gangster (Noki)
+- Fixed some cases where your vehicle would be destroyed (Risk + Noki)
+- Added /advert (Risk)
+- Added alliance chat: /ac msg (Noki)
+- Added group blips (Risk)
+- Fixed an abuseable paramedic bug (Risk)
+- Fixed jailed players being able to escape jail in a vehicle (Noki)
+- Fixed a bug where muted players could talk in the support channel (Noki)
+- Added a vehicle cruise script (Cold)
+- Fixed an abuseable ammunation bug, courtesy of papi (Risk)
+- Fixed a bug where you would not get the spraycan as a medic (Noki)
+- Fixed a bug where some vehicles would be free to buy (Noki)
+- Increased turf payment slightly (Noki)
+- Changed the colour of IMs to a light red (Noki + Pipi)
+- Removed some objects at KACC Military Fuels that blocked access to the turf (Noki)
+- Fixed a bug where everyone was able to drift (Noki)
+
+Friday, 29th July 2016
+- Added vehicle recovery locations around San Andreas (Noki)
+- Added a support channel - /support <question> (Risk)
+- Added vehicle spawners for paramedics (Risk)
+- Added 200 more destinations for helicopters in the aviator job (Dustin)
+- Added more vehicles to vehicle shops around San Andreas (Dustin)
+- Fixed a bug where your criminal XP would be only that from the last crime you committed (Noki)
+- You now get wanted for drifting as it's now a criminal activity (Noki)
+- Drifting now gives crim XP upon beating your previous best score (Noki)
+
+Thursday, 28th July 2016
+- Fixed blip bugs (Risk)
+- Added some admin utility commands (Risk)
+- Added the updates log to the login interface (Noki)
+- Fixed a bug that would prevent people from creating groups (Noki)
+- [Forum] Configured the mail server to send emails to members (Noki)
+
+Wednesday, 27th July 2016
+- Added a paramedic job with a side mission where you must heal peds (Risk)
+
+Tuesday, 26th July 2016
+- Added a bar on the top right of your screen which display ping, FPS and uptime (Noki)
+- Added coordinates for house rob items to every interior (Dustin + Noki)
+- Admins now have the ability to unjail and unmute players (Noki)
+- Added an F5 panel for criminals which includes their current criminal XP, criminal rank, information about the job, activities and details about events like the bank robbery (Noki)
+- Fixed a bug where the phone's friend list would not display new friends (Risk)
+
+Monday, 25th July 2016
+- Mapped some houses (PutQ)
+- Added a forum rule which outlaws "heavy flaming". You are still able to flame if you like, but don't be cruel to someone (Ruller + Noki)
+- Added animations to the login interface (Noki)
+- Redesigned the login interface (Noki)
+
+Sunday, 24th July 2016
+- Added warp points for admins (HellStunter)
+
+Friday, 22nd July 2016
+- Updated and added new vehicle prices (Dustin)
+- IRC is now fully set up and synchronized with the in-game chat. #ucd and #ucd.echo on irc.gtanet.com (Noki)
+
+Thursday, 21st July 2016
+- [Forum] Because we believe that players have a right to know, the <a href="http://forum.ucdmta.com/index.php?action=adminlog">admin log</a> is now viewable (Noki)
+- PutQ added as a L2 Admin (Noki + Zed)
+- Finally fixed the sockets module which	 lets the server talk to IRC - big thanks to MTA developer sbx320. IRC Echo will be coming tomorrow. (Noki)
+
+Wednesday, 20th July 2016
+- Added a set job function for admins (Risk + Noki)
+
+Tuesday, 19th July 2016
+- Bank robbing stats are now saved and visible in /stats (Noki)
+- Fixed a bug where people's money would appear wrong in /stats (Noki)
+- Criminals now get WP for attacking and killing law enforcement (Risk)
+- [Forum] Added progress bar and spoiler tag BBCode (Noki)
+- [Forum] Avatars are now resized to 180 x 180 if they are too big (Noki)
+- HellStunter added as a L1 Admin (Noki + Zed)
+- Cold added as a L1 Admin (Noki)
+
+Monday, 18th July 2016
+- You are able to earn money from drifting in San Fierro. Not complete. (Noki)
+- Ruller added as a L3 Admin (Noki)
+
+Saturday, 16th July 2016
+- Fixed an issue where you would purchase the wrong guns in ammunation (Noki)
+- Bank robbery: Criminals now must wait out the full time of the bank robbery when killing all police. Also added the classic /banktime command. (Noki)
+- Fixed some bugs in the stats panel (Noki)
+- Vast improvements to the MDT system (Noki)
+- Risk added as a L2 Admin and Developer (Noki)
+
+Friday, 15th July 2016
+- Metall added as a L4 Admin and Developer (Noki)
+- Added a MDT (Mobile Data Terminal - also known as a police computer) (Noki)
+- iAssassin added as a L3 Admin (Noki)
+- Added admin permissions to the in-game admin panel (Noki)
+- [Forum] Added an upvote/downvote mod to the following boards: Ideas & Suggestions, Media and Modifications (Noki)
+- Fixed an object on the cop side of the bank robbery having no collision (Noki)
+- The mods system now supports replacement of .col files (Noki)
+- mthn06 added as a L2 Admin (Noki)
+
+Thursday, 14th July 2016
+- Opened forum (Noki)
+- Small optimizations to account system (Noki)
+