From e830d8d5178b4491aa9f608f274674d7c8d51dea Mon Sep 17 00:00:00 2001
From: Git <git@what.cd>
Date: Thu, 11 Oct 2012 08:00:15 +0000
Subject: [PATCH] Empty commit

---
 classes/ajax_start.php                        |    4 +-
 classes/class_artist.php                      |   18 +-
 classes/class_artists.php                     |  274 ++
 classes/class_artists_similar.php             |  155 +-
 classes/class_cache.php                       |   45 +-
 classes/class_charts.php                      |    2 +-
 classes/class_debug.php                       |   14 +-
 classes/class_format.php                      |  396 +++
 classes/class_invite_tree.php                 |   22 +-
 classes/class_irc.php                         |   12 +-
 classes/class_misc.php                        |  395 +++
 classes/class_mysql.php                       |    4 +-
 classes/class_permissions.php                 |  100 +
 classes/class_requests.php                    |  120 +
 classes/class_sphinxql.php                    |   20 +-
 classes/class_text.php                        |    8 +-
 classes/class_text2.php                       |    2 +-
 classes/class_tools.php                       |  239 ++
 classes/class_torrent_form.php                |   14 +-
 classes/class_torrents.php                    |  481 ++++
 classes/class_tracker.php                     |   73 +
 classes/class_users.php                       |  452 +++
 classes/class_view.php                        |   73 +
 classes/class_zip.php                         |    2 +-
 classes/script_start.php                      | 2417 +----------------
 classes/util.php                              |   95 +
 design/privatefooter.php                      |    2 +-
 design/privateheader.php                      |    6 +-
 image.php                                     |    2 +-
 sections/ajax/artist.php                      |   28 +-
 sections/ajax/better/single.php               |    2 +-
 sections/ajax/better/transcode.php            |    6 +-
 sections/ajax/bookmarks/torrents.php          |    6 +-
 sections/ajax/browse.php                      |    8 +-
 sections/ajax/forum/forum.php                 |    8 +-
 sections/ajax/forum/main.php                  |    2 +-
 sections/ajax/forum/thread.php                |   10 +-
 sections/ajax/inbox/inbox.php                 |    6 +-
 sections/ajax/inbox/viewconv.php              |    2 +-
 sections/ajax/notifications.php               |    6 +-
 sections/ajax/request.php                     |   12 +-
 sections/ajax/requests.php                    |   12 +-
 sections/ajax/subscriptions.php               |    2 +-
 sections/ajax/tcomments.php                   |    6 +-
 sections/ajax/top10/torrents.php              |    2 +-
 sections/ajax/torrentgroup.php                |    2 +-
 sections/ajax/userhistory/post_history.php    |    4 +-
 sections/ajax/usersearch.php                  |    4 +-
 sections/artist/add_alias.php                 |    6 +-
 sections/artist/artist.php                    |  111 +-
 sections/artist/artist_rearrange.php          |   65 +-
 sections/artist/change_artistid.php           |   10 +-
 sections/artist/delete.php                    |    6 +-
 sections/artist/delete_alias.php              |    2 +-
 sections/artist/download.php                  |   24 +-
 sections/artist/edit.php                      |    4 +-
 sections/artist/history.php                   |    4 +-
 sections/artist/rename.php                    |   14 +-
 sections/better/better.php                    |    4 +-
 sections/better/files.php                     |   10 +-
 sections/better/folders.php                   |   10 +-
 sections/better/single.php                    |    8 +-
 sections/better/snatch.php                    |    8 +-
 sections/better/tags.php                      |   10 +-
 sections/better/transcode.php                 |   10 +-
 sections/better/upload.php                    |    8 +-
 sections/blog/index.php                       |    6 +-
 sections/bookmarks/add.php                    |    2 +-
 sections/bookmarks/artists.php                |    6 +-
 sections/bookmarks/torrents.php               |   22 +-
 sections/chat/index.php                       |    4 +-
 sections/collages/all_comments.php            |   12 +-
 sections/collages/browse.php                  |   18 +-
 sections/collages/collage.php                 |   24 +-
 sections/collages/delete.php                  |    4 +-
 sections/collages/download.php                |   24 +-
 sections/collages/edit.php                    |    4 +-
 sections/collages/edit_handle.php             |    2 +-
 sections/collages/manage.php                  |   12 +-
 sections/collages/new.php                     |    4 +-
 sections/collages/new_handle.php              |    4 +-
 sections/collages/recover.php                 |    6 +-
 sections/collages/take_delete.php             |    2 +-
 sections/comments/index.php                   |   24 +-
 sections/donate/cancel.php                    |    4 +-
 sections/donate/complete.php                  |    4 +-
 sections/donate/donate.php                    |    6 +-
 sections/donate/donate_gpal.php               |    6 +-
 sections/donate/ipn.php                       |   10 +-
 sections/error/index.php                      |    6 +-
 sections/forums/ajax_get_edit.php             |    2 +-
 sections/forums/edit_rules.php                |    4 +-
 sections/forums/forum.php                     |   14 +-
 sections/forums/main.php                      |    8 +-
 sections/forums/mod_thread.php                |    2 +-
 sections/forums/newthread.php                 |    6 +-
 sections/forums/search.php                    |   12 +-
 sections/forums/take_new_thread.php           |    2 +-
 sections/forums/take_warn.php                 |    8 +-
 sections/forums/thread.php                    |   24 +-
 sections/forums/warn.php                      |    8 +-
 sections/friends/friends.php                  |   16 +-
 sections/image/index.php                      |    2 +-
 sections/inbox/compose.php                    |    4 +-
 sections/inbox/conversation.php               |    6 +-
 sections/inbox/forward.php                    |    2 +-
 sections/inbox/inbox.php                      |   14 +-
 sections/inbox/takecompose.php                |    2 +-
 sections/index/feat_album.php                 |    6 +-
 sections/index/private.php                    |   14 +-
 sections/index/public.php                     |    4 +-
 sections/log/index.php                        |    8 +-
 sections/log/sphinx.php                       |    6 +-
 sections/log/sql.php                          |    2 +-
 sections/login/disabled.php                   |    4 +-
 sections/login/index.php                      |   20 +-
 sections/login/login.php                      |    4 +-
 sections/login/recover_step1.php              |    4 +-
 sections/login/recover_step2.php              |    4 +-
 sections/peerupdate/index.php                 |    4 +-
 sections/register/closed.php                  |    4 +-
 sections/register/code.php                    |    4 +-
 sections/register/index.php                   |   12 +-
 sections/register/step1.php                   |    4 +-
 sections/register/step2.php                   |    4 +-
 sections/reports/compose.php                  |   18 +-
 sections/reports/report.php                   |    4 +-
 sections/reports/reports.php                  |    8 +-
 sections/reports/stats.php                    |    4 +-
 sections/reports/takecompose.php              |    2 +-
 sections/reportsv2/ajax_new_report.php        |    2 +-
 sections/reportsv2/ajax_take_pm.php           |    2 +-
 sections/reportsv2/report.php                 |    4 +-
 sections/reportsv2/reports.php                |    4 +-
 sections/reportsv2/search.php                 |    4 +-
 sections/reportsv2/static.php                 |   12 +-
 sections/reportsv2/takeresolve.php            |   10 +-
 sections/reportsv2/views.php                  |    4 +-
 sections/requests/interim.php                 |    4 +-
 sections/requests/new_edit.php                |   16 +-
 sections/requests/request.php                 |   56 +-
 sections/requests/requests.php                |   30 +-
 sections/requests/requests.php.presphinx      |    2 +-
 sections/requests/takedelete.php              |    8 +-
 sections/requests/takefill.php                |    8 +-
 sections/requests/takenew_edit.php            |   10 +-
 sections/requests/takeunfill.php              |   10 +-
 sections/requests/takevote.php                |    2 +-
 sections/rules/chat.php                       |    4 +-
 sections/rules/clients.php                    |    4 +-
 sections/rules/collages.php                   |    4 +-
 sections/rules/ratio.php                      |    4 +-
 sections/rules/requests.php                   |    4 +-
 sections/rules/rules.php                      |    4 +-
 sections/rules/tag.php                        |    4 +-
 sections/rules/upload.php                     |    4 +-
 sections/schedule/index.php                   |   50 +-
 sections/staff/index.php                      |   10 +-
 sections/staffblog/index.php                  |    4 +-
 sections/staffpm/assign.php                   |    2 +-
 sections/staffpm/common_responses.php         |    4 +-
 sections/staffpm/staff_inbox.php              |   22 +-
 sections/staffpm/user_inbox.php               |    4 +-
 sections/staffpm/viewconv.php                 |   12 +-
 sections/stats/torrents.php                   |    4 +-
 sections/stats/users.php                      |    6 +-
 sections/tools/data/bitcoin_balance.php       |    6 +-
 sections/tools/data/common_snatches.php       |    4 +-
 sections/tools/data/database_specifics.php    |   18 +-
 sections/tools/data/donation_log.php          |   10 +-
 sections/tools/data/economic_stats.php        |   26 +-
 sections/tools/data/invite_pool.php           |   10 +-
 sections/tools/data/opcode_stats.php          |   12 +-
 sections/tools/data/registration_log.php      |   16 +-
 sections/tools/data/service_stats.php         |   22 +-
 sections/tools/data/special_users.php         |    6 +-
 sections/tools/data/torrent_stats.php         |   20 +-
 sections/tools/data/upscale_pool.php          |   20 +-
 sections/tools/data/user_flow.php             |    8 +-
 sections/tools/managers/bans.php              |   16 +-
 sections/tools/managers/dnu_list.php          |    6 +-
 sections/tools/managers/eb.php                |    6 +-
 sections/tools/managers/forum_list.php        |    6 +-
 sections/tools/managers/login_watch.php       |    6 +-
 sections/tools/managers/news.php              |    4 +-
 sections/tools/managers/official_tags.php     |    6 +-
 sections/tools/managers/permissions_alter.php |    4 +-
 sections/tools/managers/permissions_list.php  |    4 +-
 sections/tools/managers/recommend_add.php     |    2 +-
 sections/tools/managers/recommend_list.php    |    6 +-
 sections/tools/managers/tag_aliases.php       |    4 +-
 sections/tools/managers/tokens.php            |    4 +-
 sections/tools/managers/whitelist_alter.php   |    6 +-
 sections/tools/managers/whitelist_list.php    |    4 +-
 sections/tools/misc/analysis.php              |    4 +-
 sections/tools/misc/clear_cache.php           |    4 +-
 sections/tools/misc/countries.php             |    4 +-
 sections/tools/misc/create_user.php           |   14 +-
 sections/tools/misc/dupe_ip.php               |   12 +-
 sections/tools/misc/manipulate_tree.php       |    4 +-
 sections/tools/misc/quick_ban.php             |    2 +-
 sections/tools/misc/update_geoip.php          |    6 +-
 sections/tools/services/get_cc.php            |    2 +-
 sections/tools/services/get_host.php          |    4 +-
 sections/tools/tools.php                      |    4 +-
 sections/top10/history.php                    |    8 +-
 sections/top10/index.php                      |    4 +-
 sections/top10/tags.php                       |    4 +-
 sections/top10/torrents.php                   |   90 +-
 sections/top10/users.php                      |   16 +-
 sections/torrents/add_alias.php               |    8 +-
 sections/torrents/add_tag.php                 |    6 +-
 sections/torrents/browse.php                  |   24 +-
 sections/torrents/browse2.php                 |  120 +-
 sections/torrents/delete.php                  |    4 +-
 sections/torrents/delete_alias.php            |    8 +-
 sections/torrents/delete_tag.php              |    2 +-
 sections/torrents/details.php                 |   52 +-
 sections/torrents/download.php                |   16 +-
 sections/torrents/downloadlist.php            |    2 +-
 sections/torrents/edit.php                    |    4 +-
 sections/torrents/editgroup.php               |    4 +-
 sections/torrents/editgroupid.php             |   20 +-
 sections/torrents/functions.php               |    2 +-
 sections/torrents/grouplog.php                |   10 +-
 sections/torrents/history.php                 |    4 +-
 sections/torrents/index.php                   |    6 +-
 sections/torrents/manage_artists.php          |    6 +-
 sections/torrents/masspm.php                  |    4 +-
 sections/torrents/merge.php                   |   16 +-
 sections/torrents/nonwikiedit.php             |    4 +-
 sections/torrents/notify.php                  |   18 +-
 sections/torrents/peerlist.php                |    4 +-
 sections/torrents/redownload.php              |   14 +-
 sections/torrents/rename.php                  |    6 +-
 sections/torrents/reseed.php                  |   16 +-
 sections/torrents/snatchlist.php              |    2 +-
 sections/torrents/take_warn.php               |    8 +-
 sections/torrents/takedelete.php              |   10 +-
 sections/torrents/takeedit.php                |    8 +-
 sections/torrents/takegroupedit.php           |    2 +-
 sections/torrents/takemasspm.php              |    4 +-
 sections/torrents/takenewgroup.php            |    8 +-
 sections/torrents/user.php                    |   66 +-
 sections/torrents/warn.php                    |    8 +-
 sections/upload/upload.php                    |    6 +-
 sections/upload/upload_handle.php             |   34 +-
 sections/user/advancedsearch.php              |   24 +-
 sections/user/community_stats.php             |   26 +-
 sections/user/connchecker.php                 |    4 +-
 sections/user/edit.php                        |    6 +-
 sections/user/invite.php                      |   18 +-
 sections/user/invitetree.php                  |    8 +-
 sections/user/linkedfunctions.php             |   12 +-
 sections/user/notify_edit.php                 |    4 +-
 sections/user/permissions.php                 |   10 +-
 sections/user/search.php                      |   12 +-
 sections/user/sessions.php                    |    8 +-
 sections/user/takeedit.php                    |   16 +-
 sections/user/takeinvite.php                  |    4 +-
 sections/user/takemoderate.php                |   60 +-
 sections/user/user.php                        |   92 +-
 sections/userhistory/email_history.php        |    6 +-
 sections/userhistory/email_history2.php       |   36 +-
 sections/userhistory/ip_history.php           |   16 +-
 sections/userhistory/ip_tracker_history.php   |   10 +-
 sections/userhistory/passkey_history.php      |    6 +-
 sections/userhistory/password_history.php     |    6 +-
 sections/userhistory/post_history.php         |   14 +-
 sections/userhistory/subscribed_collages.php  |   22 +-
 sections/userhistory/subscriptions.php        |   12 +-
 sections/userhistory/token_history.php        |   22 +-
 sections/wiki/aliases.php                     |    4 +-
 sections/wiki/article.php                     |   12 +-
 sections/wiki/compare.php                     |    4 +-
 sections/wiki/create.php                      |    4 +-
 sections/wiki/delete.php                      |    2 +-
 sections/wiki/edit.php                        |    4 +-
 sections/wiki/index.php                       |    2 +-
 sections/wiki/link.php                        |    4 +-
 sections/wiki/revisions.php                   |    8 +-
 sections/wiki/search.php                      |   10 +-
 sections/wiki/splash.php                      |    4 +-
 sections/wiki/takecreate.php                  |    2 +-
 sections/wiki/wiki_browse.php                 |    6 +-
 285 files changed, 4358 insertions(+), 3865 deletions(-)
 create mode 100644 classes/class_artists.php
 create mode 100644 classes/class_format.php
 create mode 100644 classes/class_misc.php
 create mode 100644 classes/class_permissions.php
 create mode 100644 classes/class_requests.php
 create mode 100644 classes/class_tools.php
 create mode 100644 classes/class_torrents.php
 create mode 100644 classes/class_tracker.php
 create mode 100644 classes/class_users.php
 create mode 100644 classes/class_view.php
 create mode 100644 classes/util.php

diff --git a/classes/ajax_start.php b/classes/ajax_start.php
index 2c6e0487..07e6de6e 100644
--- a/classes/ajax_start.php
+++ b/classes/ajax_start.php
@@ -13,11 +13,11 @@
 if (isset($_COOKIE['session'])) { $LoginCookie=$Enc->decrypt($_COOKIE['session']); }
 if(isset($LoginCookie)) {
 	list($SessionID, $UserID)=explode("|~|",$Enc->decrypt($LoginCookie));
-	
+
 	if(!$UserID || !$SessionID) {
 		die('Not logged in!');
 	}
-	
+
 	if(!$Enabled = $Cache->get_value('enabled_'.$UserID)){
 		require(SERVER_ROOT.'/classes/class_mysql.php'); //Require the database wrapper
 		$DB=NEW DB_MYSQL; //Load the database wrapper
diff --git a/classes/class_artist.php b/classes/class_artist.php
index 547ef9af..a31986bb 100644
--- a/classes/class_artist.php
+++ b/classes/class_artist.php
@@ -1,19 +1,3 @@
 <?
-class ARTIST {
-	var $ID = 0;
-	var $Name = 0;
-	var $NameLength = 0;
-	var $SimilarID = 0;
-	var $Displayed = false;
-	var $x = 0;
-	var $y = 0;
-	var $Similar = array();
-	
-	function ARTIST($ID='', $Name=''){
-		$this->ID = $ID;
-		$this->NameLength = mb_strlen($Name, 'utf8');
-		$this->Name = display_str($Name);
-	}
-	
-}
+// Placeholder for if we ever decide to actaully have a model for an artist.
 ?>
diff --git a/classes/class_artists.php b/classes/class_artists.php
new file mode 100644
index 00000000..a04f7685
--- /dev/null
+++ b/classes/class_artists.php
@@ -0,0 +1,274 @@
+<?
+class Artists {
+	/**
+	 * Given an array of GroupIDs, return their associated artists.
+	 *
+	 * @param array $GroupIDs
+	 * @return an array of the following form:
+	 * 	GroupID => {
+	 *		[ArtistType] => {
+	 *			id, name, aliasid
+	 *		}
+	 *	}
+	 * ArtistType is an int. It can be:
+	 * 1 => Main artist
+	 * 2 => Guest artist
+	 * 4 => Composer
+	 * 5 => Conductor
+	 * 6 => DJ
+	 */
+	public static function get_artists($GroupIDs) {
+		global $Cache, $DB;
+		$Results = array();
+		$DBs = array();
+		foreach($GroupIDs as $GroupID) {
+			if(!is_number($GroupID)) {
+				continue;
+			}
+			$Artists = $Cache->get_value('groups_artists_'.$GroupID);
+			if(is_array($Artists)) {
+				$Results[$GroupID] = $Artists;
+			} else {
+				$DBs[] = $GroupID;
+			}
+		}
+		if(count($DBs) > 0) {
+			$IDs = implode(',', $DBs);
+			if(empty($IDs)) {
+				$IDs = "null";
+			}
+			$DB->query("SELECT ta.GroupID,
+					ta.ArtistID,
+					aa.Name,
+					ta.Importance,
+					ta.AliasID
+				FROM torrents_artists AS ta
+					JOIN artists_alias AS aa ON ta.AliasID = aa.AliasID
+				WHERE ta.GroupID IN ($IDs)
+				ORDER BY ta.GroupID ASC,
+					ta.Importance ASC,
+					aa.Name ASC;");
+			while(list($GroupID,$ArtistID,$ArtistName,$ArtistImportance,$AliasID) = $DB->next_record(MYSQLI_BOTH, false)) {
+				$Results[$GroupID][$ArtistImportance][] = array('id' => $ArtistID, 'name' => $ArtistName, 'aliasid' => $AliasID);
+				$New[$GroupID][$ArtistImportance][] = array('id' => $ArtistID, 'name' => $ArtistName, 'aliasid' => $AliasID);
+			}
+			foreach($DBs as $GroupID) {
+				if(isset($New[$GroupID])) {
+					$Cache->cache_value('groups_artists_'.$GroupID, $New[$GroupID]);
+				}
+				else {
+					$Cache->cache_value('groups_artists_'.$GroupID, array());
+				}
+			}
+			$Missing = array_diff($GroupIDs, array_keys($Results));
+			if(!empty($Missing)) {
+				$Results += array_fill_keys($Missing, array());
+			}
+		}
+		return $Results;
+	}
+
+
+	/**
+	 * Convenience function for get_artists, when you just need one group.
+	 *
+	 * @param int $GroupID
+	 * @return array - see get_artists
+	 */
+	public static function get_artist($GroupID) {
+		$Results = Artists::get_artists(array($GroupID));
+		return $Results[$GroupID];
+	}
+
+
+	/**
+	 * Format an array of artists for display.
+	 * TODO: Revisit the logic of this, see if we can helper-function the copypasta.
+	 *
+	 * @param array Artists an array of the form output by get_artists
+	 * @param boolean $MakeLink if true, the artists will be links, if false, they will be text.
+	 * @param boolean $IncludeHyphen if true, appends " - " to the end.
+	 * @param $Escape if true, output will be escaped. Think carefully before setting it false.
+	 */
+	public static function display_artists($Artists, $MakeLink = true, $IncludeHyphen = true, $Escape = true) {
+		if(!empty($Artists)) {
+			$ampersand = ($Escape) ? ' &amp; ' : ' & ';
+			$link = '';
+
+			$MainArtists = $Artists[1];
+			$Guests      = $Artists[2];
+			$Composers   = $Artists[4];
+			$Conductors  = $Artists[5];
+			$DJs         = $Artists[6];
+
+			if ((count($MainArtists) + count($Conductors) + count($DJs) == 0) && (count($Composers) == 0)) {
+				return '';
+			}
+
+			// Various Composers is not needed and is ugly and should die
+			switch(count($Composers)) {
+				case 0:
+					break;
+				case 1:
+					$link .= Artists::display_artist($Composers[0], $MakeLink, $Escape);
+					break;
+				case 2:
+					$link .= Artists::display_artist($Composers[0], $MakeLink, $Escape).$ampersand.Artists::display_artist($Composers[1], $MakeLink, $Escape);
+					break;
+			}
+
+			if ((count($Composers) > 0) && (count($Composers) < 3) && (count($MainArtists) > 0)) {
+				$link .= ' performed by ';
+			}
+
+			$ComposerStr .= $link;
+
+			switch(count($MainArtists)) {
+				case 0:
+					break;
+				case 1:
+					$link .= Artists::display_artist($MainArtists[0], $MakeLink, $Escape);
+					break;
+				case 2:
+					$link .= Artists::display_artist($MainArtists[0], $MakeLink, $Escape).$ampersand.Artists::display_artist($MainArtists[1], $MakeLink, $Escape);
+					break;
+				default:
+					$link .= 'Various Artists';
+			}
+
+			/*if(!empty($Guests) &&  (count($MainArtists) + count($Composers) > 0) && (count($MainArtists) + count($Composers) + count($Conductors) < 3)) {
+				switch(count($Guests)) {
+					case 1:
+						$link .= ' with '.Artists::display_artist($Guests[0], $MakeLink, $Escape);
+						break;
+					case 2:
+						$link .= ' with '.Artists::display_artist($Guests[0], $MakeLink, $Escape).$ampersand.Artists::display_artist($Guests[1], $MakeLink, $Escape);
+						break;
+				}
+			}*/
+
+			if ((count($Conductors) > 0) && (count($MainArtists) + count($Composers) > 0) && (count($Composers) < 3 || count($MainArtists) > 0)) {
+				$link .= ' under ';
+			}
+			switch(count($Conductors)) {
+				case 0:
+					break;
+				case 1:
+					$link .= Artists::display_artist($Conductors[0], $MakeLink, $Escape);
+					break;
+				case 2:
+					$link .= Artists::display_artist($Conductors[0], $MakeLink, $Escape).$ampersand.Artists::display_artist($Conductors[1], $MakeLink, $Escape);
+					break;
+				default:
+					$link .= ' Various Conductors';
+			}
+
+			if ((count($Composers) > 0) && (count($MainArtists) + count($Conductors) > 3) && (count($MainArtists) > 1) && (count($Conductors) > 1)) {
+				$link = $ComposerStr . 'Various Artists';
+			} elseif ((count($Composers) > 2) && (count($MainArtists) + count($Conductors) == 0)) {
+				$link = 'Various Composers';
+			}
+
+			// DJs override everything else
+			switch(count($DJs)) {
+				case 0:
+					break;
+				case 1:
+					$link = Artists::display_artist($DJs[0], $MakeLink, $Escape);
+					break;
+				case 2:
+					$link = Artists::display_artist($DJs[0], $MakeLink, $Escape).$ampersand.Artists::display_artist($DJs[1], $MakeLink, $Escape);
+					break;
+				default :
+					$link = 'Various DJs';
+			}
+
+			return $link.($IncludeHyphen?' - ':'');
+		} else {
+			return '';
+		}
+	}
+
+
+	/**
+	 * Formats a single artist name.
+	 *
+	 * @param array $Artist an array of the form ('id'=>ID, 'name'=>Name)
+	 * @param boolean $MakeLink If true, links to the artist page.
+	 * @param boolean $Escape If false and $MakeLink is false, returns the unescaped, unadorned artist name.
+	 * @return string Formatted artist name.
+	 */
+	public static function display_artist($Artist, $MakeLink = true, $Escape = true) {
+		if ($MakeLink && !$Escape) {
+			error('Invalid parameters to Artists::display_artist()');
+		} elseif ($MakeLink) {
+			return '<a href="artist.php?id='.$Artist['id'].'">'.display_str($Artist['name']).'</a>';
+		} elseif ($Escape) {
+			return display_str($Artist['name']);
+		} else {
+			return $Artist['name'];
+		}
+	}
+
+	/**
+	 * Deletes an artist and their requests, wiki, and tags.
+	 * Does NOT delete their torrents.
+	 *
+	 * @param int $ArtistID
+	 */
+	public static function delete_artist($ArtistID) {
+		global $DB, $LoggedUser, $Cache;
+
+		$DB->query("SELECT Name FROM artists_group WHERE ArtistID = ".$ArtistID);
+		list($Name) = $DB->next_record(MYSQLI_NUM, false);
+
+		// Delete requests
+		$DB->query("SELECT RequestID FROM requests_artists WHERE ArtistID=".$ArtistID." AND ArtistID != 0");
+		$Requests = $DB->to_array();
+		foreach($Requests AS $Request) {
+			list($RequestID) = $Request;
+			$DB->query('DELETE FROM requests WHERE ID='.$RequestID);
+			$DB->query('DELETE FROM requests_votes WHERE RequestID='.$RequestID);
+			$DB->query('DELETE FROM requests_tags WHERE RequestID='.$RequestID);
+			$DB->query('DELETE FROM requests_artists WHERE RequestID='.$RequestID);
+		}
+
+		// Delete artist
+		$DB->query('DELETE FROM artists_group WHERE ArtistID='.$ArtistID);
+		$DB->query('DELETE FROM artists_alias WHERE ArtistID='.$ArtistID);
+		$Cache->decrement('stats_artist_count');
+
+		// Delete wiki revisions
+		$DB->query('DELETE FROM wiki_artists WHERE PageID='.$ArtistID);
+
+		// Delete tags
+		$DB->query('DELETE FROM artists_tags WHERE ArtistID='.$ArtistID);
+
+		$Cache->delete_value('artist_'.$ArtistID);
+		// Record in log
+
+		if(!empty($LoggedUser['Username'])) {
+			$Username = $LoggedUser['Username'];
+		} else {
+			$Username = 'System';
+		}
+		Misc::write_log('Artist '.$ArtistID.' ('.$Name.') was deleted by '.$Username);
+	}
+
+
+	/**
+	 * Remove LRM (left-right-marker) and trims, because people copypaste carelessly.
+	 * If we don't do this, we get seemingly duplicate artist names.
+	 * TODO: make stricter, e.g. on all whitespace characters or Unicode normalisation
+	 *
+	 * @param string $ArtistName
+	 */
+	public static function normalise_artist_name($ArtistName) {
+		// \u200e is &lrm;
+		$ArtistName = trim($ArtistName);
+		$ArtistName = preg_replace('/^(\xE2\x80\x8E)+/', '', $ArtistName);
+		$ArtistName = preg_replace('/(\xE2\x80\x8E)+$/', '', $ArtistName);
+		return trim(preg_replace('/ +/', ' ', $ArtistName));
+	}
+}
+?>
diff --git a/classes/class_artists_similar.php b/classes/class_artists_similar.php
index f5464847..aa2c5a9a 100644
--- a/classes/class_artists_similar.php
+++ b/classes/class_artists_similar.php
@@ -1,35 +1,52 @@
 <?
+class ARTIST {
+	var $ID = 0;
+	var $Name = 0;
+	var $NameLength = 0;
+	var $SimilarID = 0;
+	var $Displayed = false;
+	var $x = 0;
+	var $y = 0;
+	var $Similar = array();
+
+	function ARTIST($ID='', $Name=''){
+		$this->ID = $ID;
+		$this->NameLength = mb_strlen($Name, 'utf8');
+		$this->Name = display_str($Name);
+	}
+}
+
 class ARTISTS_SIMILAR extends ARTIST{
 	var $Artists = array();
 	var $TotalScore = 0;
-	
+
 	var $xValues = array(WIDTH=>1);
 	var $yValues = array(HEIGHT=>1);
-	
+
 	var $LargestDecimal = 0;
 	var $LowestDecimal = 1;
-	
-	
-	
+
+
+
 	function dump_data(){
 		return serialize(array(time(), $this->Name, $this->x, $this->y, serialize($this->Artists), serialize($this->Similar)));
 	}
-	
+
 	function load_data($Data){
 		list($LastUpdated, $this->Name, $this->x, $this->y, $this->Artists, $this->Similar) = unserialize($Data);
 		$this->Artists = unserialize($this->Artists);
 		$this->Similar = unserialize($this->Similar);
 	}
-	
+
 	function set_up(){
 		$this->x = ceil(WIDTH/2);
 		$this->y = ceil(HEIGHT/2);
-		
+
 		$this->xValues[$this->x] = $this->ID;
 		$this->yValues[$this->y] = $this->ID;
-		
+
 		global $DB;
-		
+
 		// Get artists that are directly similar to the artist
 		$ArtistIDs = array();
 		$DB->query("
@@ -44,11 +61,11 @@ function set_up(){
 			WHERE s1.ArtistID=".$this->ID."
 			ORDER BY ass.Score DESC
 			LIMIT 14");
-		
+
 		if($DB->record_count() == 0){
 			return;
 		}
-		
+
 		// Build into array. Each artist is its own object in $this->Artists
 		while(list($ArtistID, $Name, $Score) = $DB->next_record(MYSQLI_NUM, false)){
 			if($Score<0){
@@ -59,7 +76,7 @@ function set_up(){
 			$this->TotalScore+=$Score;
 			$ArtistIDs[]=$ArtistID;
 		}
-		
+
 		// Get similarities between artists on the map
 		$DB->query("SELECT
 			s1.ArtistID,
@@ -71,17 +88,17 @@ function set_up(){
 			WHERE s1.ArtistID IN(".implode(',',$ArtistIDs).")
 			AND s2.ArtistID IN(".implode(',',$ArtistIDs).")
 			");
-		
+
 		// Build into array
 		while(list($Artist1ID, $Artist2ID) = $DB->next_record()){
 			$this->Artists[$Artist1ID]->Similar[$Artist2ID] = array('ID'=>$Artist2ID);
 		}
-		
+
 		// Calculate decimal point scores between artists
 		foreach($this->Similar as $SimilarArtist) {
 			list($ArtistID, $Similar) = array_values($SimilarArtist);
 			$this->Similar[$ArtistID]['Decimal'] =  $this->similarity($Similar['Score'], $this->TotalScore);
-			
+
 			if($this->Similar[$ArtistID]['Decimal'] < $this->LowestDecimal){
 				$this->LowestDecimal = $this->Similar[$ArtistID]['Decimal'];
 			}
@@ -91,28 +108,28 @@ function set_up(){
 		}
 		reset($this->Artists);
 	}
-	
+
 	function set_positions(){
 		$xValues = array(); // Possible x values
 		$Root = ceil(WIDTH/4); // Half-way into half of the image
 		$Offset = 4; // Distance from the root (a quarter of the way into the image) to the x value
-		
+
 		// The number of artists placed in the top or the bottom
 		$NumTop = 0;
 		$NumBottom = 0;
-		
+
 		// The number of artists placed in the left or the right
 		$NumLeft = 0;
 		$NumRight = 0;
-		
+
 		$Multiplier = 0;
-		
+
 		// Build up an impressive list of possible x values
 		// We later iterate through these, and pick out the ones we want
-		
+
 		// These x values are all below WIDTH/2 (all on the left)
 		// The script later chooses which side to put them on
-		
+
 		// We create more very low x values because they're more likely to be skipped
 		for($i = 0; $i<=count($this->Artists)*4; $i++){
 			if($Offset>=((WIDTH/4))){
@@ -120,20 +137,20 @@ function set_positions(){
 			}
 			$Plus = $Root+$Offset; // Point on the right of the root
 			$Minus = abs($Root-$Offset); // Point on the left of the root
-			
+
 			$xValues[$Plus]=$Plus;
-			
+
 			$xValues[$Minus]=$Minus;
-			
+
 			// Throw in an extra x value closer to the edge, because they're more likely to be skipped
-			
+
 			if($Minus>30){
 			//	$xValues[$Minus-30]=$Minus-30;
 			}
-			
+
 			$Offset = $Offset+rand(5,20); // Increase offset, and go again
 		}
-		
+
 		foreach($this->Artists as $Artist){
 			$ArtistID = $Artist->ID;
 			if($Artist->Displayed == true){
@@ -142,14 +159,14 @@ function set_positions(){
 			$this->Similar[$ArtistID]['Decimal'] = $this->Similar[$ArtistID]['Decimal'] * (1/($this->LargestDecimal))-0.1;
 			// Calculate the distance away from the center, based on similarity
 			$IdealDistance =  $this->calculate_distance($this->Similar[$ArtistID]['Decimal'], $this->x, $this->y);
-			
+
 			$this->Similar[$ArtistID]['Distance'] = $IdealDistance;
-			
+
 			// 1 = left, 2 = right
 			$Horizontal = 0;
 			$Vertical = 0;
-			
-			// See if any similar artists have been placed yet. If so, place artist in that half 
+
+			// See if any similar artists have been placed yet. If so, place artist in that half
 			// (provided that there are enough in the other half to visually balance out)
 			reset($Artist->Similar);
 			foreach($Artist->Similar as $SimilarArtist) {
@@ -163,17 +180,17 @@ function set_positions(){
 					break;
 				}
 			}
-			
+
 			shuffle($xValues);
-			
+
 			while($xValue = array_shift($xValues)){
 				if(abs($this->x - $xValue) <= $IdealDistance) {
-					if(hypot(abs($this->x - $xValue), ($this->y - 50)) > $IdealDistance 
+					if(hypot(abs($this->x - $xValue), ($this->y - 50)) > $IdealDistance
 						|| ceil(sqrt(pow($IdealDistance, 2) - pow($this->x - $xValue, 2))) > (HEIGHT/2)){
 						$xValue = $this->x - ceil(sqrt(pow($IdealDistance, 2) - pow($IdealDistance*0.1*rand(5,9), 2)));
 						//echo "Had to change x value for ".$Artist->Name." to ".$xValue."\n";
 					}
-					// Found a match (Is close enough to the center to satisfy $IdealDistance), 
+					// Found a match (Is close enough to the center to satisfy $IdealDistance),
 					// Now it's time to choose which half to put it on
 					if(!$Horizontal) {
 						// No similar artists displayed
@@ -185,11 +202,11 @@ function set_positions(){
 					} else {
 						$NumLeft++;
 					}
-					
+
 					$Artist->x = $xValue;
 					$this->xValues[$xValue] = $ArtistID;
 					unset($xValues[$xValue]);
-					
+
 					break;
 				}
 			}
@@ -200,14 +217,14 @@ function set_positions(){
 				$this->xValues[$xValue] = $ArtistID;
 				unset($xValues[$xValue]);
 			}
-			
-			
+
+
 			// Pythagoras. $yValue is the vertical distance from the center to the y value
 			$yValue = sqrt(pow($IdealDistance, 2) - pow(abs($this->x - $Artist->x), 2));
-			
-			
+
+
 			// Now we pick if it should go on the top or bottom
-			
+
 			if($NumTop>$NumBottom){ // Send it to the bottom half
 				$yValue=(HEIGHT/2)+$yValue;
 				$NumBottom++;
@@ -215,20 +232,20 @@ function set_positions(){
 				$yValue=(HEIGHT/2)-$yValue;
 				$NumTop++;
 			}
-			
+
 			$yValue = ceil($yValue);
-			
+
 			// $yValue is now a proper y coordinate
 			// Now time to do some spacing out
-			
+
 			if($yValue < 10){
 				$yValue+=(10+abs($yValue))+rand(10,20);
 			}
-			
+
 			if($yValue > (HEIGHT - 10)){
 				$yValue-=((HEIGHT/2)-rand(10,20));
 			}
-			
+
 			$i = 1;
 			while($Conflict = $this->scan_array_range($this->yValues, abs($yValue-13), $yValue+13)) {
 				if($i > 10){
@@ -237,7 +254,7 @@ function set_positions(){
 				if(!$this->scan_array_range($this->yValues, abs($yValue-5), $yValue-20)){
 					$yValue -= 20;
 				}
-				
+
 				$yValue=$Conflict + rand(10, 20);
 				if($yValue>HEIGHT-10){
 					$yValue-=ceil(HEIGHT/2.5);
@@ -246,16 +263,16 @@ function set_positions(){
 				}
 				$i++;
 			}
-			
+
 			$Artist->y = $yValue;
 			$this->yValues[$yValue] = $ArtistID;
 		}
 		reset($this->Artists);
 		reset($this->xValues);
 		reset($this->yValues);
-		
+
 	}
-	
+
 	// Calculate the ideal distance from the center point ($Rootx, $Rooty) to the artist's point on the board
 	// Pythagoras as fun!
 	function calculate_distance($SimilarityCoefficient, $Rootx, $Rooty){
@@ -265,13 +282,13 @@ function calculate_distance($SimilarityCoefficient, $Rootx, $Rooty){
 		$y = $MaxHeight - ($SimilarityCoefficient*$MaxHeight); // Possible y value
 		$Hypot = hypot($Rootx - $x, $Rooty - $y);
 		return $MaxWidth - $Hypot;
-		
+
 	}
-	
+
 	function similarity($Score, $TotalArtistScore){
 		return (pow(($Score/($TotalArtistScore+1)), (1/1)));
 	}
-	
+
 	function scan_array_range($Array, $Start, $Finish){
 		if($Start<0){
 			die($Start);
@@ -283,15 +300,15 @@ function scan_array_range($Array, $Start, $Finish){
 		}
 		return false;
 	}
-	
+
 	function write_artists(){
 ?>
 		<div style="position:absolute;bottom:<?=$this->y-10?>px;left:<?=$this->x - $this->NameLength*4?>px;font-size:13pt;white-space:nowrap;" class="similar_artist_header">
-			<?=$this->Name?> 
+			<?=$this->Name?>
 		</div>
 <?
-		
-		
+
+
 		foreach($this->Artists as $Artist){
 			if($Artist->ID == $this->ID){
 				continue;
@@ -303,7 +320,7 @@ function write_artists(){
 
 			}
 			$Decimal = $this->Similar[$Artist->ID]['Decimal'];
-			
+
 			if($Decimal<0.2){
 				$FontSize = 8;
 			} elseif($Decimal<0.3){
@@ -321,7 +338,7 @@ function write_artists(){
 		}
 		reset($this->Artists);
 	}
-	
+
 	function background_image(){
 		global $Img;
 		reset($this->Similar);
@@ -330,9 +347,9 @@ function background_image(){
 			$Artist = $this->Artists[$ArtistID];
 			$Decimal = $this->Similar[$ArtistID]['Decimal'];
 			$Width = ceil($Decimal*4)+1;
-			
+
 			$Img->line($this->x, $this->y, $Artist->x, $Artist->y,$Img->color(199,218,255), $Width);
-			
+
 			unset($Artist->Similar[$this->ID]);
 			reset($Artist->Similar);
 			foreach($Artist->Similar as $SimilarArtist2) {
@@ -345,10 +362,10 @@ function background_image(){
 			}
 			reset($this->xValues);
 		}
-		
+
 		$Img->make_png(SERVER_ROOT.'/static/similar/'.$this->ID.'.png');
 	}
-	
+
 	function dump(){
 		echo "Similarities:\n";
 		foreach($this->Artists as $Artist){
@@ -362,10 +379,10 @@ function dump(){
 			//print_r($Artist->Similar);
 			echo "\n\n---\n\n";
 		}
-		
+
 	}
-	
-	
+
+
 }
 
 
diff --git a/classes/class_cache.php b/classes/class_cache.php
index d3bc5a21..aae3b8cb 100644
--- a/classes/class_cache.php
+++ b/classes/class_cache.php
@@ -40,7 +40,7 @@ class CACHE extends Memcache {
 		'top10tor_*',
 		'query_lock_*'
 	);
-	
+
 	public $CanClear = false;
 	public $InternalCache = true;
 
@@ -72,6 +72,14 @@ public function cache_value($Key, $Value, $Duration=2592000) {
 		$this->Time+=(microtime(true)-$StartTime)*1000;
 	}
 
+	// Wrapper for Memcache::add, with the zlib option removed and default duration of 30 days
+	public function add_value($Key, $Value, $Duration=2592000) {
+		$StartTime=microtime(true);
+		$Added=$this->add($Key, $Value, 0, $Duration);
+		$this->Time+=(microtime(true)-$StartTime)*1000;
+		return $Added;
+	}
+
 	public function replace_value($Key, $Value, $Duration=2592000) {
 		$StartTime=microtime(true);
 		$this->replace($Key, $Value, false, $Duration);
@@ -87,13 +95,13 @@ public function get_value($Key, $NoCache=false) {
 			trigger_error("Cache retrieval failed for empty key");
 		}
 
-		if (isset($_GET['clearcache']) && $this->CanClear && !in_array_partial($Key, $this->PersistentKeys)) {
+		if (isset($_GET['clearcache']) && $this->CanClear && !Misc::in_array_partial($Key, $this->PersistentKeys)) {
 			if ($_GET['clearcache'] == 1) {
 				//Because check_perms isn't true until loggeduser is pulled from the cache, we have to remove the entries loaded before the loggeduser data
 				//Because of this, not user cache data will require a secondary pageload following the clearcache to update
 				if (count($this->CacheHits) > 0) {
 					foreach (array_keys($this->CacheHits) as $HitKey) {
-						if (!in_array_partial($HitKey, $this->PersistentKeys)) {
+						if (!Misc::in_array_partial($HitKey, $this->PersistentKeys)) {
 							$this->delete($HitKey);
 							unset($this->CacheHits[$HitKey]);
 						}
@@ -308,23 +316,22 @@ public function update($Key, $Rows, $Values, $Time=2592000) {
 
 	}
 
-	// Built-in increment/decrement functions are said not to be thread safe
-/* Supposedly fixed in v1.4.6
-	public function increment($Key, $Value=1) {
-		if(($OldValue = $this->get($Key)) === false || !is_number($Value)) {
-			return false;
-		}
-		$this->replace_value($Key, $OldValue+$Value);
+	/**
+	 * Tries to set a lock. Expiry time is one hour to avoid indefinite locks
+	 *
+	 * @param string $LockName name on the lock
+	 * @return true if lock was acquired
+	 */
+	public function get_query_lock($LockName) {
+		return $this->add_value('query_lock_'.$LockName, 1, 3600);
 	}
 
-	public function decrement($Key, $Value=1) {
-		if(($OldValue = $this->get($Key)) === false || !is_number($Value) || !is_number($OldValue)) {
-			return false;
-		}
-		if($Value > $OldValue) {
-			$OldValue = $Value = 0;
-		}
-		$this->replace_value($Key, $OldValue-$Value);
+	/**
+	 * Remove lock
+	 *
+	 * @param string $LockName name on the lock
+	 */
+	public function clear_query_lock($LockName) {
+		$this->delete_value('query_lock_'.$LockName);
 	}
-*/
 }
diff --git a/classes/class_charts.php b/classes/class_charts.php
index dfb4b690..683f1532 100644
--- a/classes/class_charts.php
+++ b/classes/class_charts.php
@@ -171,7 +171,7 @@ public function __construct () {
 
 	public function add($Label, $Data) {
 		if ($Label !== false) {
-			$this->Labels[] = cut_string($Label,35);
+			$this->Labels[] = Format::cut_string($Label,35);
 		}
 		$this->Data[] = $Data;
 	}
diff --git a/classes/class_debug.php b/classes/class_debug.php
index be630bad..e0ae41d3 100644
--- a/classes/class_debug.php
+++ b/classes/class_debug.php
@@ -36,7 +36,7 @@ public function profile($Automatic='') {
 		*/
 		$Ram = memory_get_usage(true);
 		if ($Ram > MAX_MEMORY && !defined('MEMORY_EXCEPTION')) {
-			$Reason[] = get_size($Ram).' Ram Used';
+			$Reason[] = Format::get_size($Ram).' Ram Used';
 		}
 
 		if (isset($_REQUEST['profile'])) {
@@ -57,7 +57,7 @@ public function analysis($Message, $Report='', $Time=43200) {
 		if (empty($Report)) {
 			$Report = $Message;
 		}
-		$Identifier = make_secret(5);
+		$Identifier = Users::make_secret(5);
 		$Cache->cache_value(
 			'analysis_'.$Identifier,
 			array(
@@ -245,14 +245,14 @@ public function get_sphinx_time() {
 	}
 
 	public function get_sphinxql_queries() {
-		if(class_exists(SPHINXQL)) {
-			return SPHINXQL::$Queries;
+		if(class_exists(SphinxQL)) {
+			return SphinxQL::$Queries;
 		}
 	}
 
 	public function get_sphinxql_time() {
-		if(class_exists(SPHINXQL)) {
-			return SPHINXQL::$Time;
+		if(class_exists(SphinxQL)) {
+			return SphinxQL::$Time;
 		}
 	}
 
@@ -354,7 +354,7 @@ public function flag_table($Flags=false) {
 		<tr valign="top">
 			<td align="left"><?=$Event?></td>
 			<td align="left"><?=$MicroTime?> ms</td>
-			<td align="left"><?=get_size($Memory)?></td>
+			<td align="left"><?=Format::get_size($Memory)?></td>
 		</tr>
 <?
 		}
diff --git a/classes/class_format.php b/classes/class_format.php
new file mode 100644
index 00000000..a1b6c9df
--- /dev/null
+++ b/classes/class_format.php
@@ -0,0 +1,396 @@
+<?
+class Format {
+	/**
+	 * Shorten a string
+	 *
+	 * @param $Str string to cut
+	 * @param $Length cut at length
+	 * @param $Hard force cut at length instead of at closest word
+	 * @param $ShowDots Show dots at the end
+	 * @return string formatted string
+	 */
+	public static function cut_string($Str, $Length, $Hard = false, $ShowDots = true) {
+		if (mb_strlen($Str, 'UTF-8') > $Length) {
+			if ($Hard == 0) {
+				// Not hard, cut at closest word
+				$CutDesc = mb_substr($Str, 0, $Length, 'UTF-8');
+				$DescArr = explode(' ', $CutDesc);
+				if (count($DescArr) > 1) {
+					array_pop($DescArr);
+					$CutDesc = implode(' ', $DescArr);
+				}
+				if ($ShowDots) { $CutDesc .= '...'; }
+			} else {
+				$CutDesc = mb_substr($Str, 0, $Length, 'UTF-8');
+				if ($ShowDots) { $CutDesc .= '...'; }
+			}
+			return $CutDesc;
+		} else {
+			return $Str;
+		}
+	}
+
+
+	/**
+	 * Gets the CSS class corresponding to a ratio
+	 *
+	 * @param $Ratio ratio to get the css class for
+	 * @return string the CSS class corresponding to the ratio range
+	 */
+	public static function get_ratio_color($Ratio) {
+		if ($Ratio < 0.1) { return 'r00'; }
+		if ($Ratio < 0.2) { return 'r01'; }
+		if ($Ratio < 0.3) { return 'r02'; }
+		if ($Ratio < 0.4) { return 'r03'; }
+		if ($Ratio < 0.5) { return 'r04'; }
+		if ($Ratio < 0.6) { return 'r05'; }
+		if ($Ratio < 0.7) { return 'r06'; }
+		if ($Ratio < 0.8) { return 'r07'; }
+		if ($Ratio < 0.9) { return 'r08'; }
+		if ($Ratio < 1) { return 'r09'; }
+		if ($Ratio < 2) { return 'r10'; }
+		if ($Ratio < 5) { return 'r20'; }
+		return 'r50';
+	}
+
+
+	/**
+	 * Calculates and formats a ratio.
+	 *
+	 * @param int $Dividend AKA numerator
+	 * @param int $Divisor
+	 * @param boolean $Color if true, ratio will be coloured.
+	 * @return formatted ratio HTML
+	 */
+	public static function get_ratio_html($Dividend, $Divisor, $Color = true) {
+		if ($Divisor == 0 && $Dividend == 0) {
+			return '--';
+		} elseif ($Divisor == 0) {
+			return '<span class="r99">∞</span>';
+		}
+		$Ratio = number_format(max($Dividend/$Divisor-0.005,0), 2); //Subtract .005 to floor to 2 decimals
+		if ($Color) {
+			$Class = Format::get_ratio_color($Ratio);
+			if ($Class) {
+				$Ratio = '<span class="'.$Class.'">'.$Ratio.'</span>';
+			}
+		}
+		return $Ratio;
+	}
+
+
+	/**
+	 * Gets the query string of the current page, minus the parameters in $Exclude
+	 *
+	 * @param array $Exclude Query string parameters to leave out, or blank to include all parameters.
+	 * @return An HTML sanatized query string
+	 */
+	public static function get_url($Exclude = false) {
+		if ($Exclude !== false) {
+			$QueryItems = array();
+			parse_str($_SERVER['QUERY_STRING'], $QueryItems);
+
+			foreach ($QueryItems AS $Key => $Val) {
+				if (!in_array(strtolower($Key),$Exclude)) {
+					$Query[$Key] = $Val;
+				}
+			}
+			if (empty($Query)) {
+				return;
+			}
+			return display_str(http_build_query($Query));
+		} else {
+			return display_str($_SERVER['QUERY_STRING']);
+		}
+	}
+
+
+	/**
+	 * Finds what page we're on and gives it to us, as well as the LIMIT clause for SQL
+	 * Takes in $_GET['page'] as an additional input
+	 *
+	 * @param $PerPage Results to show per page
+	 * @param $DefaultResult Optional, which result's page we want if no page is specified
+	 * If this parameter is not specified, we will default to page 1
+	 *
+	 * @return array(int,string) What page we are on, and what to use in the LIMIT section of a query
+	 * i.e. "SELECT [...] LIMIT $Limit;"
+	 */
+	public static function page_limit($PerPage, $DefaultResult = 1) {
+		if (!isset($_GET['page'])) {
+			$Page = ceil($DefaultResult/$PerPage);
+			if ($Page == 0) $Page = 1;
+			$Limit=$PerPage;
+		} else {
+			if (!is_number($_GET['page'])) {
+				error(0);
+			}
+			$Page = $_GET['page'];
+			if ($Page <= 0) { $Page = 1; }
+			$Limit=$PerPage*$Page-$PerPage . ', ' . $PerPage;
+		}
+		return array($Page,$Limit);
+	}
+
+	// A9 magic. Some other poor soul can write the phpdoc.
+	// For data stored in memcached catalogues (giant arrays), eg. forum threads
+	public static function catalogue_limit($Page, $PerPage, $CatalogueSize=500) {
+		$CatalogueID = floor(($PerPage*$Page-$PerPage)/$CatalogueSize);;
+		$CatalogueLimit = ($CatalogueID*$CatalogueSize).', '.$CatalogueSize;
+		return array($CatalogueID, $CatalogueLimit);
+	}
+
+	public static function catalogue_select($Catalogue, $Page, $PerPage, $CatalogueSize=500) {
+		return array_slice($Catalogue,(($PerPage*$Page-$PerPage)%$CatalogueSize),$PerPage,true);
+	}
+
+
+	/* Get pages
+	 * Returns a page list, given certain information about the pages.
+	 *
+	 * @param int $StartPage: The current record the page you're on starts with.
+	 *		eg. if you're on page 2 of a forum thread with 25 posts per page, $StartPage is 25.
+	 *		If you're on page 1, $StartPage is 0.
+	 * @param int $TotalRecords: The total number of records in the result set.
+	 *		eg. if you're on a forum thread with 152 posts, $TotalRecords is 152.
+	 * @param int $ItemsPerPage: Self-explanatory. The number of records shown on each page
+	 *		eg. if there are 25 posts per forum page, $ItemsPerPage is 25.
+	 * @param int $ShowPages: The number of page links that are shown.
+	 *		eg. If there are 20 pages that exist, but $ShowPages is only 11, only 11 links will be shown.
+	 * @param string $Anchor A URL fragment to attach to the links.
+	 *		eg. '#comment12'
+	 * @return A sanitized HTML page listing.
+	 */
+	public static function get_pages($StartPage,$TotalRecords,$ItemsPerPage,$ShowPages=11,$Anchor='') {
+		global $Document, $Method, $Mobile;
+		$Location = $Document.'.php';
+		$StartPage = ceil($StartPage);
+		$TotalPages = 0;
+		if ($TotalRecords > 0) {
+			$StartPage = min($StartPage, ceil($TotalRecords/$ItemsPerPage));
+
+			$ShowPages--;
+			$TotalPages = ceil($TotalRecords/$ItemsPerPage);
+
+			if ($TotalPages > $ShowPages) {
+				$StartPosition = $StartPage-round($ShowPages/2);
+
+				if ($StartPosition <= 0) {
+					$StartPosition = 1;
+				} else {
+					if ($StartPosition >= ($TotalPages-$ShowPages)) {
+						$StartPosition = $TotalPages-$ShowPages;
+					}
+				}
+
+				$StopPage = $ShowPages+$StartPosition;
+
+			} else {
+				$StopPage = $TotalPages;
+				$StartPosition = 1;
+			}
+
+			$StartPosition = max($StartPosition, 1);
+
+			$QueryString = Format::get_url(array('page','post'));
+			if ($QueryString != '') {
+				$QueryString = '&amp;'.$QueryString;
+			}
+
+			$Pages = '';
+
+			if ($StartPage > 1) {
+				$Pages .= '<a href="'.$Location.'?page=1'.$QueryString.$Anchor.'"><strong>&lt;&lt; First</strong></a> ';
+				$Pages .= '<a href="'.$Location.'?page='.($StartPage-1).$QueryString.$Anchor.'" class="pager_prev"><strong>&lt; Prev</strong></a> | ';
+			}
+			//End change
+
+			if (!$Mobile) {
+				for ($i = $StartPosition; $i <= $StopPage; $i++) {
+					if ($i != $StartPage) {
+						$Pages .= '<a href="'.$Location.'?page='.$i.$QueryString.$Anchor.'">';
+					}
+					$Pages .= "<strong>";
+					if ($i*$ItemsPerPage > $TotalRecords) {
+						$Pages .= ((($i-1)*$ItemsPerPage)+1).'-'.($TotalRecords);
+					} else {
+						$Pages .= ((($i-1)*$ItemsPerPage)+1).'-'.($i*$ItemsPerPage);
+					}
+
+					$Pages .= "</strong>";
+					if ($i != $StartPage) {
+						$Pages.='</a>';
+					}
+					if ($i < $StopPage) {
+						$Pages.=" | ";
+					}
+				}
+			} else {
+				$Pages .= $StartPage;
+			}
+
+			if ($StartPage && $StartPage < $TotalPages) {
+				$Pages .= ' | <a href="'.$Location.'?page='.($StartPage+1).$QueryString.$Anchor.'" class="pager_next"><strong>Next &gt;</strong></a> ';
+				$Pages .= '<a href="'.$Location.'?page='.$TotalPages.$QueryString.$Anchor.'"><strong> Last &gt;&gt;</strong></a>';
+			}
+		}
+		if ($TotalPages > 1) {
+			return $Pages;
+		}
+	}
+
+
+	/**
+	 * Format a size in bytes as a human readable string in KiB/MiB/...
+	 *
+	 * @param int $Size
+	 * @param int $Levels Number of decimal places. Defaults to 2, unless the size >= 1TB, in which case it defaults to 4.
+	 * @return string formatted number.
+	 */
+	public static function get_size($Size, $Levels = 2) {
+		$Units = array(' B',' KB',' MB',' GB',' TB',' PB',' EB',' ZB',' YB');
+		$Size = (double) $Size;
+		for($Steps = 0; abs($Size) >= 1024; $Size /= 1024, $Steps++) {}
+		if (func_num_args() == 1 && $Steps >= 4) {
+			$Levels++;
+		}
+		return number_format($Size,$Levels) . $Units[$Steps];
+	}
+
+
+	/**
+	 * Format a number as a multiple of its highest power of 1000 (eg. 10035 -> '10.04k')
+	 *
+	 * @param int $Number
+	 * @return string formatted number.
+	 */
+	public static function human_format($Number) {
+		$Steps = 0;
+		while($Number>=1000) {
+			$Steps++;
+			$Number=$Number/1000;
+		}
+		switch ($Steps) {
+			case 0: return round($Number); break;
+			case 1: return round($Number,2).'k'; break;
+			case 2: return round($Number,2).'M'; break;
+			case 3: return round($Number,2).'G'; break;
+			case 4: return round($Number,2).'T'; break;
+			case 5: return round($Number,2).'P'; break;
+			default:
+				return round($Number,2).'E + '.$Steps*3;
+		}
+	}
+
+
+	/**
+	 * Given a formatted string of a size, get the number of bytes it represents.
+	 *
+	 * @param string $Size formatted size string, eg. 123.45k
+	 * @return Number of bytes it represents, eg. (123.45 * 1024)
+	 */
+	public static function get_bytes($Size) {
+		list($Value,$Unit) = sscanf($Size, "%f%s");
+		$Unit = ltrim($Unit);
+		if (empty($Unit)) {
+			return $Value ? round($Value) : 0;
+		}
+		switch(strtolower($Unit[0])) {
+			case 'k': return round($Value * 1024);
+			case 'm': return round($Value * 1048576);
+			case 'g': return round($Value * 1073741824);
+			case 't': return round($Value * 1099511627776);
+			default: return 0;
+		}
+	}
+
+
+	/**
+	 * Reverse the effects of display_str - un-sanitize HTML.
+	 * Use sparingly.
+	 *
+	 * @param string $Str the string to unsanitize
+	 * @return unsanitized string
+	 */
+	// Use sparingly
+	public static function undisplay_str($Str) {
+		return mb_convert_encoding($Str, 'UTF-8', 'HTML-ENTITIES');
+	}
+
+
+	/**
+	 * Echo data sent in a GET form field, useful for text areas.
+	 *
+	 * @param string $Index the name of the form field
+	 * @param boolean $Return if set to true, value is returned instead of echoed.
+	 * @return Sanitized value of field index if $Return == true
+	 */
+	public static function form($Index, $Return = false) {
+		if (!empty($_GET[$Index])) {
+			if ($Return) {
+				return display_str($_GET[$Index]);
+			} else {
+				echo display_str($_GET[$Index]);
+			}
+		}
+	}
+
+
+	/**
+	 * Convenience function to echo out selected='selected' and checked='checked' so you don't have to.
+	 *
+	 * @param $Name the name of the option in the select (or field in $Array)
+	 * @param $Value the value that the option must be for the option to be marked as selected or checked
+	 * @param $Attribute The value returned/echoed is $Attribute="$Attribute"
+	 * @param $Array The array the option is in, defaults to GET.
+	 * @return
+	 */
+	public static function selected($Name, $Value, $Attribute='selected', $Array = array()) {
+		if (empty($Array)) {
+			$Array == $_GET;
+		}
+		if (isset($Array[$Name]) && $Array[$Name]!=='') {
+			if ($Array[$Name] == $Value) {
+				echo ' '.$Attribute.'="'.$Attribute.'"';
+			}
+		}
+	}
+
+	/**
+	 * Detect the encoding of a string and transform it to UTF-8.
+	 *
+	 * @param string $Str
+	 * @return UTF-8 encoded version of $Str
+	 */
+	public static function make_utf8($Str) {
+		if ($Str!="") {
+			if (Format::is_utf8($Str)) { $Encoding="UTF-8"; }
+			if (empty($Encoding)) { $Encoding=mb_detect_encoding($Str,'UTF-8, ISO-8859-1'); }
+			if (empty($Encoding)) { $Encoding="ISO-8859-1"; }
+			if ($Encoding=="UTF-8") { return $Str; }
+			else { return @mb_convert_encoding($Str,"UTF-8",$Encoding); }
+		}
+	}
+
+	/**
+	 * Magical function.
+	 *
+	 * @param string $Str function to detect encoding on.
+	 * @return true if the string is in UTF-8.
+	 */
+	public static function is_utf8($Str) {
+		return preg_match('%^(?:
+			[\x09\x0A\x0D\x20-\x7E]			 // ASCII
+			| [\xC2-\xDF][\x80-\xBF]			// non-overlong 2-byte
+			| \xE0[\xA0-\xBF][\x80-\xBF]		// excluding overlongs
+			| [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2} // straight 3-byte
+			| \xED[\x80-\x9F][\x80-\xBF]		// excluding surrogates
+			| \xF0[\x90-\xBF][\x80-\xBF]{2}	 // planes 1-3
+			| [\xF1-\xF3][\x80-\xBF]{3}		 // planes 4-15
+			| \xF4[\x80-\x8F][\x80-\xBF]{2}	 // plane 16
+			)*$%xs', $Str
+		);
+	}
+
+}
+?>
diff --git a/classes/class_invite_tree.php b/classes/class_invite_tree.php
index 26a96c40..d2b005dc 100644
--- a/classes/class_invite_tree.php
+++ b/classes/class_invite_tree.php
@@ -118,15 +118,15 @@ function make_tree(){
 				echo "<li>";
 			}
 ?>
-				<strong><?=format_username($ID, true, true, $Enabled != 2 ? false : true, true)?></strong>
+				<strong><?=Users::format_username($ID, true, true, $Enabled != 2 ? false : true, true)?></strong>
 <?
 			if(check_paranoia(array('uploaded', 'downloaded'), $Paranoia, $UserClass)) {
 				$TotalUpload += $Uploaded;
 				$TotalDownload += $Downloaded;
 ?>
-				&nbsp;Uploaded: <strong><?=get_size($Uploaded)?></strong>
-				&nbsp;Downloaded: <strong><?=get_size($Downloaded)?></strong>
-				&nbsp;Ratio: <strong><?=ratio($Uploaded, $Downloaded)?></strong>
+				&nbsp;Uploaded: <strong><?=Format::get_size($Uploaded)?></strong>
+				&nbsp;Downloaded: <strong><?=Format::get_size($Downloaded)?></strong>
+				&nbsp;Ratio: <strong><?=Format::get_ratio_html($Uploaded, $Downloaded)?></strong>
 <?
 			} else {
 				$ParanoidCount++;
@@ -152,7 +152,7 @@ function make_tree(){
 			$ClassStrings = array();
 			foreach ($ClassSummary as $ClassID => $ClassCount) {
 				if($ClassCount == 0) { continue; }
-				$LastClass = make_class_string($ClassID);
+				$LastClass = Users::make_class_string($ClassID);
 				if($ClassCount>1) { 
 					if($LastClass == "Torrent Celebrity") {
 						 $LastClass = 'Torrent Celebrities';
@@ -186,15 +186,15 @@ function make_tree(){
 			echo '. </p>';
 			
 			echo '<p style="font-weight: bold;">';
-			echo 'The total amount uploaded by the entire tree was '.get_size($TotalUpload);
-			echo '; the total amount downloaded was '.get_size($TotalDownload);
-			echo '; and the total ratio is '.ratio($TotalUpload, $TotalDownload).'. ';
+			echo 'The total amount uploaded by the entire tree was '.Format::get_size($TotalUpload);
+			echo '; the total amount downloaded was '.Format::get_size($TotalDownload);
+			echo '; and the total ratio is '.Format::get_ratio_html($TotalUpload, $TotalDownload).'. ';
 			echo '</p>';
 			
 			echo '<p style="font-weight: bold;">';
-			echo 'The total amount uploaded by direct invitees (the top level) was '.get_size($TopLevelUpload);
-			echo '; the total amount downloaded was '.get_size($TopLevelDownload);
-			echo '; and the total ratio is '.ratio($TopLevelUpload, $TopLevelDownload).'. ';
+			echo 'The total amount uploaded by direct invitees (the top level) was '.Format::get_size($TopLevelUpload);
+			echo '; the total amount downloaded was '.Format::get_size($TopLevelDownload);
+			echo '; and the total ratio is '.Format::get_ratio_html($TopLevelUpload, $TopLevelDownload).'. ';
 			
 			
 			echo 'These numbers include the stats of paranoid users, and will be factored in to the invitation giving script.</p>';
diff --git a/classes/class_irc.php b/classes/class_irc.php
index da036162..4046dd51 100644
--- a/classes/class_irc.php
+++ b/classes/class_irc.php
@@ -9,7 +9,7 @@ function halt($Msg) {
 abstract class IRC_BOT {
 	abstract protected function connect_events();
 	abstract protected function channel_events();
-	abstract protected function query_events(); 
+	abstract protected function query_events();
 	abstract protected function listener_events();
 
 	protected $Debug = false;
@@ -92,7 +92,7 @@ protected function get_message() {
 		return trim($Msg[1]);
 	}
 
-	protected function get_host() {
+	protected function get_irc_host() {
 		preg_match('/:[^!:]+!.+@([^\s]+) PRIVMSG [^:]+ :.+/', $this->Data, $Host);
 		return trim($Host[1]);
 	}
@@ -126,10 +126,10 @@ protected function whois($Nick) {
 		$this->Whois = $Nick;
 		$this->send_raw("WHOIS $Nick");
 	}
-	
+
 	/*
-	This function uses blacklisted_ip, which is no longer in RC2. 
-	You can probably find it in old RC1 code kicking aronud if you need it. 
+	This function uses blacklisted_ip, which is no longer in RC2.
+	You can probably find it in old RC1 code kicking aronud if you need it.
 	protected function ip_check($IP,$Gline=false,$Channel=BOT_REPORT_CHAN) {
 		global $Cache, $DB;
 		if(blacklisted_ip($IP)) {
@@ -209,7 +209,7 @@ protected function listen() {
 			if($this->Listened = @socket_accept($this->ListenSocket)) {
 				$this->listener_events();
 			}
-			
+
 			$DB->LinkID = false;
 			$DB->Queries = array();
 			usleep(5000);
diff --git a/classes/class_misc.php b/classes/class_misc.php
new file mode 100644
index 00000000..48877a97
--- /dev/null
+++ b/classes/class_misc.php
@@ -0,0 +1,395 @@
+<?
+class Misc {
+	/**
+	 * Send an email.
+	 *
+	 * @param string $To the email address to send it to.
+	 * @param string $Subject
+	 * @param string $Body
+	 * @param string $From The user part of the user@NONSSL_SITE_URL email address.
+	 * @param string $ContentType text/plain or text/html
+	 */
+	public static function send_email($To,$Subject,$Body,$From='noreply',$ContentType='text/plain') {
+		$Headers='MIME-Version: 1.0'."\r\n";
+		$Headers.='Content-type: '.$ContentType.'; charset=iso-8859-1'."\r\n";
+		$Headers.='From: '.SITE_NAME.' <'.$From.'@'.NONSSL_SITE_URL.'>'."\r\n";
+		$Headers.='Reply-To: '.$From.'@'.NONSSL_SITE_URL."\r\n";
+		$Headers.='X-Mailer: Project Gazelle'."\r\n";
+		$Headers.='Message-Id: <'.Users::make_secret().'@'.NONSSL_SITE_URL.">\r\n";
+		$Headers.='X-Priority: 3'."\r\n";
+		mail($To,$Subject,$Body,$Headers,"-f ".$From."@".NONSSL_SITE_URL);
+	}
+
+
+	/**
+	 * Sanitize a string to be allowed as a filename.
+	 *
+	 * @param string $EscapeStr the string to escape
+	 * @return the string with all banned characters removed.
+	 */
+	public static function file_string($EscapeStr) {
+		return str_replace(array('"','*','/',':','<','>','?','\\','|'), '', $EscapeStr);
+	}
+
+
+	/**
+	 * Sends a PM from $FromId to $ToId.
+	 *
+	 * @param string $ToID ID of user to send PM to. If $ToID is an array and $ConvID is empty, a message will be sent to multiple users.
+	 * @param string $FromID ID of user to send PM from, 0 to send from system
+	 * @param string $Subject
+	 * @param string $Body
+	 * @param int $ConvID The conversation the message goes in. Leave blank to start a new conversation.
+	 * @return
+	 */
+	public static function send_pm($ToID,$FromID,$Subject,$Body,$ConvID='') {
+		global $DB, $Cache, $Time;
+		if ($ToID == 0 || $ToID == $FromID) {
+			// Don't allow users to send messages to the system or themselves
+			return;
+		}
+		if ($ConvID=='') {
+			// Create a new conversation.
+			$DB->query("INSERT INTO pm_conversations(Subject) VALUES ('".$Subject."')");
+			$ConvID = $DB->inserted_id();
+			$DB->query("INSERT INTO pm_conversations_users
+					(UserID, ConvID, InInbox, InSentbox, SentDate, ReceivedDate, UnRead) VALUES
+					('$ToID', '$ConvID', '1','0','".sqltime()."', '".sqltime()."', '1')");
+			if ($FromID != 0) {
+				$DB->query("INSERT INTO pm_conversations_users
+					(UserID, ConvID, InInbox, InSentbox, SentDate, ReceivedDate, UnRead) VALUES
+					('$FromID', '$ConvID', '0','1','".sqltime()."', '".sqltime()."', '0')");
+			}
+			$ToID = array($ToID);
+		} else {
+			// Update the pre-existing conversations.
+			$DB->query("UPDATE pm_conversations_users SET
+					InInbox='1',
+					UnRead='1',
+					ReceivedDate='".sqltime()."'
+					WHERE UserID IN (".implode(',', $ToID).")
+					AND ConvID='$ConvID'");
+
+			$DB->query("UPDATE pm_conversations_users SET
+					InSentbox='1',
+					SentDate='".sqltime()."'
+					WHERE UserID='$FromID'
+					AND ConvID='$ConvID'");
+		}
+
+		// Now that we have a $ConvID for sure, send the message.
+		$DB->query("INSERT INTO pm_messages
+				(SenderID, ConvID, SentDate, Body) VALUES
+				('$FromID', '$ConvID', '".sqltime()."', '".$Body."')");
+
+		// Update the cached new message count.
+		foreach ($ToID as $ID) {
+			$DB->query("SELECT COUNT(ConvID) FROM pm_conversations_users WHERE UnRead = '1' and UserID='$ID' AND InInbox = '1'");
+			list($UnRead) = $DB->next_record();
+			$Cache->cache_value('inbox_new_'.$ID, $UnRead);
+		}
+
+		return $ConvID;
+	}
+
+
+	/**
+	 * Create thread function, things should already be escaped when sent here.
+	 *
+	 * @param int $ForumID
+	 * @param int $AuthorID ID of the user creating the post.
+	 * @param string $Title
+	 * @param string $PostBody
+	 * @return -1 on error, -2 on user not existing, thread id on success.
+	 */
+	public static function create_thread($ForumID, $AuthorID, $Title, $PostBody) {
+		global $DB, $Cache, $Time;
+		if (!$ForumID || !$AuthorID || !is_number($AuthorID) || !$Title || !$PostBody) {
+			return -1;
+		}
+
+		$DB->query("SELECT Username FROM users_main WHERE ID=".$AuthorID);
+		if ($DB->record_count() < 1) {
+			return -2;
+		}
+		list($AuthorName) = $DB->next_record();
+
+		$ThreadInfo = array();
+		$ThreadInfo['IsLocked'] = 0;
+		$ThreadInfo['IsSticky'] = 0;
+
+		$DB->query("INSERT INTO forums_topics
+			(Title, AuthorID, ForumID, LastPostTime, LastPostAuthorID)
+			Values
+			('".$Title."', '".$AuthorID."', '$ForumID', '".sqltime()."', '".$AuthorID."')");
+		$TopicID = $DB->inserted_id();
+		$Posts = 1;
+
+		$DB->query("INSERT INTO forums_posts
+				(TopicID, AuthorID, AddedTime, Body)
+				VALUES
+				('$TopicID', '".$AuthorID."', '".sqltime()."', '".$PostBody."')");
+		$PostID = $DB->inserted_id();
+
+		$DB->query("UPDATE forums SET
+					NumPosts  = NumPosts+1,
+					NumTopics = NumTopics+1,
+					LastPostID = '$PostID',
+					LastPostAuthorID = '".$AuthorID."',
+					LastPostTopicID = '$TopicID',
+					LastPostTime = '".sqltime()."'
+					WHERE ID = '$ForumID'");
+
+		$DB->query("UPDATE forums_topics SET
+				NumPosts = NumPosts+1,
+				LastPostID = '$PostID',
+				LastPostAuthorID = '".$AuthorID."',
+				LastPostTime = '".sqltime()."'
+				WHERE ID = '$TopicID'");
+
+		// Bump this topic to head of the cache
+		list($Forum,,,$Stickies) = $Cache->get_value('forums_'.$ForumID);
+		if (!empty($Forum)) {
+			if (count($Forum) == TOPICS_PER_PAGE && $Stickies < TOPICS_PER_PAGE) {
+				array_pop($Forum);
+			}
+			$DB->query("SELECT f.IsLocked, f.IsSticky, f.NumPosts FROM forums_topics AS f
+				WHERE f.ID ='$TopicID'");
+			list($IsLocked,$IsSticky,$NumPosts) = $DB->next_record();
+			$Part1 = array_slice($Forum,0,$Stickies,true); //Stickys
+			$Part2 = array(
+				$TopicID=>array(
+					'ID' => $TopicID,
+					'Title' => $Title,
+					'AuthorID' => $AuthorID,
+					'IsLocked' => $IsLocked,
+					'IsSticky' => $IsSticky,
+					'NumPosts' => $NumPosts,
+					'LastPostID' => $PostID,
+					'LastPostTime' => sqltime(),
+					'LastPostAuthorID' => $AuthorID,
+					)
+				); //Bumped thread
+			$Part3 = array_slice($Forum,$Stickies,TOPICS_PER_PAGE,true); //Rest of page
+			if ($Stickies > 0) {
+				$Part1 = array_slice($Forum,0,$Stickies,true); //Stickies
+				$Part3 = array_slice($Forum,$Stickies,TOPICS_PER_PAGE-$Stickies-1,true); //Rest of page
+			} else {
+				$Part1 = array();
+				$Part3 = $Forum;
+			}
+			if (is_null($Part1)) { $Part1 = array(); }
+			if (is_null($Part3)) { $Part3 = array(); }
+			$Forum = $Part1 + $Part2 + $Part3;
+			$Cache->cache_value('forums_'.$ForumID, array($Forum,'',0,$Stickies), 0);
+		}
+
+		//Update the forum root
+		$Cache->begin_transaction('forums_list');
+		$UpdateArray = array(
+			'NumPosts'=>'+1',
+			'NumTopics'=>'+1',
+			'LastPostID'=>$PostID,
+			'LastPostAuthorID'=>$AuthorID,
+			'LastPostTopicID'=>$TopicID,
+			'LastPostTime'=>sqltime(),
+			'Title'=>$Title,
+			'IsLocked'=>$ThreadInfo['IsLocked'],
+			'IsSticky'=>$ThreadInfo['IsSticky']
+			);
+
+		$UpdateArray['NumTopics']='+1';
+
+		$Cache->update_row($ForumID, $UpdateArray);
+		$Cache->commit_transaction(0);
+
+		$CatalogueID = floor((POSTS_PER_PAGE*ceil($Posts/POSTS_PER_PAGE)-POSTS_PER_PAGE)/THREAD_CATALOGUE);
+		$Cache->begin_transaction('thread_'.$TopicID.'_catalogue_'.$CatalogueID);
+		$Post = array(
+			'ID'=>$PostID,
+			'AuthorID'=>$LoggedUser['ID'],
+			'AddedTime'=>sqltime(),
+			'Body'=>$PostBody,
+			'EditedUserID'=>0,
+			'EditedTime'=>'0000-00-00 00:00:00',
+			'Username'=>''
+			);
+		$Cache->insert('', $Post);
+		$Cache->commit_transaction(0);
+
+		$Cache->begin_transaction('thread_'.$TopicID.'_info');
+		$Cache->update_row(false, array('Posts'=>'+1', 'LastPostAuthorID'=>$AuthorID));
+		$Cache->commit_transaction(0);
+
+		return $TopicID;
+	}
+
+	/**
+	 * If the suffix of $Haystack is $Needle
+	 *
+	 * @param string $Haystack String to search in
+	 * @param string $Needle String to search for
+	 * @return boolean True if $Needle is a suffix of $Haystack
+	 */
+	public static function ends_with($Haystack, $Needle) {
+		return substr($Haystack, strlen($Needle) * -1) == $Needle;
+	}
+
+
+	/**
+	 * If the preix of $Haystack is $Needle
+	 *
+	 * @param string $Haystack String to search in
+	 * @param string $Needle String to search for
+	 * @return boolean True if $Needle is a preix of $Haystack
+	 */
+	public static function starts_with($Haystack, $Needle) {
+		return strpos($Haystack, $Needle) === 0;
+	}
+
+	/**
+	 * Variant of in_array() with trailing wildcard support
+	 *
+	 * @param string $Needle, array $Haystack
+	 * @return boolean true if (substring of) $Needle exists in $Haystack
+	 */
+	public static function in_array_partial($Needle, $Haystack) {
+		static $Searches = array();
+		if (array_key_exists($Needle, $Searches)) {
+			return $Searches[$Needle];
+		}
+		foreach ($Haystack as $String) {
+			if (substr($String, -1) == '*') {
+				if (!strncmp($Needle, $String, strlen($String)-1)) {
+					$Searches[$Needle] = true;
+					return true;
+				}
+			} elseif (!strcmp($Needle, $String)) {
+				$Searches[$Needle] = true;
+				return true;
+			}
+		}
+		$Searches[$Needle] = false;
+		return false;
+	}
+
+	/**
+	 * Used to check if keys in $_POST and $_GET are all set, and throws an error if not.
+	 * This reduces 'if' statement redundancy for a lot of variables
+	 *
+	 * @param array $Request Either $_POST or $_GET, or whatever other array you want to check.
+	 * @param array $Keys The keys to ensure are set.
+	 * @param boolean $AllowEmpty If set to true, a key that is in the request but blank will not throw an error.
+	 * @param int $Error The error code to throw if one of the keys isn't in the array.
+	 */
+	public static function assert_isset_request($Request, $Keys=NULL, $AllowEmpty = False, $Error=0) {
+		if (isset($Keys)) {
+			foreach ($Keys as $K) {
+				if (!isset($Request[$K]) || ($AllowEmpty == False && $Request[$K] == '')) {
+					error($Error);
+					break;
+				}
+			}
+		} else {
+			foreach ($Request as $R) {
+				if (!isset($R) || ($AllowEmpty == False && $R == '')) {
+					error($Error);
+					break;
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * Given an array of tags, return an array of their IDs.
+	 *
+	 * @param arary $TagNames
+	 * @return array IDs
+	 */
+	public static function get_tags($TagNames) {
+		global $Cache, $DB;
+		$TagIDs = array();
+		foreach ($TagNames as $Index => $TagName) {
+			$Tag = $Cache->get_value('tag_id_'.$TagName);
+			if (is_array($Tag)) {
+				unset($TagNames[$Index]);
+				$TagIDs[$Tag['ID']] = $Tag['Name'];
+			}
+		}
+		if (count($TagNames) > 0) {
+			$DB->query("SELECT ID, Name FROM tags WHERE Name IN ('".implode("', '", $TagNames)."')");
+			$SQLTagIDs = $DB->to_array();
+			foreach ($SQLTagIDs as $Tag) {
+				$TagIDs[$Tag['ID']] = $Tag['Name'];
+				$Cache->cache_value('tag_id_'.$Tag['Name'], $Tag, 0);
+			}
+		}
+
+		return($TagIDs);
+	}
+
+
+	/**
+	 * Gets the alias of the tag, if there is no alias silently returns the original tag.
+	 *
+	 * @param string $BadTag the tag we want to alias
+	 * @return string The aliased tag.
+	 */
+	public static function get_alias_tag($BadTag) {
+			 global $DB;
+			 $DB->query("SELECT AliasTag FROM tag_aliases WHERE BadTag = '". $BadTag ."' LIMIT 1");
+					if ($DB->record_count() > 0) {
+							list($AliasTag) = $DB->next_record();
+							return $AliasTag;
+			 }
+			 return $BadTag;
+	}
+
+
+	/*
+	 * Write a message to the system log.
+	 *
+	 * @param string $Message the message to write.
+	 */
+	public static function write_log($Message) {
+		global $DB,$Time;
+		$DB->query('INSERT INTO log (Message, Time) VALUES (\''
+			.db_string($Message).'\', \''.sqltime().'\')');
+	}
+
+
+	/**
+	 * Get a tag ready for database input and display.
+	 *
+	 * @param string $Str
+	 * @return sanitized version of $Str
+	 */
+	public static function sanitize_tag($Str) {
+		$Str = strtolower($Str);
+		$Str = preg_replace('/[^a-z0-9.]/', '', $Str);
+		$Str = preg_replace('/(^[.,]*)|([.,]*$)/','',$Str);
+		$Str = htmlspecialchars($Str);
+		$Str = db_string(trim($Str));
+		return $Str;
+	}
+
+	/**
+	 * HTML escape an entire array for output.
+	 * @param array $Array, what we want to escape
+	 * @param boolean/array $Escape
+	 *	if true, all keys escaped
+	 *	if false, no escaping.
+	 *	If array, it's a list of array keys not to escape.
+	 * @return mutated version of $Array with values escaped.
+	 */
+	public static function display_array($Array, $Escape = array()) {
+		foreach ($Array as $Key => $Val) {
+			if((!is_array($Escape) && $Escape == true) || !in_array($Key, $Escape)) {
+				$Array[$Key] = display_str($Val);
+			}
+		}
+		return $Array;
+	}
+}
+?>
diff --git a/classes/class_mysql.php b/classes/class_mysql.php
index c44cbc48..cd522de2 100644
--- a/classes/class_mysql.php
+++ b/classes/class_mysql.php
@@ -255,7 +255,7 @@ function next_record($Type=MYSQLI_BOTH, $Escape = true) { // $Escape can be true
 			if (!is_array($this->Record)) {
 				$this->QueryID = FALSE;
 			} elseif($Escape !== FALSE){
-				$this->Record = display_array($this->Record, $Escape);
+				$this->Record = Misc::display_array($this->Record, $Escape);
 			}
 			return $this->Record;
 		}
@@ -303,7 +303,7 @@ function to_array($Key = false, $Type = MYSQLI_BOTH, $Escape = true) {
 		$Return = array();
 		while($Row = mysqli_fetch_array($this->QueryID,$Type)){
 			if($Escape!==FALSE) {
-				$Row = display_array($Row, $Escape);
+				$Row = Misc::display_array($Row, $Escape);
 			}
 			if($Key !== false) {
 				$Return[$Row[$Key]] = $Row;
diff --git a/classes/class_permissions.php b/classes/class_permissions.php
new file mode 100644
index 00000000..6cda611c
--- /dev/null
+++ b/classes/class_permissions.php
@@ -0,0 +1,100 @@
+<?
+class Permissions {
+	/* Check to see if a user has the permission to perform an action
+	 * This is called by check_perms in util.php, for convenience.
+	 *
+	 * @param string PermissionName
+	 * @param string $MinClass Return false if the user's class level is below this.
+	 */
+	public static function check_perms($PermissionName,$MinClass = 0) {
+		global $LoggedUser;
+		return (
+			isset($LoggedUser['Permissions'][$PermissionName])
+			&& $LoggedUser['Permissions'][$PermissionName]
+			&& ($LoggedUser['Class']>=$MinClass
+				|| $LoggedUser['EffectiveClass']>=$MinClass)) ? true : false;
+	}
+
+	/**
+	 * Gets the permissions associated with a certain permissionid
+	 *
+	 * @param int $PermissionID the kind of permissions to fetch
+	 * @return array permissions
+	 */
+	public static function get_permissions($PermissionID) {
+		global $DB, $Cache;
+		$Permission = $Cache->get_value('perm_'.$PermissionID);
+		if (empty($Permission)) {
+			$DB->query("SELECT p.Level AS Class, p.Values as Permissions, p.Secondary, p.PermittedForums FROM permissions AS p WHERE ID='$PermissionID'");
+			$Permission = $DB->next_record(MYSQLI_ASSOC, array('Permissions'));
+			$Permission['Permissions'] = unserialize($Permission['Permissions']);
+			$Cache->cache_value('perm_'.$PermissionID, $Permission, 2592000);
+		}
+		return $Permission;
+	}
+
+	/**
+	 * Get a user's permissions.
+	 *
+	 * @param $UserID
+	 * @param array|false $CustomPermissions
+	 *	Pass in the user's custom permissions if you already have them.
+	 *	Leave false if you don't have their permissions, the function will fetch them.
+	 * @return array Mapping of PermissionName=>bool/int
+	 */
+	public static function get_permissions_for_user($UserID, $CustomPermissions = false) {
+		global $DB;
+
+		$UserInfo = Users::user_info($UserID);
+
+		// Fetch custom permissions if they weren't passed in.
+		if ($CustomPermissions === false) {
+			$DB->query('SELECT um.CustomPermissions FROM users_main AS um
+					WHERE um.ID = '.((int)$UserID));
+			list($CustomPermissions) = $DB->next_record(MYSQLI_NUM, false);
+		}
+
+		if (!empty($CustomPermissions) && !is_array($CustomPermissions)) {
+			$CustomPermissions = unserialize($CustomPermissions);
+		}
+
+		$Permissions = Permissions::get_permissions($UserInfo['PermissionID']);
+
+		// Manage 'special' inherited permissions
+		$BonusPerms = array();
+		$BonusCollages = 0;
+		foreach ($UserInfo['ExtraClasses'] as $PermID => $Value) {
+			$ClassPerms = Permissions::get_permissions($PermID);
+			$BonusCollages += $ClassPerms['Permissions']['MaxCollages'];
+			unset($ClassPerms['Permissions']['MaxCollages']);
+			$BonusPerms = array_merge($BonusPerms, $ClassPerms['Permissions']);
+		}
+
+		if (!empty($CustomPermissions)) {
+			$CustomPerms = $CustomPermissions;
+		} else {
+			$CustomPerms = array();
+		}
+
+		// This is legacy donor cruft
+		if ($UserInfo['Donor']) {
+			$DonorPerms = Permissions::get_permissions(DONOR);
+		} else {
+			$DonorPerms = array('Permissions' => array());
+		}
+
+		$MaxCollages = $Permissions['Permissions']['MaxCollages']
+				+ $BonusCollages
+				+ $CustomPerms['MaxCollages']
+				+ $DonorPerms['Permissions']['MaxCollages'];
+
+		//Combine the permissions
+		return array_merge(
+				$Permissions['Permissions'],
+				$BonusPerms,
+				$CustomPerms,
+				$DonorPerms['Permissions'],
+				array('MaxCollages' => $MaxCollages));
+	}
+}
+?>
diff --git a/classes/class_requests.php b/classes/class_requests.php
new file mode 100644
index 00000000..4ba0cd3b
--- /dev/null
+++ b/classes/class_requests.php
@@ -0,0 +1,120 @@
+<?
+class Requests {
+	/**
+	 * Update the sphinx requests delta table for a request.
+	 *
+	 * @param $RequestID
+	 */
+	public static function update_sphinx_requests($RequestID) {
+		global $DB, $Cache;
+
+		$DB->query("REPLACE INTO sphinx_requests_delta (
+					ID, UserID, TimeAdded, LastVote, CategoryID, Title,
+					Year, ReleaseType, CatalogueNumber, BitrateList,
+					FormatList, MediaList, LogCue, FillerID, TorrentID,
+					TimeFilled, Visible, Votes, Bounty)
+				SELECT
+					ID, r.UserID, UNIX_TIMESTAMP(TimeAdded) AS TimeAdded,
+					UNIX_TIMESTAMP(LastVote) AS LastVote, CategoryID,
+					Title, Year, ReleaseType, CatalogueNumber, BitrateList,
+					FormatList, MediaList, LogCue, FillerID, TorrentID,
+					UNIX_TIMESTAMP(TimeFilled) AS TimeFilled, Visible,
+					COUNT(rv.UserID) AS Votes, SUM(rv.Bounty) >> 10 AS Bounty
+				FROM requests AS r LEFT JOIN requests_votes AS rv ON rv.RequestID=r.ID
+					wHERE ID = ".$RequestID."
+					GROUP BY r.ID");
+
+		$DB->query("UPDATE sphinx_requests_delta
+						SET ArtistList = (SELECT
+							GROUP_CONCAT(aa.Name SEPARATOR ' ')
+						FROM requests_artists AS ra
+							JOIN artists_alias AS aa ON aa.AliasID=ra.AliasID
+						WHERE ra.RequestID = ".$RequestID."
+						GROUP BY NULL)
+					WHERE ID = ".$RequestID);
+
+		$Cache->delete_value('requests_'.$RequestID);
+	}
+
+
+
+	/**
+	 * Function to get data from an array of $RequestIDs.
+	 * In places where the output from this is merged with sphinx filters, it will be in a different order.
+	 *
+	 * @param array $RequestIDs
+	 * @param boolean $Return if set to false, data won't be returned (ie. if we just want to prime the cache.)
+	 * @return The array of requests.
+	 * Format: array(RequestID => Associative array)
+	 * To see what's exactly inside each associate array, peek inside the function. It won't bite.
+	 */
+	//
+	//In places where the output from this is merged with sphinx filters, it will be in a different order.
+	public static function get_requests($RequestIDs, $Return = true) {
+		global $DB, $Cache;
+
+		// Try to fetch the requests from the cache first.
+		$Found = array_flip($RequestIDs);
+		$NotFound = array_flip($RequestIDs);
+
+		foreach ($RequestIDs as $RequestID) {
+			$Data = $Cache->get_value('request_'.$RequestID);
+			if (!empty($Data)) {
+				unset($NotFound[$RequestID]);
+				$Found[$RequestID] = $Data;
+			}
+		}
+
+		$IDs = implode(',',array_flip($NotFound));
+
+		/*
+			Don't change without ensuring you change everything else that uses get_requests()
+		*/
+
+		if (count($NotFound) > 0) {
+			$DB->query("SELECT
+						r.ID AS ID,
+						r.UserID,
+						u.Username,
+						r.TimeAdded,
+						r.LastVote,
+						r.CategoryID,
+						r.Title,
+						r.Year,
+						r.Image,
+						r.Description,
+						r.CatalogueNumber,
+						r.RecordLabel,
+						r.ReleaseType,
+						r.BitrateList,
+						r.FormatList,
+						r.MediaList,
+						r.LogCue,
+						r.FillerID,
+						filler.Username,
+						r.TorrentID,
+						r.TimeFilled,
+						r.GroupID,
+						r.OCLC
+					FROM requests AS r
+						LEFT JOIN users_main AS u ON u.ID=r.UserID
+						LEFT JOIN users_main AS filler ON filler.ID=FillerID AND FillerID!=0
+					WHERE r.ID IN (".$IDs.")
+					ORDER BY ID");
+
+			$Requests = $DB->to_array();
+			foreach ($Requests as $Request) {
+				unset($NotFound[$Request['ID']]);
+				$Request['Tags'] = get_request_tags($Request['ID']);
+				$Found[$Request['ID']] = $Request;
+				$Cache->cache_value('request_'.$Request['ID'], $Request, 0);
+			}
+		}
+
+		if ($Return) { // If we're interested in the data, and not just caching it
+			$Matches = array('matches'=>$Found, 'notfound'=>array_flip($NotFound));
+			return $Matches;
+		}
+	}
+}
+?>
diff --git a/classes/class_sphinxql.php b/classes/class_sphinxql.php
index 58f98b07..16a92874 100644
--- a/classes/class_sphinxql.php
+++ b/classes/class_sphinxql.php
@@ -3,7 +3,7 @@
 	error('Mysqli Extension not loaded.');
 }
 
-class SPHINXQL extends mysqli {
+class SphinxQL extends mysqli {
 	private static $Connections = array();
 	private $Server;
 	private $Port;
@@ -56,7 +56,7 @@ private function get_ident($Server, $Port, $Socket) {
 	public static function init_connection($Server, $Port, $Socket) {
 		$Ident = self::get_ident($Server, $Port, $Socket);
 		if(!isset(self::$Connections[$Ident])) {
-			self::$Connections[$Ident] = new SPHINXQL($Server, $Port, $Socket);
+			self::$Connections[$Ident] = new SphinxQL($Server, $Port, $Socket);
 		}
 		return self::$Connections[$Ident];
 	}
@@ -130,12 +130,12 @@ public function escape_string($String) {
 	 * @param param $QueryProcessTime time building and processing the query
 	 */
 	public function register_query($QueryString, $QueryProcessTime) {
-		SPHINXQL::$Queries[] = array($QueryString, $QueryProcessTime);
-		SPHINXQL::$Time += $QueryProcessTime;
+		SphinxQL::$Queries[] = array($QueryString, $QueryProcessTime);
+		SphinxQL::$Time += $QueryProcessTime;
 	}
 }
 
-class SPHINXQL_QUERY {
+class SphinxQL_Query {
 	private $SphinxQL;
 
 	private $Expressions;
@@ -157,7 +157,7 @@ class SPHINXQL_QUERY {
 	 * @param string $Socket Unix socket address, overrides $Server:$Port
 	 */
 	public function __construct($Server = SPHINXQL_HOST, $Port = SPHINXQL_PORT, $Socket = SPHINXQL_SOCK) {
-		$this->SphinxQL = SPHINXQL::init_connection($Server, $Port, $Socket);
+		$this->SphinxQL = SphinxQL::init_connection($Server, $Port, $Socket);
 		$this->reset();
 	}
 
@@ -248,7 +248,7 @@ public function where_match($Expr, $Field = '*') {
 		if(empty($Expr)) {
 			return $this;
 		}
-		$this->Expressions[] = "@$Field ".SPHINXQL::escape_string($Expr);
+		$this->Expressions[] = "@$Field ".SphinxQL::escape_string($Expr);
 		return $this;
 	}
 
@@ -370,7 +370,7 @@ public function query($GetMeta = true) {
 		$QueryString = $this->QueryString;
 		$Result = $this->send_query($GetMeta);
 		$QueryProcessTime = (microtime(true) - $QueryStartTime)*1000;
-		SPHINXQL::register_query($QueryString, $QueryProcessTime);
+		SphinxQL::register_query($QueryString, $QueryProcessTime);
 		return $Result;
 	}
 
@@ -405,7 +405,7 @@ private function send_query($GetMeta) {
 		} else {
 			$Meta = $GetMeta ? $this->get_meta() : null;
 		}
-		return new SPHINXQL_RESULT($Result, $Meta, $Errno, $Error);
+		return new SphinxQL_Result($Result, $Meta, $Errno, $Error);
 	}
 
 	/**
@@ -441,7 +441,7 @@ private function error($Msg, $Halt = false) {
 	}
 }
 
-class SPHINXQL_RESULT {
+class SphinxQL_Result {
 	private $Result;
 	private $Meta;
 	public $Errno;
diff --git a/classes/class_text.php b/classes/class_text.php
index 770fcf1d..f3fdcccb 100644
--- a/classes/class_text.php
+++ b/classes/class_text.php
@@ -458,24 +458,24 @@ function to_html($Array) {
 					$Str.='<a href="user.php?action=search&amp;search='.urlencode($Block['Val']).'">'.$Block['Val'].'</a>';
 					break;
 				case 'artist':
-					$Str.='<a href="artist.php?artistname='.urlencode(undisplay_str($Block['Val'])).'">'.$Block['Val'].'</a>';
+					$Str.='<a href="artist.php?artistname='.urlencode(Format::undisplay_str($Block['Val'])).'">'.$Block['Val'].'</a>';
 					break;
                 case 'rule':
                     $Rule = trim(strtolower($Block['Val']));
                     if($Rule[0] != 'r' && $Rule[0] != 'h') {
                         $Rule = 'r'.$Rule;
                     }
-                    $Str.='<a href="rules.php?p=upload#'.urlencode(undisplay_str($Rule)).'">'.preg_replace('/[aA-zZ]/', '', $Block['Val']).'</a>';
+                    $Str.='<a href="rules.php?p=upload#'.urlencode(Format::undisplay_str($Rule)).'">'.preg_replace('/[aA-zZ]/', '', $Block['Val']).'</a>';
                     break;
 				case 'torrent':
 					$Pattern = '/('.NONSSL_SITE_URL.'\/torrents\.php.*[\?&]id=)?(\d+)($|&|\#).*/i';
 					$Matches = array();
 					if (preg_match($Pattern, $Block['Val'], $Matches)) {
 						if (isset($Matches[2])) {
-							$Groups = get_groups(array($Matches[2]), true, true, false);
+							$Groups = Torrents::get_groups(array($Matches[2]), true, true, false);
 							if (!empty($Groups['matches'][$Matches[2]])) {
 								$Group = $Groups['matches'][$Matches[2]];
-								$Str .= display_artists($Group['ExtendedArtists']).'<a href="torrents.php?id='.$Matches[2].'">'.$Group['Name'].'</a>';
+								$Str .= Artists::display_artists($Group['ExtendedArtists']).'<a href="torrents.php?id='.$Matches[2].'">'.$Group['Name'].'</a>';
 							} else {
 								$Str .= '[torrent]'.str_replace('[inlineurl]','',$Block['Val']).'[/torrent]';
 							}
diff --git a/classes/class_text2.php b/classes/class_text2.php
index a77a1a15..46f79f29 100644
--- a/classes/class_text2.php
+++ b/classes/class_text2.php
@@ -470,7 +470,7 @@ function to_html($Array) {
 					$Str.='<a href="user.php?action=search&amp;search='.urlencode($Block['Val']).'">'.$Block['Val'].'</a>';
 					break;
 				case 'artist':
-					$Str.='<a href="artist.php?artistname='.urlencode(undisplay_str($Block['Val'])).'">'.$Block['Val'].'</a>';
+					$Str.='<a href="artist.php?artistname='.urlencode(Format::undisplay_str($Block['Val'])).'">'.$Block['Val'].'</a>';
 					break;
 				case 'wiki':
 					$Str.='<a href="wiki.php?action=article&amp;name='.urlencode($Block['Val']).'">'.$Block['Val'].'</a>';
diff --git a/classes/class_tools.php b/classes/class_tools.php
new file mode 100644
index 00000000..5cf2e120
--- /dev/null
+++ b/classes/class_tools.php
@@ -0,0 +1,239 @@
+<?
+class Tools {
+	/**
+	 * Returns true if given IP is banned.
+	 *
+	 * @param string $IP
+	 */
+  public static function site_ban_ip($IP) {
+    global $DB, $Cache;
+    $IPNum = Tools::ip_to_unsigned($IP);
+    $IPBans = $Cache->get_value('ip_bans');
+    if (!is_array($IPBans)) {
+      $DB->query("SELECT ID, FromIP, ToIP FROM ip_bans");
+      $IPBans = $DB->to_array(0, MYSQLI_NUM);
+      $Cache->cache_value('ip_bans', $IPBans, 0);
+    }
+    foreach ($IPBans as $Index => $IPBan) {
+      list ($ID, $FromIP, $ToIP) = $IPBan;
+      if ($IPNum >= $FromIP && $IPNum <= $ToIP) {
+        return true;
+      }
+    }
+  
+    return false;
+  }
+
+	/**
+	 * Returns the unsigned form of an IP address.
+	 *
+	 * @param string $IP The IP address x.x.x.x
+	 * @return string the long it represents.
+	 */
+	public static function ip_to_unsigned($IP) {
+		return sprintf("%u", ip2long($IP));
+	}
+
+	/**
+	 * Geolocate an IP address using the database
+	 *
+	 * @param $IP the ip to fetch the country for
+	 * @return the country of origin
+	 */
+	public static function geoip($IP) {
+		static $IPs = array();
+		if (isset($IPs[$IP])) {
+			return $IPs[$IP];
+		}
+		$Long = Tools::ip_to_unsigned($IP);
+		if(!$Long || $Long == 2130706433) { // No need to check cc for 127.0.0.1
+			return false;
+		}
+		global $DB;
+		$DB->query("SELECT EndIP,Code FROM geoip_country WHERE $Long >= StartIP ORDER BY StartIP DESC LIMIT 1");
+		if((!list($EndIP,$Country) = $DB->next_record()) || $EndIP < $Long) {
+			$Country = '?';
+		}
+		$IPs[$IP] = $Country;
+		return $Country;
+	}
+
+	/**
+	 * Gets the hostname for an IP address
+	 *
+	 * @param $IP the IP to get the hostname for
+	 * @return hostname fetched
+	 */
+	public static function get_host_by_ip($IP)
+	{
+		$testar = explode('.',$IP);
+		if (count($testar)!=4) {
+			return $IP;
+		}
+		for ($i=0;$i<4;++$i) {
+			if (!is_numeric($testar[$i])) {
+				return $IP;
+			}
+		}
+
+		$host = `host -W 1 $IP`;
+		return (($host ? end ( explode (' ', $host)) : $IP));
+	}
+
+	/**
+	 * Gets an hostname using AJAX
+	 *
+	 * @param $IP the IP to fetch
+	 * @return a span with javascript code
+	 */
+	public static function get_host_by_ajax($IP) {
+		static $ID = 0;
+		++$ID;
+		return '<span id="host_'.$ID.'">Resolving host...<script type="text/javascript">ajax.get(\'tools.php?action=get_host&ip='.$IP.'\',function(host){$(\'#host_'.$ID.'\').raw().innerHTML=host;});</script></span>';
+	}
+
+
+	/**
+	 * Looks up the full host of an IP address, by system call.
+	 * Used as the server-side counterpart to get_host_by_ajax.
+	 *
+	 * @param string $IP The IP address to look up.
+	 * @return string the host.
+	 */
+	public static function lookup_ip($IP) {
+		//TODO: use the $Cache
+		$Output = explode(' ',shell_exec('host -W 1 '.escapeshellarg($IP)));
+		if(count($Output) == 1 && empty($Output[0])) {
+			//No output at all implies the command failed
+			return '';
+		}
+
+		if(count($Output) != 5) {
+			return false;
+		} else {
+			return $Output[4];
+		}
+	}
+
+	/**
+	 * Format an IP address with links to IP history.
+	 *
+	 * @param string IP
+	 * @return string The HTML
+	 */
+	public static function display_ip($IP) {
+		$Line = display_str($IP).' ('.Tools::get_country_code_by_ajax($IP).') ';
+		$Line .= '[<a href="user.php?action=search&amp;ip_history=on&amp;ip='.display_str($IP).'&amp;matchtype=strict" title="Search">S</a>]';
+		
+		return $Line;
+	}
+
+	public static function get_country_code_by_ajax($IP) {
+		static $ID = 0;
+		++$ID;
+		return '<span id="cc_'.$ID.'">Resolving CC...<script type="text/javascript">ajax.get(\'tools.php?action=get_cc&ip='.$IP.'\',function(cc){$(\'#cc_'.$ID.'\').raw().innerHTML=cc;});</script></span>';
+	}
+
+
+	
+
+	/**
+	 * Disable an array of users.
+	 *
+	 * @param array $UserIDs (You can also send it one ID as an int, because fuck types)
+	 * @param BanReason 0 - Unknown, 1 - Manual, 2 - Ratio, 3 - Inactive, 4 - Unused.
+	 */
+	public static function disable_users($UserIDs, $AdminComment, $BanReason = 1) {
+		global $Cache, $DB;
+		if(!is_array($UserIDs)) {
+			$UserIDs = array($UserIDs);
+		}
+		$DB->query("UPDATE users_info AS i JOIN users_main AS m ON m.ID=i.UserID
+			SET m.Enabled='2',
+			m.can_leech='0',
+			i.AdminComment = CONCAT('".sqltime()." - ".($AdminComment ? $AdminComment : 'Disabled by system')."\n\n', i.AdminComment),
+			i.BanDate='".sqltime()."',
+			i.BanReason='".$BanReason."',
+			i.RatioWatchDownload=".($BanReason == 2?'m.Downloaded':"'0'")."
+			WHERE m.ID IN(".implode(',',$UserIDs).") ");
+		$Cache->decrement('stats_user_count',$DB->affected_rows());
+		foreach($UserIDs as $UserID) {
+			$Cache->delete_value('enabled_'.$UserID);
+			$Cache->delete_value('user_info_'.$UserID);
+			$Cache->delete_value('user_info_heavy_'.$UserID);
+			$Cache->delete_value('user_stats_'.$UserID);
+
+			$DB->query("SELECT SessionID FROM users_sessions WHERE UserID='$UserID' AND Active = 1");
+			while(list($SessionID) = $DB->next_record()) {
+				$Cache->delete_value('session_'.$UserID.'_'.$SessionID);
+			}
+			$Cache->delete_value('users_sessions_'.$UserID);
+			
+			
+			$DB->query("DELETE FROM users_sessions WHERE UserID='$UserID'");
+			
+		}
+
+		// Remove the users from the tracker.
+		$DB->query("SELECT torrent_pass FROM users_main WHERE ID in (".implode(", ",$UserIDs).")");
+		$PassKeys = $DB->collect('torrent_pass');
+		$Concat = "";
+		foreach($PassKeys as $PassKey) {
+			if(strlen($Concat) > 4000) {
+				Tracker::update_tracker('remove_users', array('passkeys' => $Concat));
+				$Concat = $PassKey;
+			} else {
+				$Concat .= $PassKey;
+			}
+		}
+		Tracker::update_tracker('remove_users', array('passkeys' => $Concat));
+	}
+
+	/**
+	 * Warn a user.
+	 *
+	 * @param int $UserID
+	 * @param int $Duration length of warning in seconds
+	 * @param string $reason
+	 */
+	public static function warn_user($UserID, $Duration, $Reason) {
+		global $LoggedUser, $DB, $Cache, $Time;
+
+		$DB->query("SELECT Warned FROM users_info
+								WHERE UserID=".$UserID."
+								AND Warned <> '0000-00-00 00:00:00'");
+		if($DB->record_count() > 0) {
+			//User was already warned, appending new warning to old.
+			list($OldDate) = $DB->next_record();
+			$NewExpDate = date('Y-m-d H:i:s', strtotime($OldDate) + $Duration);
+
+			Misc::send_pm($UserID, 0,
+				db_string("You have received multiple warnings."),
+				db_string("When you received your latest warning (Set to expire on ".date("Y-m-d", (time() + $Duration))."), you already had a different warning (Set to expire on ".date("Y-m-d", strtotime($OldDate)).").\n\n Due to this collision, your warning status will now expire at ".$NewExpDate."."));
+
+			$AdminComment = date("Y-m-d").' - Warning (Clash) extended to expire at '.$NewExpDate.' by '.$LoggedUser['Username']."\nReason: $Reason\n\n";
+
+			$DB->query('UPDATE users_info SET
+				Warned=\''.db_string($NewExpDate).'\',
+				WarnedTimes=WarnedTimes+1,
+				AdminComment=CONCAT(\''.db_string($AdminComment).'\',AdminComment)
+				WHERE UserID=\''.db_string($UserID).'\'');
+		} else {
+			//Not changing, user was not already warned
+			$WarnTime = time_plus($Duration);
+
+			$Cache->begin_transaction('user_info_'.$UserID);
+			$Cache->update_row(false, array('Warned' => $WarnTime));
+			$Cache->commit_transaction(0);
+
+			$AdminComment = date("Y-m-d").' - Warned until '.$WarnTime.' by '.$LoggedUser['Username']."\nReason: $Reason\n\n";
+
+			$DB->query('UPDATE users_info SET
+				Warned=\''.db_string($WarnTime).'\',
+				WarnedTimes=WarnedTimes+1,
+				AdminComment=CONCAT(\''.db_string($AdminComment).'\',AdminComment)
+				WHERE UserID=\''.db_string($UserID).'\'');
+		}
+	}
+}
+?>
diff --git a/classes/class_torrent_form.php b/classes/class_torrent_form.php
index 905e187e..547a4213 100644
--- a/classes/class_torrent_form.php
+++ b/classes/class_torrent_form.php
@@ -93,9 +93,9 @@ function head() {
 				</td>
 				<td>
 				<select id="categories" name="type" onchange="Categories()"<?=$this->Disabled?>>
-<?			foreach(display_array($this->Categories) as $Index => $Cat) {
+<?			foreach(Misc::display_array($this->Categories) as $Index => $Cat) {
 				echo "<option value=\"$Index\"";
-				if($Cat == $this->Torrent['CategoryName']) { echo ' selected="selected"'; }
+				if($Cat == $this->Torrent['CategoryName']) { echo " selected='selected'"; }
 				echo ">";
 				echo $Cat;
 				echo "</option>\n";
@@ -398,7 +398,7 @@ function show() {
 				<td>
 					<select id="format" name="format" onchange="Format()">
 						<option>---</option>
-<?		foreach(display_array($this->Formats) as $Format) {
+<?		foreach(Misc::display_array($this->Formats) as $Format) {
 			echo "<option value='$Format'";
 			if($Format == $Torrent['Format']) { echo " selected='selected'"; }
 			echo ">";
@@ -432,7 +432,7 @@ function show() {
 		$SimpleBitrate = $SimpleBitrate[0];
 		
 		
-		foreach(display_array($this->Bitrates) as $Bitrate) {
+		foreach(Misc::display_array($this->Bitrates) as $Bitrate) {
 			echo "<option value='$Bitrate'";
 			if(($SimpleBitrate && preg_match('/^'.$SimpleBitrate.'.*/', $Bitrate)) || ($OtherBitrate && $Bitrate == "Other")) {
 				echo ' selected="selected"';
@@ -580,7 +580,7 @@ function show() {
 <?			if($GenreTags) { ?>
 					<select id="genre_tags" name="genre_tags" onchange="add_tag();return false;" <?=$this->Disabled?>>
 						<option>---</option>
-<?				foreach(display_array($GenreTags) as $Genre) { ?>
+<?				foreach(Misc::display_array($GenreTags) as $Genre) { ?>
 						<option value="<?=$Genre ?>"><?=$Genre ?></option>
 <?				} ?>
 					</select>
@@ -655,7 +655,7 @@ function audiobook_form() {
 					<select name="format" onchange="Format()">
 						<option value="">---</option>
 <?
-		foreach(display_array($this->Formats) as $Format) {
+		foreach(Misc::display_array($this->Formats) as $Format) {
 			echo "<option value='$Format'";
 			if($Format == $Torrent['Format']) { echo " selected='selected'"; }
 			echo ">";
@@ -681,7 +681,7 @@ function audiobook_form() {
 		} else {
 			$OtherBitrate = false;
 		}
-		foreach(display_array($this->Bitrates) as $Bitrate) {
+		foreach(Misc::display_array($this->Bitrates) as $Bitrate) {
 			echo "<option value='$Bitrate'";
 			if($Bitrate == $Torrent['Bitrate'] || ($OtherBitrate && $Bitrate == "Other")) {
 				echo " selected='selected'";
diff --git a/classes/class_torrents.php b/classes/class_torrents.php
new file mode 100644
index 00000000..b3b60a1e
--- /dev/null
+++ b/classes/class_torrents.php
@@ -0,0 +1,481 @@
+<?
+class Torrents {
+	/*
+	 * Function to get data and torrents for an array of GroupIDs.
+	 * In places where the output from this is merged with sphinx filters, it will be in a different order.
+	 *
+	 * @param array $GroupIDs
+	 * @param boolean $Return if false, nothing is returned. For priming cache.
+	 * @param boolean $GetArtists if true, each group will contain the result of
+	 *	Artists::get_artists($GroupID), in result[$GroupID]['ExtendedArtists']
+	 * @param boolean $Torrents if true, each group contains a list of torrents, in result[$GroupID]['Torrents']
+	 *
+	 * @return array each row of the following format:
+	 * GroupID => (
+	 *	Name
+	 *	Year
+	 *	RecordLabel
+	 *	CatalogueNumber
+	 *	TagList
+	 *	ReleaseType
+	 *	VanityHouse
+	 *	Torrents => {
+	 *		ID => {
+	 *			GroupID, Media, Format, Encoding, RemasterYear, Remastered,
+	 *			RemasterTitle, RemasterRecordLabel, RemasterCatalogueNumber, Scene,
+	 *			HasLog, HasCue, LogScore, FileCount, FreeTorrent, Size, Leechers,
+	 *			Seeders, Snatched, Time, HasFile
+	 *		}
+	 *	}
+	 *	ExtendedArtists => {
+	 *		[1-6] => { // See documentation on Artists::get_artists
+	 *			id, name, aliasid
+	 *		}
+	 *	}
+	 */
+	public static function get_groups($GroupIDs, $Return = true, $GetArtists = true, $Torrents = true) {
+		global $DB, $Cache;
+
+		$Found = array_flip($GroupIDs);
+		$NotFound = array_flip($GroupIDs);
+		$Key = $Torrents ? 'torrent_group_' : 'torrent_group_light_';
+
+		foreach ($GroupIDs as $GroupID) {
+			$Data = $Cache->get_value($Key.$GroupID);
+			if (!empty($Data) && (@$Data['ver'] >= 4)) {
+				unset($NotFound[$GroupID]);
+				$Found[$GroupID] = $Data['d'];
+			}
+		}
+
+		$IDs = implode(',',array_flip($NotFound));
+
+		/*
+		Changing any of these attributes returned will cause very large, very dramatic site-wide chaos.
+		Do not change what is returned or the order thereof without updating:
+			torrents, artists, collages, bookmarks, better, the front page,
+		and anywhere else the get_groups function is used.
+		*/
+
+		if (count($NotFound)>0) {
+			$DB->query("SELECT
+				g.ID, g.Name, g.Year, g.RecordLabel, g.CatalogueNumber, g.TagList, g.ReleaseType, g.VanityHouse
+				FROM torrents_group AS g WHERE g.ID IN ($IDs)");
+
+			while($Group = $DB->next_record(MYSQLI_ASSOC, true)) {
+				unset($NotFound[$Group['ID']]);
+				$Found[$Group['ID']] = $Group;
+				$Found[$Group['ID']]['Torrents'] = array();
+				$Found[$Group['ID']]['Artists'] = array();
+			}
+
+			if ($Torrents) {
+				$DB->query("SELECT
+							ID, GroupID, Media, Format, Encoding, RemasterYear, Remastered, RemasterTitle,
+							RemasterRecordLabel, RemasterCatalogueNumber, Scene, HasLog, HasCue, LogScore,
+							FileCount, FreeTorrent, Size, Leechers, Seeders, Snatched, Time, ID AS HasFile
+							FROM torrents AS t
+							WHERE GroupID IN($IDs)
+							ORDER BY GroupID, Remastered, (RemasterYear <> 0) DESC, RemasterYear, RemasterTitle,
+							RemasterRecordLabel, RemasterCatalogueNumber, Media, Format, Encoding, ID");
+				while($Torrent = $DB->next_record(MYSQLI_ASSOC, true)) {
+					$Found[$Torrent['GroupID']]['Torrents'][$Torrent['ID']] = $Torrent;
+
+					$Cache->cache_value('torrent_group_'.$Torrent['GroupID'],
+							array('ver'=>4, 'd'=>$Found[$Torrent['GroupID']]), 0);
+					$Cache->cache_value('torrent_group_light_'.$Torrent['GroupID'],
+							array('ver'=>4, 'd'=>$Found[$Torrent['GroupID']]), 0);
+				}
+			} else {
+				foreach ($Found as $Group) {
+					$Cache->cache_value('torrent_group_light_'.$Group['ID'], array('ver'=>4, 'd'=>$Found[$Group['ID']]), 0);
+				}
+			}
+		}
+		if ($GetArtists) {
+			$Artists = Artists::get_artists($GroupIDs);
+		} else {
+			$Artists = array();
+		}
+
+		if ($Return) { // If we're interested in the data, and not just caching it
+			foreach ($Artists as $GroupID=>$Data) {
+				if (array_key_exists(1, $Data) || array_key_exists(4, $Data) || array_key_exists(6, $Data)) {
+					$Found[$GroupID]['Artists']=$Data[1]; // Only use main artists (legacy)
+					$Found[$GroupID]['ExtendedArtists'][1]=$Data[1];
+					$Found[$GroupID]['ExtendedArtists'][2]=$Data[2];
+					$Found[$GroupID]['ExtendedArtists'][3]=$Data[3];
+					$Found[$GroupID]['ExtendedArtists'][4]=$Data[4];
+					$Found[$GroupID]['ExtendedArtists'][5]=$Data[5];
+					$Found[$GroupID]['ExtendedArtists'][6]=$Data[6];
+				}
+				else {
+					$Found[$GroupID]['ExtendedArtists'] = false;
+				}
+			}
+
+			$Matches = array('matches'=>$Found, 'notfound'=>array_flip($NotFound));
+
+			return $Matches;
+		}
+	}
+
+
+	/*
+	 * Write to the group log.
+	 *
+	 * @param int $GroupID
+	 * @param int $TorrentID
+	 * @param int $UserID
+	 * @param string $Message
+	 * @param boolean $Hidden Currently does fuck all. TODO: Fix that.
+	 */
+	public static function write_group_log($GroupID, $TorrentID, $UserID, $Message, $Hidden) {
+		global $DB,$Time;
+		$DB->query("INSERT INTO group_log (GroupID, TorrentID, UserID, Info, Time, Hidden) VALUES ("
+			.$GroupID.", ".$TorrentID.", ".$UserID.", '".db_string($Message)."', '".sqltime()."', ".$Hidden.")");
+	}
+
+
+	/**
+	 * Delete a torrent.
+	 *
+	 * @param int $ID The ID of the torrent to delete.
+	 * @param int $GroupID Set it if you have it handy, to save a query. Otherwise, it will be found.
+	 * @param string $OcelotReason The deletion reason for ocelot to report to users.
+	 */
+	public static function delete_torrent($ID, $GroupID=0, $OcelotReason=-1) {
+		global $DB, $Cache, $LoggedUser;
+		if (!$GroupID) {
+			$DB->query("SELECT GroupID, UserID FROM torrents WHERE ID='$ID'");
+			list($GroupID, $UploaderID) = $DB->next_record();
+		}
+		if (empty($UserID)) {
+			$DB->query("SELECT UserID FROM torrents WHERE ID='$ID'");
+			list($UserID) = $DB->next_record();
+		}
+
+		$RecentUploads = $Cache->get_value('recent_uploads_'.$UserID);
+		if (is_array($RecentUploads)) {
+			foreach ($RecentUploads as $Key => $Recent) {
+				if ($Recent['ID'] == $GroupID) {
+					$Cache->delete_value('recent_uploads_'.$UserID);
+				}
+			}
+		}
+
+		
+		$DB->query("SELECT info_hash FROM torrents WHERE ID = ".$ID);
+		list($InfoHash) = $DB->next_record(MYSQLI_BOTH, false);
+		$DB->query("DELETE FROM torrents WHERE ID = ".$ID);
+		Tracker::update_tracker('delete_torrent', array('info_hash' => rawurlencode($InfoHash), 'id' => $ID, 'reason' => $OcelotReason));
+
+		$Cache->decrement('stats_torrent_count');
+
+		$DB->query("SELECT COUNT(ID) FROM torrents WHERE GroupID='$GroupID'");
+		list($Count) = $DB->next_record();
+
+		if ($Count == 0) {
+			Torrents::delete_group($GroupID);
+		} else {
+			Torrents::update_hash($GroupID);
+			//Artists
+			$DB->query("SELECT ArtistID
+					FROM torrents_artists
+					WHERE GroupID = ".$GroupID);
+			$ArtistIDs = $DB->collect('ArtistID');
+			foreach ($ArtistIDs as $ArtistID) {
+				$Cache->delete_value('artist_'.$ArtistID);
+			}
+		}
+
+		// Torrent notifications
+		$DB->query("SELECT UserID FROM users_notify_torrents WHERE TorrentID='$ID'");
+		while(list($UserID) = $DB->next_record()) {
+			$Cache->delete_value('notifications_new_'.$UserID);
+		}
+		$DB->query("DELETE FROM users_notify_torrents WHERE TorrentID='$ID'");
+
+
+		$DB->query("UPDATE reportsv2 SET
+				Status='Resolved',
+				LastChangeTime='".sqltime()."',
+				ModComment='Report already dealt with (Torrent deleted)'
+			WHERE TorrentID=".$ID."
+				AND Status != 'Resolved'");
+		$Reports = $DB->affected_rows();
+		if ($Reports) {
+			$Cache->decrement('num_torrent_reportsv2', $Reports);
+		}
+
+		$DB->query("DELETE FROM torrents_files WHERE TorrentID='$ID'");
+		$DB->query("DELETE FROM torrents_bad_tags WHERE TorrentID = ".$ID);
+		$DB->query("DELETE FROM torrents_bad_folders WHERE TorrentID = ".$ID);
+		$DB->query("DELETE FROM torrents_bad_files WHERE TorrentID = ".$ID);
+		$DB->query("DELETE FROM torrents_cassette_approved WHERE TorrentID = ".$ID);
+		$DB->query("DELETE FROM torrents_lossymaster_approved WHERE TorrentID = ".$ID);
+		$DB->query("DELETE FROM torrents_lossyweb_approved WHERE TorrentID = ".$ID);
+		$Cache->delete_value('torrent_download_'.$ID);
+		$Cache->delete_value('torrent_group_'.$GroupID);
+		$Cache->delete_value('torrents_details_'.$GroupID);
+	}
+
+
+	/**
+	 * Delete a group, called after all of its torrents have been deleted.
+	 * IMPORTANT: Never call this unless you're certain the group is no longer used by any torrents
+	 *
+	 * @param int $GroupID
+	 */
+	public static function delete_group($GroupID) {
+		global $DB, $Cache;
+
+		Misc::write_log("Group ".$GroupID." automatically deleted (No torrents have this group).");
+
+		$DB->query("SELECT CategoryID FROM torrents_group WHERE ID='$GroupID'");
+		list($Category) = $DB->next_record();
+		if ($Category == 1) {
+			$Cache->decrement('stats_album_count');
+		}
+		$Cache->decrement('stats_group_count');
+
+		
+
+		// Collages
+		$DB->query("SELECT CollageID FROM collages_torrents WHERE GroupID='$GroupID'");
+		if ($DB->record_count()>0) {
+			$CollageIDs = $DB->collect('CollageID');
+			$DB->query("UPDATE collages SET NumTorrents=NumTorrents-1 WHERE ID IN (".implode(', ',$CollageIDs).")");
+			$DB->query("DELETE FROM collages_torrents WHERE GroupID='$GroupID'");
+
+			foreach ($CollageIDs as $CollageID) {
+				$Cache->delete_value('collage_'.$CollageID);
+			}
+			$Cache->delete_value('torrent_collages_'.$GroupID);
+		}
+
+		// Artists
+		// Collect the artist IDs and then wipe the torrents_artist entry
+		$DB->query("SELECT ArtistID FROM torrents_artists WHERE GroupID = ".$GroupID);
+		$Artists = $DB->collect('ArtistID');
+
+		$DB->query("DELETE FROM torrents_artists WHERE GroupID='$GroupID'");
+
+		foreach ($Artists as $ArtistID) {
+			if (empty($ArtistID)) { continue; }
+			// Get a count of how many groups or requests use the artist ID
+			$DB->query("SELECT COUNT(ag.ArtistID)
+						FROM artists_group as ag
+							LEFT JOIN requests_artists AS ra ON ag.ArtistID=ra.ArtistID
+						WHERE ra.ArtistID IS NOT NULL
+							AND ag.ArtistID = '$ArtistID'");
+			list($ReqCount) = $DB->next_record();
+			$DB->query("SELECT COUNT(ag.ArtistID)
+						FROM artists_group as ag
+							LEFT JOIN torrents_artists AS ta ON ag.ArtistID=ta.ArtistID
+						WHERE ta.ArtistID IS NOT NULL
+							AND ag.ArtistID = '$ArtistID'");
+			list($GroupCount) = $DB->next_record();
+			if (($ReqCount + $GroupCount) == 0) {
+				//The only group to use this artist
+				Artists::delete_artist($ArtistID);
+			} else {
+				//Not the only group, still need to clear cache
+				$Cache->delete_value('artist_'.$ArtistID);
+			}
+		}
+
+		// Requests
+		$DB->query("SELECT ID FROM requests WHERE GroupID='$GroupID'");
+		$Requests = $DB->collect('ID');
+		$DB->query("UPDATE requests SET GroupID = NULL WHERE GroupID = '$GroupID'");
+		foreach ($Requests as $RequestID) {
+			$Cache->delete_value('request_'.$RequestID);
+		}
+
+		$DB->query("DELETE FROM torrents_group WHERE ID='$GroupID'");
+		$DB->query("DELETE FROM torrents_tags WHERE GroupID='$GroupID'");
+		$DB->query("DELETE FROM torrents_tags_votes WHERE GroupID='$GroupID'");
+		$DB->query("DELETE FROM torrents_comments WHERE GroupID='$GroupID'");
+		$DB->query("DELETE FROM bookmarks_torrents WHERE GroupID='$GroupID'");
+		$DB->query("DELETE FROM wiki_torrents WHERE PageID='$GroupID'");
+
+		// Tells Sphinx that the group is removed
+		$DB->query("REPLACE INTO sphinx_delta (ID,Time) VALUES ('$GroupID',UNIX_TIMESTAMP())");
+
+		$Cache->delete_value('torrents_details_'.$GroupID);
+		$Cache->delete_value('torrent_group_'.$GroupID);
+		$Cache->delete_value('groups_artists_'.$GroupID);
+	}
+
+
+	/**
+	 * Update the cache and sphinx delta index to keep everything up to date.
+	 *
+	 * @param int $GroupID
+	 */
+	public static function update_hash($GroupID) {
+		global $DB, $Cache;
+		$DB->query("UPDATE torrents_group SET TagList=(SELECT REPLACE(GROUP_CONCAT(tags.Name SEPARATOR ' '),'.','_')
+			FROM torrents_tags AS t
+			INNER JOIN tags ON tags.ID=t.TagID
+			WHERE t.GroupID='$GroupID'
+			GROUP BY t.GroupID)
+			WHERE ID='$GroupID'");
+
+		$DB->query("REPLACE INTO sphinx_delta
+			(ID, GroupName, TagList, Year, CategoryID, Time, ReleaseType, RecordLabel,
+			CatalogueNumber, VanityHouse, Size, Snatched, Seeders, Leechers, LogScore,
+			Scene, HasLog, HasCue, FreeTorrent, Media, Format, Encoding, RemasterYear,
+			RemasterTitle, RemasterRecordLabel, RemasterCatalogueNumber, FileList)
+			SELECT
+			g.ID AS ID,
+			g.Name AS GroupName,
+			g.TagList,
+			g.Year,
+			g.CategoryID,
+			UNIX_TIMESTAMP(g.Time) AS Time,
+			g.ReleaseType,
+			g.RecordLabel,
+			g.CatalogueNumber,
+			g.VanityHouse,
+			MAX(CEIL(t.Size/1024)) AS Size,
+			SUM(t.Snatched) AS Snatched,
+			SUM(t.Seeders) AS Seeders,
+			SUM(t.Leechers) AS Leechers,
+			MAX(t.LogScore) AS LogScore,
+			MAX(t.Scene) AS Scene,
+			MAX(t.HasLog) AS HasLog,
+			MAX(t.HasCue) AS HasCue,
+			BIT_OR(t.FreeTorrent-1) AS FreeTorrent,
+			GROUP_CONCAT(DISTINCT t.Media SEPARATOR ' ') AS Media,
+			GROUP_CONCAT(DISTINCT t.Format SEPARATOR ' ') AS Format,
+			GROUP_CONCAT(DISTINCT t.Encoding SEPARATOR ' ') AS Encoding,
+			GROUP_CONCAT(DISTINCT t.RemasterYear SEPARATOR ' ') AS RemasterYear,
+			GROUP_CONCAT(DISTINCT t.RemasterTitle SEPARATOR ' ') AS RemasterTitle,
+			GROUP_CONCAT(DISTINCT t.RemasterRecordLabel SEPARATOR ' ') AS RemasterRecordLabel,
+			GROUP_CONCAT(DISTINCT t.RemasterCatalogueNumber SEPARATOR ' ') AS RemasterCatalogueNumber,
+			GROUP_CONCAT(REPLACE(REPLACE(FileList, '|||', '\n '), '_', ' ') SEPARATOR '\n ') AS FileList
+			FROM torrents AS t
+			JOIN torrents_group AS g ON g.ID=t.GroupID
+			WHERE g.ID=$GroupID
+			GROUP BY g.ID");
+
+		$DB->query("INSERT INTO sphinx_delta
+			(ID, ArtistName)
+			SELECT
+			GroupID,
+			GROUP_CONCAT(aa.Name separator ' ')
+			FROM torrents_artists AS ta
+			JOIN artists_alias AS aa ON aa.AliasID=ta.AliasID
+			JOIN torrents_group AS tg ON tg.ID=ta.GroupID
+			WHERE ta.GroupID=$GroupID AND ta.Importance IN ('1', '4', '5', '6')
+			GROUP BY tg.ID
+			ON DUPLICATE KEY UPDATE ArtistName=values(ArtistName)");
+
+		$Cache->delete_value('torrents_details_'.$GroupID);
+		$Cache->delete_value('torrent_group_'.$GroupID);
+
+		$ArtistInfo = Artists::get_artist($GroupID);
+		foreach ($ArtistInfo as $Importances => $Importance) {
+			foreach ($Importance as $Artist) {
+				$Cache->delete_value('artist_'.$Artist['id']); //Needed for at least freeleech change, if not others.
+			}
+		}
+
+		$Cache->delete_value('groups_artists_'.$GroupID);
+	}
+
+
+	/**
+	 * Format the information about a torrent.
+	 * @param $Data an array a subset of the following keys:
+	 *	Format, Encoding, HasLog, LogScore HasCue, Media, Scene, RemasterYear
+	 *	RemasterTitle, FreeTorrent, PersonalFL
+	 * @param boolean $ShowMedia if false, Media key will be omitted
+	 * @param boolean $ShowEdition if false, RemasterYear/RemasterTitle will be omitted
+	 */
+	public static function torrent_info($Data, $ShowMedia = false, $ShowEdition = false) {
+		$Info = array();
+		if (!empty($Data['Format'])) { $Info[]=$Data['Format']; }
+		if (!empty($Data['Encoding'])) { $Info[]=$Data['Encoding']; }
+		if (!empty($Data['HasLog'])) {
+			$Str = 'Log';
+			if (!empty($Data['LogScore'])) {
+				$Str.=' ('.$Data['LogScore'].'%)';
+			}
+			$Info[]=$Str;
+		}
+		if (!empty($Data['HasCue'])) { $Info[]='Cue'; }
+		if ($ShowMedia && !empty($Data['Media'])) { $Info[]=$Data['Media']; }
+		if (!empty($Data['Scene'])) { $Info[]='Scene'; }
+		if ($ShowEdition) {
+			$EditionInfo = array();
+			if (!empty($Data['RemasterYear'])) { $EditionInfo[]=$Data['RemasterYear']; }
+			if (!empty($Data['RemasterTitle'])) { $EditionInfo[]=$Data['RemasterTitle']; }
+			if (count($EditionInfo)) { $Info[]=implode(' ',$EditionInfo); }
+		}
+		if ($Data['FreeTorrent'] == '1') { $Info[]='<strong>Freeleech!</strong>'; }
+		if ($Data['FreeTorrent'] == '2') { $Info[]='<strong>Neutral Leech!</strong>'; }
+		if ($Data['PersonalFL'] == 1) { $Info[]='<strong>Personal Freeleech!</strong>'; }
+		return implode(' / ', $Info);
+	}
+
+
+	/**
+	 * Will freeleech / neutralleech / normalise a set of torrents
+	 *
+	 * @param array $TorrentIDs An array of torrents IDs to iterate over
+	 * @param int $FreeNeutral 0 = normal, 1 = fl, 2 = nl
+	 * @param int $FreeLeechType 0 = Unknown, 1 = Staff picks, 2 = Perma-FL (Toolbox, etc.), 3 = Vanity House
+	 */
+	public static function freeleech_torrents($TorrentIDs, $FreeNeutral = 1, $FreeLeechType = 0) {
+		global $DB, $Cache, $LoggedUser;
+
+		if (!is_array($TorrentIDs)) {
+			$TorrentIDs = array($TorrentIDs);
+		}
+
+		$DB->query("UPDATE torrents SET FreeTorrent = '".$FreeNeutral."', FreeLeechType = '".$FreeLeechType
+				."' WHERE ID IN (".implode(", ", $TorrentIDs).")");
+
+		$DB->query("SELECT ID, GroupID, info_hash FROM torrents WHERE ID IN (".implode(", ", $TorrentIDs).") ORDER BY GroupID ASC");
+		$Torrents = $DB->to_array(false, MYSQLI_NUM, false);
+		$GroupIDs = $DB->collect('GroupID');
+
+		foreach ($Torrents as $Torrent) {
+			list($TorrentID, $GroupID, $InfoHash) = $Torrent;
+			Tracker::update_tracker('update_torrent', array('info_hash' => rawurlencode($InfoHash), 'freetorrent' => $FreeNeutral));
+			$Cache->delete_value('torrent_download_'.$TorrentID);
+			Misc::write_log($LoggedUser['Username']." marked torrent ".$TorrentID." freeleech type ".$FreeLeechType."!");
+			Torrents::write_group_log($GroupID, $TorrentID, $LoggedUser['ID'], "marked as freeleech type ".$FreeLeechType."!", 0);
+		}
+
+		foreach ($GroupIDs as $GroupID) {
+			Torrents::update_hash($GroupID);
+		}
+	}
+
+	/**
+	 * Convenience function to allow for passing groups to Torrents::freeleech_torrents()
+	 *
+	 * @param array $GroupIDs the groups in question
+	 * @param int $FreeNeutral see Torrents::freeleech_torrents()
+	 * @param int $FreeLeechType see Torrents::freeleech_torrents()
+	 */
+	public static function freeleech_groups($GroupIDs, $FreeNeutral = 1, $FreeLeechType = 0) {
+		global $DB;
+
+		if (!is_array($GroupIDs)) {
+			$GroupIDs = array($GroupIDs);
+		}
+
+		$DB->query("SELECT ID from torrents WHERE GroupID IN (".implode(", ", $GroupIDs).")");
+		if ($DB->record_count()) {
+			$TorrentIDs = $DB->collect('ID');
+			Torrents::freeleech_torrents($TorrentIDs, $FreeNeutral, $FreeLeechType);
+		}
+	}
+
+}
+?>
diff --git a/classes/class_tracker.php b/classes/class_tracker.php
new file mode 100644
index 00000000..e27a0347
--- /dev/null
+++ b/classes/class_tracker.php
@@ -0,0 +1,73 @@
+<?
+// TODO: Turn this into a class with nice functions like update_user, delete_torrent, etc.
+class Tracker {
+	/**
+	 * Send a GET request over a socket directly to the tracker
+	 * For example, Tracker::update_tracker('change_passkey', array('oldpasskey' => OLD_PASSKEY, 'newpasskey' => NEW_PASSKEY)) will send the request:
+	 * GET /tracker_32_char_secret_code/update?action=change_passkey&oldpasskey=OLD_PASSKEY&newpasskey=NEW_PASSKEY HTTP/1.1
+	 *
+	 * @param string $Action The action to send
+	 * @param array $Updates An associative array of key->value pairs to send to the tracker
+	 * @param boolean $ToIRC Sends a message to the channel #tracker with the GET URL.
+	 */
+	function update_tracker($Action, $Updates, $ToIRC = false) {
+		global $Cache;
+		//Build request
+		$Get = '/update?action='.$Action;
+		foreach ($Updates as $Key => $Value) {
+			$Get .= '&'.$Key.'='.$Value;
+		}
+
+		if ($ToIRC != false) {
+			send_irc('PRIVMSG #tracker :'.$Get);
+		}
+		$Path = TRACKER_SECRET.$Get;
+
+		$Return = "";
+		$Attempts = 0;
+		while ($Return != "success" && $Attempts < 3) {
+
+			// Send update
+			$File = fsockopen(TRACKER_HOST, TRACKER_PORT, $ErrorNum, $ErrorString);
+			if ($File) {
+				$Header = 'GET /'.$Path.' HTTP/1.1\r\n';
+				if (fwrite($File, $Header) === false) {
+					$Attempts++;
+					$Err = "Failed to fwrite()";
+					sleep(3);
+					continue;
+				}
+			} else {
+				$Attempts++;
+				$Err = "Failed to fsockopen() - ".$ErrorNum." - ".$ErrorString;
+				sleep(6);
+				continue;
+			}
+
+			// Check for response.
+
+			$ResHeader = '';
+			do {
+				$ResHeader .= fread($File, 1);
+			} while (!feof($File) && !Misc::ends_with($ResHeader, "\r\n\r\n"));
+
+			$Response = '';
+			while($Line = fgets($File)) {
+				$Response .= $Line;
+			}
+
+			$Return = chop($Response);
+			$Attempts++;
+		}
+
+		if ($Return != "success") {
+			send_irc("PRIVMSG #tracker :{$Attempts} {$Err} {$Get}");
+			if ($Cache->get_value('ocelot_error_reported') === false) {
+				send_irc("PRIVMSG ".ADMIN_CHAN." :Failed to update ocelot: ".$Err." : ".$Get);
+				$Cache->cache_value('ocelot_error_reported', true, 900);
+			}
+		}
+		return ($Return == "success");
+	}
+}
+?>
diff --git a/classes/class_users.php b/classes/class_users.php
new file mode 100644
index 00000000..4d30700f
--- /dev/null
+++ b/classes/class_users.php
@@ -0,0 +1,452 @@
+<?
+class Users {
+	/**
+	 * Get $Classes (list of classes keyed by ID) and $ClassLevels
+	 *		(list of classes keyed by level)
+	 * @return array ($Classes, $ClassLevels)
+	 */
+	public static function get_classes() {
+		global $Cache, $DB, $Debug;
+		// Get permissions
+		list($Classes, $ClassLevels) = $Cache->get_value('classes');
+		if (!$Classes || !$ClassLevels) {
+			$DB->query('SELECT ID, Name, Level, Secondary FROM permissions ORDER BY Level');
+			$Classes = $DB->to_array('ID');
+			$ClassLevels = $DB->to_array('Level');
+			$Cache->cache_value('classes', array($Classes, $ClassLevels), 0);
+		}
+		$Debug->set_flag('Loaded permissions');
+		
+		return array($Classes, $ClassLevels);
+	}
+
+
+	/**
+	 * Get user info, is used for the current user and usernames all over the site.
+	 *
+	 * @param $UserID int   The UserID to get info for
+	 * @return array with the following keys:
+	 *	int	ID
+	 *	string	Username
+	 *	int	PermissionID
+	 *	array	Paranoia - $Paranoia array sent to class_paranoia
+	 *	boolean	Artist
+	 *	boolean	Donor
+	 *	string	Warned - When their warning expires in international time format
+	 *	string	Avatar - URL
+	 *	boolean	Enabled
+	 *	string	Title
+	 *	string	CatchupTime - When they last caught up on forums
+	 *	boolean	Visible - If false, they don't show up on peer lists
+	 *	array ExtraClasses - Secondary classes.
+	 *	int EffectiveClass - the highest level of their main and secondary classes
+	 */
+	public static function user_info($UserID) {
+		global $DB, $Cache, $Classes, $SSL;
+		$UserInfo = $Cache->get_value('user_info_'.$UserID);
+		// the !isset($UserInfo['Paranoia']) can be removed after a transition period
+		if (empty($UserInfo) || empty($UserInfo['ID']) || !isset($UserInfo['Paranoia']) || empty($UserInfo['Class'])) {
+			$OldQueryID = $DB->get_query_id();
+	
+	
+			$DB->query("SELECT
+				m.ID,
+				m.Username,
+				m.PermissionID,
+				m.Paranoia,
+				i.Artist,
+				i.Donor,
+				i.Warned,
+				i.Avatar,
+				m.Enabled,
+				m.Title,
+				i.CatchupTime,
+				m.Visible,
+				GROUP_CONCAT(ul.PermissionID SEPARATOR ',') AS Levels
+				FROM users_main AS m
+				INNER JOIN users_info AS i ON i.UserID=m.ID
+				LEFT JOIN users_levels AS ul ON ul.UserID = m.ID
+				WHERE m.ID='$UserID'
+				GROUP BY m.ID");
+			if ($DB->record_count() == 0) { // Deleted user, maybe?
+				$UserInfo = array('ID'=>'','Username'=>'','PermissionID'=>0,'Artist'=>false,'Donor'=>false,'Warned'=>'0000-00-00 00:00:00','Avatar'=>'','Enabled'=>0,'Title'=>'', 'CatchupTime'=>0, 'Visible'=>'1');
+	
+			} else {
+				$UserInfo = $DB->next_record(MYSQLI_ASSOC, array('Paranoia', 'Title'));
+				$UserInfo['CatchupTime'] = strtotime($UserInfo['CatchupTime']);
+				$UserInfo['Paranoia'] = unserialize($UserInfo['Paranoia']);
+				if ($UserInfo['Paranoia'] === false) {
+					$UserInfo['Paranoia'] = array();
+				}
+			}
+
+
+			$UserInfo['Class'] = $Classes[$UserInfo['PermissionID']]['Level'];
+
+			if (!empty($UserInfo['Levels'])) {
+				$UserInfo['ExtraClasses'] = array_fill_keys(explode(',', $UserInfo['Levels']), 1);
+			} else {
+				$UserInfo['ExtraClasses'] = array();
+			}
+			unset($UserInfo['Levels']);
+			$EffectiveClass = $Classes[$UserInfo['PermissionID']]['Level'];
+			foreach ($UserInfo['ExtraClasses'] as $Class => $Val) {
+				$EffectiveClass = max($EffectiveClass, $Classes[$Class]['Level']);
+			}
+			$UserInfo['EffectiveClass'] = $EffectiveClass;
+
+			$Cache->cache_value('user_info_'.$UserID, $UserInfo, 2592000);
+			$DB->set_query_id($OldQueryID);
+		}
+		if (strtotime($UserInfo['Warned']) < time()) {
+			$UserInfo['Warned'] = '0000-00-00 00:00:00';
+			$Cache->cache_value('user_info_'.$UserID, $UserInfo, 2592000);
+		}
+
+		// Image proxy
+		if (check_perms('site_proxy_images') && !empty($UserInfo['Avatar'])) {
+			$UserInfo['Avatar'] = 'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&amp;avatar='.$UserID.'&amp;i='.urlencode($UserInfo['Avatar']);
+		}
+		return $UserInfo;
+	}
+
+	/**
+	 * Gets the heavy user info
+	 * Only used for current user
+	 *
+	 * @param $UserID The userid to get the information for
+	 * @return fetched heavy info.
+	 *		Just read the goddamn code, I don't have time to comment this shit.
+	 */
+	public static function user_heavy_info($UserID) {
+		global $DB, $Cache;
+		//global $Debug;
+
+		$HeavyInfo = $Cache->get_value('user_info_heavy_'.$UserID);
+	
+		if (empty($HeavyInfo)) {
+	
+			$DB->query("SELECT
+				m.Invites,
+				m.torrent_pass,
+				m.IP,
+				m.CustomPermissions,
+				m.can_leech AS CanLeech,
+				i.AuthKey,
+				i.RatioWatchEnds,
+				i.RatioWatchDownload,
+				i.StyleID,
+				i.StyleURL,
+				i.DisableInvites,
+				i.DisablePosting,
+				i.DisableUpload,
+				i.DisableWiki,
+				i.DisableAvatar,
+				i.DisablePM,
+				i.DisableRequests,
+				i.DisableForums,
+				i.SiteOptions,
+				i.DownloadAlt,
+				i.LastReadNews,
+				i.LastReadBlog,
+				i.RestrictedForums,
+				i.PermittedForums,
+				m.FLTokens,
+				m.PermissionID
+				FROM users_main AS m
+				INNER JOIN users_info AS i ON i.UserID=m.ID
+				WHERE m.ID='$UserID'");
+			$HeavyInfo = $DB->next_record(MYSQLI_ASSOC, array('CustomPermissions', 'SiteOptions'));
+
+			if (!empty($HeavyInfo['CustomPermissions'])) {
+				$HeavyInfo['CustomPermissions'] = unserialize($HeavyInfo['CustomPermissions']);
+			} else {
+				$HeavyInfo['CustomPermissions'] = array();
+			}
+
+			if (!empty($HeavyInfo['RestrictedForums'])) {
+				$RestrictedForums = array_map('trim', explode(',', $HeavyInfo['RestrictedForums']));
+			} else {
+				$RestrictedForums = array();
+			}
+			unset($HeavyInfo['RestrictedForums']);
+			if (!empty($HeavyInfo['PermittedForums'])) {
+				$PermittedForums = array_map('trim', explode(',', $HeavyInfo['PermittedForums']));
+			} else {
+				$PermittedForums = array();
+			}
+			unset($HeavyInfo['PermittedForums']);
+			//$Debug->log_var($PermittedForums, 'PermittedForums - User');
+
+			$DB->query("SELECT PermissionID FROM users_levels WHERE UserID = $UserID");
+			$PermIDs = $DB->collect('PermissionID');
+			foreach ($PermIDs AS $PermID) {
+				$Perms = Permissions::get_permissions($PermID);
+				if (!empty($Perms['PermittedForums'])) {
+					//$Debug->log_var("'".$Perms['PermittedForums']."'", "PermittedForums - Perm $PermID");
+					$PermittedForums = array_merge($PermittedForums, array_map('trim', explode(',',$Perms['PermittedForums'])));
+					//$Debug->log_var($PermittedForums, "PermittedForums - After Perm $PermID");
+				}
+			}
+			$Perms = Permissions::get_permissions($HeavyInfo['PermissionID']);
+			unset($HeavyInfo['PermissionID']);
+			if (!empty($Perms['PermittedForums'])) {
+				$PermittedForums = array_merge($PermittedForums, array_map('trim', explode(',',$Perms['PermittedForums'])));
+			}
+			//$Debug->log_var($PermittedForums, 'PermittedForums - Done');
+
+			if (!empty($PermittedForums) || !empty($RestrictedForums)) {
+				$HeavyInfo['CustomForums'] = array();
+				foreach ($RestrictedForums as $ForumID) {
+					$HeavyInfo['CustomForums'][$ForumID] = 0;
+				}
+				foreach ($PermittedForums as $ForumID) {
+					$HeavyInfo['CustomForums'][$ForumID] = 1;
+				}
+			} else {
+				$HeavyInfo['CustomForums'] = null;
+			}
+			//$Debug->log_var($HeavyInfo['CustomForums'], 'CustomForums');
+
+			$HeavyInfo['SiteOptions'] = unserialize($HeavyInfo['SiteOptions']);
+			if (!empty($HeavyInfo['SiteOptions'])) {
+				$HeavyInfo = array_merge($HeavyInfo, $HeavyInfo['SiteOptions']);
+			}
+			unset($HeavyInfo['SiteOptions']);
+
+			$Cache->cache_value('user_info_heavy_'.$UserID, $HeavyInfo, 0);
+		}
+		return $HeavyInfo;
+	}
+
+	/**
+	 * Updates the site options in the database
+	 *
+	 * @param int $UserID the UserID to set the options for
+	 * @param array $NewOptions the new options to set
+	 * @return false if $NewOptions is empty, true otherwise
+	 */
+	public static function update_site_options($UserID, $NewOptions) {
+		if (!is_number($UserID)) {
+			error(0);
+		}
+		if (empty($NewOptions)) {
+			return false;
+		}
+		global $DB, $Cache, $LoggedUser;
+
+		// Get SiteOptions
+		$DB->query("SELECT SiteOptions FROM users_info WHERE UserID = $UserID");
+		list($SiteOptions) = $DB->next_record(MYSQLI_NUM,false);
+		$SiteOptions = unserialize($SiteOptions);
+
+		// Get HeavyInfo
+		$HeavyInfo = Users::user_heavy_info($UserID);
+
+		// Insert new/replace old options
+		$SiteOptions = array_merge($SiteOptions, $NewOptions);
+		$HeavyInfo = array_merge($HeavyInfo, $NewOptions);
+
+		// Update DB
+		$DB->query("UPDATE users_info SET SiteOptions = '".db_string(serialize($SiteOptions))."' WHERE UserID = $UserID");
+
+		// Update cache
+		$Cache->cache_value('user_info_heavy_'.$UserID, $HeavyInfo, 0);
+
+		// Update $LoggedUser if the options are changed for the current
+		if ($LoggedUser['ID'] == $UserID) {
+			$LoggedUser = array_merge($LoggedUser, $NewOptions);
+			$LoggedUser['ID'] = $UserID; // We don't want to allow userid switching
+		}
+		return true;
+	}
+
+
+	/**
+	 * Generate a random string
+	 *
+	 * @param Length
+	 * @return random alphanumeric string
+	 */
+	public static function make_secret($Length = 32) {
+		$Secret = '';
+		$Chars='abcdefghijklmnopqrstuvwxyz0123456789';
+		$CharLen = strlen($Chars)-1;
+		for ($i = 0; $i < $Length; ++$i) {
+			$Secret .= $Chars[mt_rand(0, $CharLen)];
+		}
+		return $Secret;
+	}
+
+	/**
+	 * Create a password hash. This method is deprecated and
+	 * should not be used to create new passwords
+	 *
+	 * @param $Str password
+	 * @param $Secret salt
+	 * @return password hash
+	 */
+	public static function make_hash($Str,$Secret) {
+		return sha1(md5($Secret).$Str.sha1($Secret).SITE_SALT);
+	}
+
+	/**
+	 * Verify a password against a password hash
+	 *
+	 * @param $Password password
+	 * @param $Hash password hash
+	 * @param $Secret salt - Only used if the hash was created
+	 *		       with the deprecated Users::make_hash() method
+	 * @return true on correct password
+	 */
+	public static function check_password($Password, $Hash, $Secret='') {
+		if (!$Password || !$Hash) {
+			return false;
+		}
+		if (Users::is_crypt_hash($Hash)) {
+			return crypt($Password, $Hash) == $Hash;
+		} elseif ($Secret) {
+			return Users::make_hash($Password, $Secret) == $Hash;
+		}
+		return false;
+	}
+
+	/**
+	 * Test if a given hash is a crypt hash
+	 *
+	 * @param $Hash password hash
+	 * @return true if hash is a crypt hash
+	 */
+	public static function is_crypt_hash($Hash) {
+		return preg_match('/\$\d[axy]?\$/', substr($Hash, 0, 4));
+	}
+
+	/**
+	 * Create salted crypt hash for a given string with
+	 * settings specified in CRYPT_HASH_PREFIX
+	 *
+	 * @param $Str string to hash
+	 * @return salted crypt hash
+	 */
+	public static function make_crypt_hash($Str) {
+		$Salt = CRYPT_HASH_PREFIX.Users::gen_crypt_salt().'$';
+		return crypt($Str, $Salt);
+	}
+
+	/**
+	 * Create salt string for eksblowfish hashing. If /dev/urandom cannot be read,
+	 * fall back to an unsecure method based on mt_rand(). The last character needs
+	 * a special case as it must be either '.', 'O', 'e', or 'u'.
+	 *
+	 * @return salt suitable for eksblowfish hashing
+	 */
+	public static function gen_crypt_salt() {
+		$Salt = '';
+		$Chars = "./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+		$Numchars = strlen($Chars) - 1;
+		if ($Handle = @fopen('/dev/urandom', 'r')) {
+			$Bytes = fread($Handle, 22);
+			for($i = 0; $i < 21; $i++) {
+				$Salt .= $Chars[ord($Bytes[$i]) & $Numchars];
+			}
+			$Salt[$i] = $Chars[(ord($Bytes[$i]) & 3) << 4];
+		} else {
+			for($i = 0; $i < 21; $i++) {
+				$Salt .= $Chars[mt_rand(0, $Numchars)];
+			}
+			$Salt[$i] = $Chars[mt_rand(0, 3) << 4];
+		}
+		return $Salt;
+	}
+
+	/**
+	 * Returns a username string for display
+	 *
+	 * @param int $UserID
+	 * @param boolean $Badges whether or not badges (donor, warned, enabled) should be shown
+	 * @param boolean $IsWarned -- TODO: Why the fuck do we need this?
+	 * @param boolean $IsEnabled -- TODO: Why the fuck do we need this?
+	 * @param boolean $Class whether or not to show the class
+	 * @param boolean $Title whether or not to show the title
+	 * @return HTML formatted username
+	 */
+	public static function format_username($UserID, $Badges = false, $IsWarned = true, $IsEnabled = true, $Class = false, $Title = false) {
+		global $Classes;
+
+		// This array is a hack that should be made less retarded, but whatevs
+		// 						  PermID => ShortForm
+		$SecondaryClasses = array(
+								 );
+
+		if ($UserID == 0) {
+			return 'System';
+		}
+
+		$UserInfo = Users::user_info($UserID);
+		if ($UserInfo['Username'] == '') {
+			return "Unknown [$UserID]";
+		}
+
+		$Str = '';
+
+		if ($Title) {
+			$Str .= '<strong><a href="user.php?id='.$UserID.'">'.$UserInfo['Username'].'</a></strong>';
+		} else {
+			$Str .= '<a href="user.php?id='.$UserID.'">'.$UserInfo['Username'].'</a>';
+		}
+
+		if ($Badges) {
+			$Str .= ($UserInfo['Donor'] == 1) ? '<a href="donate.php"><img src="'.STATIC_SERVER.'common/symbols/donor.png" alt="Donor" title="Donor" /></a>' : '';
+		}
+		$Str .= ($IsWarned && $UserInfo['Warned'] != '0000-00-00 00:00:00') ? '<a href="wiki.php?action=article&amp;id=218"><img src="'.STATIC_SERVER.'common/symbols/warned.png" alt="Warned" title="Warned" /></a>' : '';
+		$Str .= ($IsEnabled && $UserInfo['Enabled'] == 2) ? '<a href="rules.php"><img src="'.STATIC_SERVER.'common/symbols/disabled.png" alt="Banned" title="Be good, and you won\'t end up like this user" /></a>' : '';
+
+		if ($Badges) {
+			$ClassesDisplay = array();
+			foreach($SecondaryClasses as $PermID => $PermHTML) {
+				if ($UserInfo['ExtraClasses'][$PermID]) {
+					$ClassesDisplay[] = '<span class="secondary_class" title="'.$Classes[$PermID]['Name'].'">'.$PermHTML.'</span>';
+				}
+			}
+			if (!empty($ClassesDisplay)) {
+				$Str .= '&nbsp;'.implode('&nbsp;', $ClassesDisplay);
+			}
+		}
+
+		if ($Class) {
+			if ($Title) {
+				$Str .= ' <strong>('.Users::make_class_string($UserInfo['PermissionID']).')</strong>';
+			} else {
+				$Str .= ' ('.Users::make_class_string($UserInfo['PermissionID']).')';
+			}
+		}
+
+		if ($Title) {
+			// Image proxy CTs
+			if (check_perms('site_proxy_images') && !empty($UserInfo['Title'])) {
+				$UserInfo['Title'] = preg_replace_callback('~src=("?)(http.+?)(["\s>])~',
+					function($Matches) {
+						return 'src='.$Matches[1].'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&amp;i='.urlencode($Matches[2]).$Matches[3];
+					},
+					$UserInfo['Title']);
+			}
+
+			if ($UserInfo['Title']) {
+				$Str .= ' <span class="user_title">('.$UserInfo['Title'].')</span>';
+			}
+		}
+		return $Str;
+	}
+
+	/**
+	 * Given a class ID, return its name.
+	 *
+	 * @param int $ClassID
+	 * @return string name
+	 */
+	public static function make_class_string($ClassID) {
+		global $Classes;
+		return $Classes[$ClassID]['Name'];
+	}
+}
+?>
diff --git a/classes/class_view.php b/classes/class_view.php
new file mode 100644
index 00000000..73167097
--- /dev/null
+++ b/classes/class_view.php
@@ -0,0 +1,73 @@
+<?
+class View {
+	/**
+	 * This function is to include the header file on a page.
+	 *
+	 * @param $PageTitle the title of the page
+	 * @param $JSIncludes is a comma separated list of js files to be inclides on
+	 *                    the page, ONLY PUT THE RELATIVE LOCATION WITHOUT .js
+	 *                    ex: 'somefile,somdire/somefile'
+	 */
+	public static function show_header($PageTitle='',$JSIncludes='') {
+		global $Document, $Cache, $DB, $LoggedUser, $Mobile, $Classes;
+
+		if($PageTitle!='') { $PageTitle.=' :: '; }
+		$PageTitle .= SITE_NAME;
+
+		if(!is_array($LoggedUser) || empty($LoggedUser['ID'])) {
+			require(SERVER_ROOT.'/design/publicheader.php');
+		} else {
+			require(SERVER_ROOT.'/design/privateheader.php');
+		}
+	}
+
+	/**
+	 * This function is to include the footer file on a page.
+	 *
+	 * @param $Options an optional array that you can pass information to the
+	 *                 header through as well as setup certain limitations
+	 *	               Here is a list of parameters that work in the $Options array:
+	 *                 ['disclaimer'] = [boolean] (False) Displays the disclaimer in the footer
+	 */
+	public static function show_footer($Options=array()) {
+		global $ScriptStartTime, $LoggedUser, $Cache, $DB, $SessionID, $UserSessions, $Debug, $Time;
+		if (!is_array($LoggedUser)) { require(SERVER_ROOT.'/design/publicfooter.php'); }
+		else { require(SERVER_ROOT.'/design/privatefooter.php'); }
+	}
+
+
+	/**
+	 * This is a generic function to load a template fromm /design and render it.
+	 * The template should be in /design/my_template_name.php, and have a class
+	 * in it called MyTemplateNameTemplate (my_template_name transformed to
+	 * MixedCase, with the word 'Template' appended).
+	 * This class should have a public static function render($Args), where
+	 * $Args is an associative array of the template variables.
+	 * You should note that by "Template", we mean "php file that outputs stuff".
+	 *
+	 * This function loads /design/$TemplateName.php, and then calls
+	 * render($Args) on the class.
+	 *
+	 * @param string $TemplateName The name of the template, in underscore_format
+	 * @param array $Args the arguments passed to the template.
+	 */
+	public static function render_template($TemplateName, $Args) {
+		static $LoadedTemplates; // Keep track of templates we've already loaded.
+		$ClassName = '';
+		if (isset($LoadedTemplates[$TemplateName])) {
+			$ClassName = $LoadedTemplates[$TemplateName];
+		} else {
+			include(SERVER_ROOT.'/design/' . $TemplateName . '.php');
+
+			// Turn template_name into TemplateName
+			$ClassNameParts = explode('_', $TemplateName);
+			foreach ($ClassNameParts as $Index => $Part) {
+				$ClassNameParts[$Index] = ucfirst($Part);
+			}
+			$ClassName = implode($ClassNameParts). 'Template';
+			$LoadedTemplates[$TemplateName] = $ClassName;
+		}
+		$ClassName::render($Args);
+	}
+}
+?>
diff --git a/classes/class_zip.php b/classes/class_zip.php
index d9cddfe9..a561f960 100644
--- a/classes/class_zip.php
+++ b/classes/class_zip.php
@@ -61,7 +61,7 @@
 require('classes/class_zip.php');
 $Zip = new ZIP('FileName');
 $Name = 'Ubuntu-8.10';
-$Zip->add_file($TorrentData, 'Torrents/'.file_string($Name).'.torrent');
+$Zip->add_file($TorrentData, 'Torrents/'.Misc::file_string($Name).'.torrent');
 $Zip->add_file(file_get_contents('zip.php'), 'zip.php');
 $Zip->close_stream();
 
diff --git a/classes/script_start.php b/classes/script_start.php
index 147b0eeb..90ba7b2e 100644
--- a/classes/script_start.php
+++ b/classes/script_start.php
@@ -13,23 +13,40 @@
 require 'config.php'; //The config contains all site wide configuration information
 
 //Deal with dumbasses
-if(isset($_REQUEST['info_hash']) && isset($_REQUEST['peer_id'])) { die('d14:failure reason40:Invalid .torrent, try downloading again.e'); }
+if (isset($_REQUEST['info_hash']) && isset($_REQUEST['peer_id'])) { die('d14:failure reason40:Invalid .torrent, try downloading again.e'); }
 
 require(SERVER_ROOT.'/classes/class_proxies.php');
-if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']) && proxyCheck($_SERVER['REMOTE_ADDR']) && filter_var($_SERVER['HTTP_X_FORWARDED_FOR'], FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
+
+// Get the user's actual IP address if they're proxied.
+if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])
+		&& proxyCheck($_SERVER['REMOTE_ADDR'])
+		&& filter_var($_SERVER['HTTP_X_FORWARDED_FOR'],
+				FILTER_VALIDATE_IP,
+				FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
 	$_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
 }
 
-$SSL = (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443);
 
-if (!isset($argv) && !empty($_SERVER['HTTP_HOST'])) { //Skip this block if running from cli or if the browser is old and shitty
-	if (!$SSL && $_SERVER['HTTP_HOST'] == 'www.'.NONSSL_SITE_URL) { header('Location: http://'.NONSSL_SITE_URL.$_SERVER['REQUEST_URI']); die(); }
-	if ($SSL && $_SERVER['HTTP_HOST'] == 'www.'.NONSSL_SITE_URL) { header('Location: https://'.SSL_SITE_URL.$_SERVER['REQUEST_URI']); die(); }
-	if(SSL_SITE_URL != NONSSL_SITE_URL) {
-		if (!$SSL && $_SERVER['HTTP_HOST'] == SSL_SITE_URL) { header('Location: https://'.SSL_SITE_URL.$_SERVER['REQUEST_URI']); die(); }
-		if ($SSL && $_SERVER['HTTP_HOST'] == NONSSL_SITE_URL) { header('Location: https://'.SSL_SITE_URL.$_SERVER['REQUEST_URI']); die(); }
+$SSL = (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443);
+if (!isset($argv) && !empty($_SERVER['HTTP_HOST'])) {
+//Skip this block if running from cli or if the browser is old and shitty
+	if (!$SSL && $_SERVER['HTTP_HOST'] == 'www.'.NONSSL_SITE_URL) {
+		header('Location: http://'.NONSSL_SITE_URL.$_SERVER['REQUEST_URI']); die();
+	}
+	if ($SSL && $_SERVER['HTTP_HOST'] == 'www.'.NONSSL_SITE_URL) {
+		header('Location: https://'.SSL_SITE_URL.$_SERVER['REQUEST_URI']); die();
+	}
+	if (SSL_SITE_URL != NONSSL_SITE_URL) {
+		if (!$SSL && $_SERVER['HTTP_HOST'] == SSL_SITE_URL) {
+			header('Location: https://'.SSL_SITE_URL.$_SERVER['REQUEST_URI']); die();
+		}
+		if ($SSL && $_SERVER['HTTP_HOST'] == NONSSL_SITE_URL) {
+			header('Location: https://'.SSL_SITE_URL.$_SERVER['REQUEST_URI']); die();
+		}
+	}
+	if ($_SERVER['HTTP_HOST'] == 'www.m.'.NONSSL_SITE_URL) {
+		header('Location: http://m.'.NONSSL_SITE_URL.$_SERVER['REQUEST_URI']); die();
 	}
-	if($_SERVER['HTTP_HOST'] == 'www.m.'.NONSSL_SITE_URL) { header('Location: http://m.'.NONSSL_SITE_URL.$_SERVER['REQUEST_URI']); die(); }
 }
 
 
@@ -48,6 +65,7 @@
 require(SERVER_ROOT.'/classes/class_search.php'); //Require the searching class
 require(SERVER_ROOT.'/classes/class_paranoia.php'); //Require the paranoia check_paranoia function
 require(SERVER_ROOT.'/classes/regex.php');
+require(SERVER_ROOT.'/classes/util.php');
 
 $Debug = new DEBUG;
 $Debug->handle_errors();
@@ -59,6 +77,52 @@
 $UA = new USER_AGENT;
 $SS = new SPHINX_SEARCH;
 
+// Autoload classes.
+
+spl_autoload_register(function ($ClassName) {
+	$FileName='';
+	switch ($ClassName) {
+		case 'Artists':
+			$FileName = 'class_artists';
+			break;
+		case 'Format':
+			$FileName = 'class_format';
+			break;
+		case 'Misc':
+			$FileName = 'class_misc';
+			break;
+		case 'Permissions':
+			$FileName = 'class_permissions';
+			break;
+		case 'Requests':
+			$FileName = 'class_requests';
+			break;
+		case 'SphinxQL':
+		case 'SphinxQL_Query':
+		case 'SphinxQL_Result':
+			$FileName = 'class_sphinxql';
+			break;
+		case 'Tracker':
+			$FileName = 'class_tracker';
+			break;
+		case 'Tools':
+			$FileName = 'class_tools';
+			break;
+		case 'Torrents':
+			$FileName = 'class_torrents';
+			break;
+		case 'Users':
+			$FileName = 'class_users';
+			break;
+		case 'View':
+			$FileName = 'class_view';
+			break;
+		default:
+			die("Couldn't import class " . $ClassName);
+	}
+	require_once(SERVER_ROOT.'/classes/' . $FileName . '.php');
+});
+
 
 //Begin browser identification
 
@@ -70,19 +134,11 @@
 
 $Debug->set_flag('start user handling');
 
-// Get permissions
-list($Classes, $ClassLevels) = $Cache->get_value('classes');
-if(!$Classes || !$ClassLevels) {
-	$DB->query('SELECT ID, Name, Level, Secondary FROM permissions ORDER BY Level');
-	$Classes = $DB->to_array('ID');
-	$ClassLevels = $DB->to_array('Level');
-	$Cache->cache_value('classes', array($Classes, $ClassLevels), 0);
-}
-$Debug->set_flag('Loaded permissions');
+// Get classes
+// TODO: Remove these globals, replace by calls into Users
+list($Classes, $ClassLevels) = Users::get_classes();
 
-//-----------------------------------------------------------------------------------
-/////////////////////////////////////////////////////////////////////////////////////
-//-- Load user information ----------------------------------------------------------
+//-- Load user information
 // User info is broken up into many sections
 // Heavy - Things that the site never has to look at if the user isn't logged in (as opposed to things like the class, donor status, etc)
 // Light - Things that appear in format_user
@@ -92,7 +148,7 @@
 // Permissions
 
 if (isset($_COOKIE['session'])) { $LoginCookie=$Enc->decrypt($_COOKIE['session']); }
-if(isset($LoginCookie)) {
+if (isset($LoginCookie)) {
 	list($SessionID, $LoggedUser['ID'])=explode("|~|",$Enc->decrypt($LoginCookie));
 	$LoggedUser['ID'] = (int)$LoggedUser['ID'];
 
@@ -101,9 +157,9 @@
 	if (!$LoggedUser['ID'] || !$SessionID) {
 		logout();
 	}
-	
+
 	$UserSessions = $Cache->get_value('users_sessions_'.$UserID);
-	if(!is_array($UserSessions)) {
+	if (!is_array($UserSessions)) {
 		$DB->query("SELECT
 			SessionID,
 			Browser,
@@ -121,10 +177,10 @@
 	if (!array_key_exists($SessionID,$UserSessions)) {
 		logout();
 	}
-	
+
 	// Check if user is enabled
 	$Enabled = $Cache->get_value('enabled_'.$LoggedUser['ID']);
-	if($Enabled === false) {
+	if ($Enabled === false) {
 		$DB->query("SELECT Enabled FROM users_main WHERE ID='$LoggedUser[ID]'");
 		list($Enabled)=$DB->next_record();
 		$Cache->cache_value('enabled_'.$LoggedUser['ID'], $Enabled, 0);
@@ -138,18 +194,18 @@
 
 	// Up/Down stats
 	$UserStats = $Cache->get_value('user_stats_'.$LoggedUser['ID']);
-	if(!is_array($UserStats)) {
+	if (!is_array($UserStats)) {
 		$DB->query("SELECT Uploaded AS BytesUploaded, Downloaded AS BytesDownloaded, RequiredRatio FROM users_main WHERE ID='$LoggedUser[ID]'");
 		$UserStats = $DB->next_record(MYSQLI_ASSOC);
 		$Cache->cache_value('user_stats_'.$LoggedUser['ID'], $UserStats, 3600);
 	}
 
 	// Get info such as username
-	$LightInfo = user_info($LoggedUser['ID']);
-	$HeavyInfo = user_heavy_info($LoggedUser['ID']);
+	$LightInfo = Users::user_info($LoggedUser['ID']);
+	$HeavyInfo = Users::user_heavy_info($LoggedUser['ID']);
 
 	// Get user permissions
-	$Permissions = get_permissions($LightInfo['PermissionID']);
+	$Permissions = Permissions::get_permissions($LightInfo['PermissionID']);
 
 	// Create LoggedUser array
 	$LoggedUser = array_merge($HeavyInfo, $LightInfo, $Permissions, $UserStats);
@@ -162,7 +218,7 @@
 		time() < strtotime($LoggedUser['RatioWatchEnds']) &&
 		($LoggedUser['BytesDownloaded']*$LoggedUser['RequiredRatio'])>$LoggedUser['BytesUploaded']
 	);
-	if(!isset($LoggedUser['ID'])) {
+	if (!isset($LoggedUser['ID'])) {
 		$Debug->log_var($LightInfo, 'LightInfo');
 		$Debug->log_var($HeavyInfo, 'HeavyInfo');
 		$Debug->log_var($Permissions, 'Permissions');
@@ -170,16 +226,16 @@
 	}
 
 	//Load in the permissions
-	$LoggedUser['Permissions'] = get_permissions_for_user($LoggedUser['ID'], $LoggedUser['CustomPermissions']);
-	
+	$LoggedUser['Permissions'] = Permissions::get_permissions_for_user($LoggedUser['ID'], $LoggedUser['CustomPermissions']);
+
 	//Change necessary triggers in external components
 	$Cache->CanClear = check_perms('admin_clear_cache');
-	
+
 	// Because we <3 our staff
 	if (check_perms('site_disable_ip_history')) { $_SERVER['REMOTE_ADDR'] = '127.0.0.1'; }
 
 	// Update LastUpdate every 10 minutes
-	if(strtotime($UserSessions[$SessionID]['LastUpdate'])+600<time()) {
+	if (strtotime($UserSessions[$SessionID]['LastUpdate'])+600<time()) {
 		$DB->query("UPDATE users_main SET LastAccess='".sqltime()."' WHERE ID='$LoggedUser[ID]'");
 		$DB->query("UPDATE users_sessions SET IP='".$_SERVER['REMOTE_ADDR']."', Browser='".$Browser."', OperatingSystem='".$OperatingSystem."', LastUpdate='".sqltime()."' WHERE UserID='$LoggedUser[ID]' AND SessionID='".db_string($SessionID)."'");
 		$Cache->begin_transaction('users_sessions_'.$UserID);
@@ -193,28 +249,28 @@
 				));
 		$Cache->commit_transaction(0);
 	}
-	
+
 	// Notifications
-	if(isset($LoggedUser['Permissions']['site_torrents_notify'])) {
+	if (isset($LoggedUser['Permissions']['site_torrents_notify'])) {
 		$LoggedUser['Notify'] = $Cache->get_value('notify_filters_'.$LoggedUser['ID']);
-		if(!is_array($LoggedUser['Notify'])) {
+		if (!is_array($LoggedUser['Notify'])) {
 			$DB->query("SELECT ID, Label FROM users_notify_filters WHERE UserID='$LoggedUser[ID]'");
 			$LoggedUser['Notify'] = $DB->to_array('ID');
 			$Cache->cache_value('notify_filters_'.$LoggedUser['ID'], $LoggedUser['Notify'], 2592000);
 		}
 	}
-	
+
 	// We've never had to disable the wiki privs of anyone.
 	if ($LoggedUser['DisableWiki']) {
 		unset($LoggedUser['Permissions']['site_edit_wiki']);
 	}
-	
+
 	// IP changed
 	
 	
-	if($LoggedUser['IP'] != $_SERVER['REMOTE_ADDR'] && !check_perms('site_disable_ip_history')) {
+	if ($LoggedUser['IP'] != $_SERVER['REMOTE_ADDR'] && !check_perms('site_disable_ip_history')) {
 	
-		if(site_ban_ip($_SERVER['REMOTE_ADDR'])) {
+		if (Tools::site_ban_ip($_SERVER['REMOTE_ADDR'])) {
 			error('Your IP has been banned.');
 		}
 
@@ -229,7 +285,7 @@
 				(UserID, IP, StartTime) VALUES
 				('$LoggedUser[ID]', '$NewIP', '".sqltime()."')");
 
-		$ipcc = geoip($NewIP);
+		$ipcc = Tools::geoip($NewIP);
 		$DB->query("UPDATE users_main SET IP='$NewIP', ipcc='".$ipcc."' WHERE ID='$LoggedUser[ID]'");
 		$Cache->begin_transaction('user_info_heavy_'.$LoggedUser['ID']);
 		$Cache->update_row(false, array('IP' => $_SERVER['REMOTE_ADDR']));
@@ -237,9 +293,9 @@
 
 		
 	}
+
 	
-	
-	
+
 	// Get stylesheets
 	$Stylesheets = $Cache->get_value('stylesheets');
 	if (!is_array($Stylesheets)) {
@@ -250,8 +306,8 @@
 
 	//A9 TODO: Clean up this messy solution
 	$LoggedUser['StyleName']=$Stylesheets[$LoggedUser['StyleID']]['Name'];
-	
-	if(empty($LoggedUser['Username'])) {
+
+	if (empty($LoggedUser['Username'])) {
 		logout(); // Ghost
 	}
 }
@@ -261,439 +317,6 @@
 
 $Debug->set_flag('start function definitions');
 
-/**
- * Get cached user info, is used for the user loading the page and usernames all over the site
- *
- * @param $UserID int   The UserID to get info for
- */
-function user_info($UserID) {
-	global $DB, $Cache, $Classes, $SSL;
-	$UserInfo = $Cache->get_value('user_info_'.$UserID);
-	// the !isset($UserInfo['Paranoia']) can be removed after a transition period
-	if(empty($UserInfo) || empty($UserInfo['ID']) || !isset($UserInfo['Paranoia']) || empty($UserInfo['Class'])) {
-		$OldQueryID = $DB->get_query_id();
-
-
-		$DB->query("SELECT
-			m.ID,
-			m.Username,
-			m.PermissionID,
-			m.Paranoia,
-			i.Artist,
-			i.Donor,
-			i.Warned,
-			i.Avatar,
-			m.Enabled,
-			m.Title,
-			i.CatchupTime,
-			m.Visible,
-			GROUP_CONCAT(ul.PermissionID SEPARATOR ',') AS Levels
-			FROM users_main AS m
-			INNER JOIN users_info AS i ON i.UserID=m.ID
-			LEFT JOIN users_levels AS ul ON ul.UserID = m.ID
-			WHERE m.ID='$UserID'
-			GROUP BY m.ID");
-		if($DB->record_count() == 0) { // Deleted user, maybe?
-			$UserInfo = array('ID'=>'','Username'=>'','PermissionID'=>0,'Artist'=>false,'Donor'=>false,'Warned'=>'0000-00-00 00:00:00','Avatar'=>'','Enabled'=>0,'Title'=>'', 'CatchupTime'=>0, 'Visible'=>'1');
-
-		} else {
-			$UserInfo = $DB->next_record(MYSQLI_ASSOC, array('Paranoia', 'Title'));
-			$UserInfo['CatchupTime'] = strtotime($UserInfo['CatchupTime']);
-			$UserInfo['Paranoia'] = unserialize($UserInfo['Paranoia']);
-			if($UserInfo['Paranoia'] === false) {
-				$UserInfo['Paranoia'] = array();
-			}
-		}
-		
-		$UserInfo['Class'] = $Classes[$UserInfo['PermissionID']]['Level'];
-		
-		if (!empty($UserInfo['Levels'])) {
-			$UserInfo['ExtraClasses'] = array_fill_keys(explode(',', $UserInfo['Levels']), 1);
-		} else {
-			$UserInfo['ExtraClasses'] = array();
-		}
-		unset($UserInfo['Levels']);
-		$EffectiveClass = $Classes[$UserInfo['PermissionID']]['Level'];
-		foreach($UserInfo['ExtraClasses'] as $Class => $Val) {
-			$EffectiveClass = max($EffectiveClass, $Classes[$Class]['Level']);
-		}
-		$UserInfo['EffectiveClass'] = $EffectiveClass;
-		
-		$Cache->cache_value('user_info_'.$UserID, $UserInfo, 2592000);
-		$DB->set_query_id($OldQueryID);
-	}
-	if(strtotime($UserInfo['Warned']) < time()) {
-		$UserInfo['Warned'] = '0000-00-00 00:00:00';
-		$Cache->cache_value('user_info_'.$UserID, $UserInfo, 2592000);
-	}
-	
-	// Image proxy
-	if(check_perms('site_proxy_images') && !empty($UserInfo['Avatar'])) {
-		$UserInfo['Avatar'] = 'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&amp;avatar='.$UserID.'&amp;i='.urlencode($UserInfo['Avatar']);
-	}
-	return $UserInfo;
-}
-
-/**
- * Gets the heavy user info
- * Only used for current user
- * @param $UserID The userid to get the information for
- * @return fetched heavy info
- */
-function user_heavy_info($UserID) {
-	global $DB, $Cache;
-	//global $Debug;
-
-	$HeavyInfo = $Cache->get_value('user_info_heavy_'.$UserID);
-
-	if(empty($HeavyInfo)) {
-
-		$DB->query("SELECT
-			m.Invites,
-			m.torrent_pass,
-			m.IP,
-			m.CustomPermissions,
-			m.can_leech AS CanLeech,
-			i.AuthKey,
-			i.RatioWatchEnds,
-			i.RatioWatchDownload,
-			i.StyleID,
-			i.StyleURL,
-			i.DisableInvites,
-			i.DisablePosting,
-			i.DisableUpload,
-			i.DisableWiki,
-			i.DisableAvatar,
-			i.DisablePM,
-			i.DisableRequests,
-			i.DisableForums,
-			i.SiteOptions,
-			i.DownloadAlt,
-			i.LastReadNews,
-			i.LastReadBlog,
-			i.RestrictedForums,
-			i.PermittedForums,
-			m.FLTokens,
-			m.PermissionID
-			FROM users_main AS m
-			INNER JOIN users_info AS i ON i.UserID=m.ID
-			WHERE m.ID='$UserID'");
-		$HeavyInfo = $DB->next_record(MYSQLI_ASSOC, array('CustomPermissions', 'SiteOptions'));
-
-		if (!empty($HeavyInfo['CustomPermissions'])) {
-			$HeavyInfo['CustomPermissions'] = unserialize($HeavyInfo['CustomPermissions']);
-		} else {
-			$HeavyInfo['CustomPermissions'] = array();
-		}
-		
-		if (!empty($HeavyInfo['RestrictedForums'])) {
-			$RestrictedForums = array_map('trim', explode(',', $HeavyInfo['RestrictedForums']));
-		} else {
-			$RestrictedForums = array();
-		}
-		unset($HeavyInfo['RestrictedForums']);
-		if (!empty($HeavyInfo['PermittedForums'])) {
-			$PermittedForums = array_map('trim', explode(',', $HeavyInfo['PermittedForums']));
-		} else {
-			$PermittedForums = array();
-		}
-		unset($HeavyInfo['PermittedForums']);
-		//$Debug->log_var($PermittedForums, 'PermittedForums - User');
-		
-		$DB->query("SELECT PermissionID FROM users_levels WHERE UserID = $UserID");
-		$PermIDs = $DB->collect('PermissionID');
-		foreach ($PermIDs AS $PermID) {
-			$Perms = get_permissions($PermID);
-			if(!empty($Perms['PermittedForums'])) {
-				//$Debug->log_var("'".$Perms['PermittedForums']."'", "PermittedForums - Perm $PermID");
-				$PermittedForums = array_merge($PermittedForums, array_map('trim', explode(',',$Perms['PermittedForums'])));
-				//$Debug->log_var($PermittedForums, "PermittedForums - After Perm $PermID");
-			}
-		}
-		$Perms = get_permissions($HeavyInfo['PermissionID']);
-		unset($HeavyInfo['PermissionID']);
-		if(!empty($Perms['PermittedForums'])) {
-			$PermittedForums = array_merge($PermittedForums, array_map('trim', explode(',',$Perms['PermittedForums'])));
-		}
-		//$Debug->log_var($PermittedForums, 'PermittedForums - Done');
-		
-		if (!empty($PermittedForums) || !empty($RestrictedForums)) {
-			$HeavyInfo['CustomForums'] = array();
-			foreach ($RestrictedForums as $ForumID) {
-				$HeavyInfo['CustomForums'][$ForumID] = 0;
-			}
-			foreach ($PermittedForums as $ForumID) {
-				$HeavyInfo['CustomForums'][$ForumID] = 1;
-			}
-		} else {
-			$HeavyInfo['CustomForums'] = null;
-		}
-		//$Debug->log_var($HeavyInfo['CustomForums'], 'CustomForums');
-		
-		$HeavyInfo['SiteOptions'] = unserialize($HeavyInfo['SiteOptions']);
-		if(!empty($HeavyInfo['SiteOptions'])) {
-			$HeavyInfo = array_merge($HeavyInfo, $HeavyInfo['SiteOptions']);
-		}
-		unset($HeavyInfo['SiteOptions']);
-
-		$Cache->cache_value('user_info_heavy_'.$UserID, $HeavyInfo, 0);
-	}
-	return $HeavyInfo;
-}
-
-/**
- * Updates the site options in the database
- *
- * @param $UserID the UserID to set the options for
- * @param $NewOptions the new options to set
- * @return false if $NewOptions is empty, otherwise void.
- */
-function update_site_options($UserID, $NewOptions) {
-	if(!is_number($UserID)) {
-		error(0);
-	}
-	if(empty($NewOptions)) {
-		return false;
-	}
-	global $DB, $Cache, $LoggedUser;
-
-	// Get SiteOptions
-	$DB->query("SELECT SiteOptions FROM users_info WHERE UserID = $UserID");
-	list($SiteOptions) = $DB->next_record(MYSQLI_NUM,false);
-	$SiteOptions = unserialize($SiteOptions);
-
-	// Get HeavyInfo
-	$HeavyInfo = user_heavy_info($UserID);
-
-	// Insert new/replace old options
-	$SiteOptions = array_merge($SiteOptions, $NewOptions);
-	$HeavyInfo = array_merge($HeavyInfo, $NewOptions);
-
-	// Update DB
-	$DB->query("UPDATE users_info SET SiteOptions = '".db_string(serialize($SiteOptions))."' WHERE UserID = $UserID");
-
-	// Update cache
-	$Cache->cache_value('user_info_heavy_'.$UserID, $HeavyInfo, 0);
-
-	// Update $LoggedUser if the options are changed for the current
-	if($LoggedUser['ID'] == $UserID) {
-		$LoggedUser = array_merge($LoggedUser, $NewOptions);
-		$LoggedUser['ID'] = $UserID; // We don't want to allow userid switching
-	}
-}
-
-/**
- * Gets the permissions associated with a certain permissionid
- * 
- * @param $PermissionID the kind of permissions to fetch
- * @return permissions
- */
-function get_permissions($PermissionID) {
-	global $DB, $Cache;
-	$Permission = $Cache->get_value('perm_'.$PermissionID);
-	if(empty($Permission)) {
-		$DB->query("SELECT p.Level AS Class, p.Values as Permissions, p.Secondary, p.PermittedForums FROM permissions AS p WHERE ID='$PermissionID'");
-		$Permission = $DB->next_record(MYSQLI_ASSOC, array('Permissions'));
-		$Permission['Permissions'] = unserialize($Permission['Permissions']);
-		$Cache->cache_value('perm_'.$PermissionID, $Permission, 2592000);
-	}
-	return $Permission;
-}
-
-function get_permissions_for_user($UserID, $CustomPermissions = false) {
-	global $DB;
-
-	$UserInfo = user_info($UserID);
-	
-	if ($CustomPermissions === false) {
-		$DB->query('SELECT um.CustomPermissions FROM users_main AS um WHERE um.ID = '.((int)$UserID));
-	
-		list($CustomPermissions) = $DB->next_record(MYSQLI_NUM, false);
-	}
-	
-	if (!empty($CustomPermissions) && !is_array($CustomPermissions)) {
-		$CustomPermissions = unserialize($CustomPermissions);
-	}
-
-	$Permissions = get_permissions($UserInfo['PermissionID']);
-	
-
-	// Manage 'special' inherited permissions	
-	$BonusPerms = array();
-	$BonusCollages = 0;
-	foreach ($UserInfo['ExtraClasses'] as $PermID => $Value) {
-		$ClassPerms = get_permissions($PermID);
-		$BonusCollages += $ClassPerms['Permissions']['MaxCollages'];
-		unset($ClassPerms['Permissions']['MaxCollages']);
-		$BonusPerms = array_merge($BonusPerms, $ClassPerms['Permissions']);
-	}
-
-	if(!empty($CustomPermissions)) {
-		$CustomPerms = $CustomPermissions;
-	} else {
-		$CustomPerms = array();
-	}
-
-	// This is legacy donor cruft
-	if($UserInfo['Donor']) {
-		$DonorPerms = get_permissions(DONOR);
-	} else {
-		$DonorPerms = array('Permissions' => array());
-	}
-
-	$MaxCollages = $Permissions['Permissions']['MaxCollages'] + $BonusCollages + $CustomPerms['MaxCollages'] + $DonorPerms['Permissions']['MaxCollages'];
-	//Combine the permissions
-	return array_merge($Permissions['Permissions'], $BonusPerms, $CustomPerms, $DonorPerms['Permissions'], array('MaxCollages' => $MaxCollages));
-	
-	//$MaxCollages = $Permissions['Permissions']['MaxCollages'] + $BonusCollages + $CustomPerms['MaxCollages'];
-	//Combine the permissions
-	//return array_merge($Permissions['Permissions'], $BonusPerms, $CustomPerms, array('MaxCollages' => $MaxCollages));
-}
-
-// This function is slow. Don't call it unless somebody's logging in.
-function site_ban_ip($IP) {
-	global $DB, $Cache;
-	$IPNum = ip2unsigned($IP);
-	$IPBans = $Cache->get_value('ip_bans');
-	if(!is_array($IPBans)) {
-		$DB->query("SELECT ID, FromIP, ToIP FROM ip_bans");
-		$IPBans = $DB->to_array(0, MYSQLI_NUM);
-		$Cache->cache_value('ip_bans', $IPBans, 0);
-	}
-	foreach($IPBans as $Index => $IPBan) {
-		list($ID, $FromIP, $ToIP) = $IPBan;
-		if($IPNum >= $FromIP && $IPNum <= $ToIP) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-
-
-function ip2unsigned($IP) {
-	return sprintf("%u", ip2long($IP));
-}
-
-/**
- * Geolocate an IP address using the database
- *
- * @param $IP the ip to fetch the country for
- * @return the country of origin
- */ 
-function geoip($IP) {
-	static $IPs = array();
-	if (isset($IPs[$IP])) {
-		return $IPs[$IP];
-	}
-	$Long = ip2unsigned($IP);
-	if(!$Long || $Long == 2130706433) { // No need to check cc for 127.0.0.1
-		return false;
-	}
-	global $DB;
-	$DB->query("SELECT EndIP,Code FROM geoip_country WHERE $Long >= StartIP ORDER BY StartIP DESC LIMIT 1");
-	if((!list($EndIP,$Country) = $DB->next_record()) || $EndIP < $Long) {
-		$Country = '?';
-	}
-	$IPs[$IP] = $Country;
-	return $Country;
-}
-
-/** 
- * Geolocate an IP address using DNS
- *
- * @param $IP the ip to fetch the country for
- * @return the country of origin
- */
-function old_geoip($IP) {
-	static $Countries = array();
-	if(empty($Countries[$IP])) {
-		$Country = 0;
-		// Reverse IP, so 127.0.0.1 becomes 1.0.0.127
-		$ReverseIP = implode('.', array_reverse(explode('.', $IP)));
-		$TestHost = $ReverseIP.'.country.netop.org';
-		$Return = dns_get_record($TestHost, DNS_TXT);
-		if (!empty($Return)) {
-			$Country = $Return[0]['txt'];
-		}
-		if(!$Country) {
-			$Return = gethostbyaddr($IP);
-			$Return = explode('.',$Return);
-			$Return = array_pop($Return);
-			if(strlen($Return) == 2 && !is_number($Return)) {
-				$Country = strtoupper($Return);
-			} else {
-				$Country = '?';
-			}
-		}
-		if($Country == 'UK') { $Country = 'GB'; }
-		$Countries[$IP] = $Country;
-	}
-	return $Countries[$IP];
-}
-
-/**
- * Gets the hostname for an ip
- * @param $ip the ip to get the hostname for
- * @return hostname fetched
- */
-function gethostbyip($ip)
-{
-	$testar = explode('.',$ip);
-	if (count($testar)!=4) { 
-		return $ip;
-	}
-	for ($i=0;$i<4;++$i) {
-		if (!is_numeric($testar[$i])) {
-			return $ip;
-		}
-	}
-	
-	$host = `host -W 1 $ip`;
-	return (($host ? end ( explode (' ', $host)) : $ip));
-}
-
-
-/**
- * Gets an hostname using AJAX
- * 
- * @param $IP the IP to fetch
- * @return a span with javascript code
- */
-function get_host($IP) {
-	static $ID = 0;
-	++$ID;
-	return '<span id="host_'.$ID.'">Resolving host...<script type="text/javascript">ajax.get(\'tools.php?action=get_host&ip='.$IP.'\',function(host){$(\'#host_'.$ID.'\').raw().innerHTML=host;});</script></span>';
-}
-
-function lookup_ip($IP) {
-	//TODO: use the $Cache
-	$Output = explode(' ',shell_exec('host -W 1 '.escapeshellarg($IP)));
-	if(count($Output) == 1 && empty($Output[0])) {
-		//No output at all implies the command failed
-		return '';
-	}
-
-	if(count($Output) != 5) {
-		return false;
-	} else {
-		return $Output[4];
-	}
-}
-
-function get_cc($IP) {
-	static $ID = 0;
-	++$ID;
-	return '<span id="cc_'.$ID.'">Resolving CC...<script type="text/javascript">ajax.get(\'tools.php?action=get_cc&ip='.$IP.'\',function(cc){$(\'#cc_'.$ID.'\').raw().innerHTML=cc;});</script></span>';
-}
-
-function display_ip($IP) {
-	$Line = display_str($IP).' ('.get_cc($IP).') ';
-	$Line .= '[<a href="user.php?action=search&amp;ip_history=on&amp;ip='.display_str($IP).'&amp;matchtype=strict" title="Search">S</a>]';
-	
-	return $Line;
-}
 
 /**
  * Log out the current session
@@ -703,7 +326,7 @@ function logout() {
 	setcookie('session','',time()-60*60*24*365,'/','',false);
 	setcookie('keeplogged','',time()-60*60*24*365,'/','',false);
 	setcookie('session','',time()-60*60*24*365,'/','',false);
-	if($SessionID) {
+	if ($SessionID) {
 		
 		
 		$DB->query("DELETE FROM users_sessions WHERE UserID='$LoggedUser[ID]' AND SessionID='".db_string($SessionID)."'");
@@ -717,7 +340,7 @@ function logout() {
 	$Cache->delete_value('user_info_heavy_'.$LoggedUser['ID']);
 
 	header('Location: login.php');
-	
+
 	die();
 }
 
@@ -738,7 +361,7 @@ function enforce_login() {
  */
 function authorize($Ajax = false) {
 	global $LoggedUser;
-	if(empty($_REQUEST['auth']) || $_REQUEST['auth'] != $LoggedUser['AuthKey']) {
+	if (empty($_REQUEST['auth']) || $_REQUEST['auth'] != $LoggedUser['AuthKey']) {
 		send_irc("PRIVMSG ".LAB_CHAN." :".$LoggedUser['Username']." just failed authorize on ".$_SERVER['REQUEST_URI']." coming from ".$_SERVER['HTTP_REFERER']);
 		error('Invalid authorization key. Go back, refresh, and try again.', $Ajax);
 		return false;
@@ -746,1844 +369,24 @@ function authorize($Ajax = false) {
 	return true;
 }
 
-/**
- * This function is to include the header file on a page.
- *
- * @param $PageTitle the title of the page 
- * @param $JSIncludes is a comma separated list of js files to be inclides on
- *                    the page, ONLY PUT THE RELATIVE LOCATION WITHOUT .js
- *                    ex: 'somefile,somdire/somefile'
- */
-function show_header($PageTitle='',$JSIncludes='') {
-	global $Document, $Cache, $DB, $LoggedUser, $Mobile, $Classes;
 
-	if($PageTitle!='') { $PageTitle.=' :: '; }
-	$PageTitle .= SITE_NAME;
-
-	if(!is_array($LoggedUser) || empty($LoggedUser['ID'])) {
-		require(SERVER_ROOT.'/design/publicheader.php');
-	} else {
-		require(SERVER_ROOT.'/design/privateheader.php');
-	}
-}
-
-/**
- * This function is to include the footer file on a page.
- *
- * @param $Options an optional array that you can pass information to the
- *                 header through as well as setup certain limitations
- *	               Here is a list of parameters that work in the $Options array:
- *                 ['disclaimer'] = [boolean] (False) Displays the disclaimer in the footer
- */
-function show_footer($Options=array()) {
-	global $ScriptStartTime, $LoggedUser, $Cache, $DB, $SessionID, $UserSessions, $Debug, $Time;
-	if (!is_array($LoggedUser)) { require(SERVER_ROOT.'/design/publicfooter.php'); }
-	else { require(SERVER_ROOT.'/design/privatefooter.php'); }
-}
-
-/**
- * Shorten a string 
- * 
- * @param $Str string to cut
- * @param $Length cut at length
- * @param $Hard force cut at length instead of at closest word
- * @param $ShowDots Show dots at the end
- * @return string formatted string
- */
-function cut_string($Str, $Length, $Hard = false, $ShowDots = true) {
-	if (mb_strlen($Str, 'UTF-8') > $Length) {
-		if ($Hard == 0) {
-			// Not hard, cut at closest word
-			$CutDesc = mb_substr($Str, 0, $Length, 'UTF-8');
-			$DescArr = explode(' ', $CutDesc);
-			if (count($DescArr) > 1) {
-				array_pop($DescArr);
-				$CutDesc = implode(' ', $DescArr);
-			}
-			if ($ShowDots) { $CutDesc .= '...'; }
-		} else {
-			$CutDesc = mb_substr($Str, 0, $Length, 'UTF-8');
-			if ($ShowDots) { $CutDesc .= '...'; }
-		}
-		return $CutDesc;
-	} else {
-		return $Str;
-	}
-}
-
-/**
- * Gets the CSS class corresponding to a ratio 
- *
- * @param $Ratio ratio to get the css class for
- * @return string the CSS class corresponding to the ratio range
- */
-function get_ratio_color($Ratio) {
-	if ($Ratio < 0.1) { return 'r00'; }
-	if ($Ratio < 0.2) { return 'r01'; }
-	if ($Ratio < 0.3) { return 'r02'; }
-	if ($Ratio < 0.4) { return 'r03'; }
-	if ($Ratio < 0.5) { return 'r04'; }
-	if ($Ratio < 0.6) { return 'r05'; }
-	if ($Ratio < 0.7) { return 'r06'; }
-	if ($Ratio < 0.8) { return 'r07'; }
-	if ($Ratio < 0.9) { return 'r08'; }
-	if ($Ratio < 1) { return 'r09'; }
-	if ($Ratio < 2) { return 'r10'; }
-	if ($Ratio < 5) { return 'r20'; }
-	return 'r50';
-}
-
-function ratio($Dividend, $Divisor, $Color = true) {
-	if($Divisor == 0 && $Dividend == 0) {
-		return '--';
-	} elseif($Divisor == 0) {
-		return '<span class="r99">∞</span>';
-	}
-	$Ratio = number_format(max($Dividend/$Divisor-0.005,0), 2); //Subtract .005 to floor to 2 decimals
-	if($Color) {
-		$Class = get_ratio_color($Ratio);
-		if($Class) {
-			$Ratio = '<span class="'.$Class.'">'.$Ratio.'</span>';
-		}
-	}
-	return $Ratio;
-
-}
-
-function get_url($Exclude = false) {
-	if($Exclude !== false) {
-		$QueryItems = array();
-		parse_str($_SERVER['QUERY_STRING'], $QueryItems);
-
-		foreach($QueryItems AS $Key => $Val) {
-			if(!in_array(strtolower($Key),$Exclude)) {
-				$Query[$Key] = $Val;
-			}
-		}
-
-		if(empty($Query)) {
-			return;
-		}
-		return display_str(http_build_query($Query));
-	} else {
-		return display_str($_SERVER['QUERY_STRING']);
-	}
-}
-
-/**
- * Finds what page we're on and gives it to us, as well as the LIMIT clause for SQL
- * Takes in $_GET['page'] as an additional input
- *
- * @param $PerPage Results to show per page
- *
- * @param $DefaultResult Optional, which result's page we want if no page is specified
- * If this parameter is not specified, we will default to page 1
- *
- * @return array(int,string) What page we are on, and what to use in the LIMIT section of a query
- * i.e. "SELECT [...] LIMIT $Limit;"
- */
-function page_limit($PerPage, $DefaultResult = 1) {
-	if(!isset($_GET['page'])) {
-		$Page = ceil($DefaultResult/$PerPage);
-		if($Page == 0) $Page = 1;
-		$Limit=$PerPage;
-	} else {
-		if(!is_number($_GET['page'])) {
-			error(0);
-		}
-		$Page = $_GET['page'];
-		if ($Page <= 0) { $Page = 1; }
-		$Limit=$PerPage*$Page-$PerPage . ', ' . $PerPage;
-	}
-	return array($Page,$Limit);
-}
-
-// For data stored in memcached catalogues (giant arrays), eg. forum threads
-function catalogue_limit($Page,$PerPage,$CatalogueSize=500) {
-	$CatalogueID = floor(($PerPage*$Page-$PerPage)/$CatalogueSize);;
-	$CatalogueLimit = ($CatalogueID*$CatalogueSize).', '.$CatalogueSize;
-	return array($CatalogueID,$CatalogueLimit);
-}
-
-function catalogue_select($Catalogue,$Page,$PerPage,$CatalogueSize=500) {
-	return array_slice($Catalogue,(($PerPage*$Page-$PerPage)%$CatalogueSize),$PerPage,true);
-}
-
-function get_pages($StartPage,$TotalRecords,$ItemsPerPage,$ShowPages=11,$Anchor='') {
-	global $Document, $Method, $Mobile;
-	$Location = $Document.'.php';
-	/*-- Get pages ---------------------------------------------------------------//
-	This function returns a page list, given certain information about the pages.
-
-	Explanation of arguments:
-	* $StartPage: The current record the page you're on starts with.
-		eg. if you're on page 2 of a forum thread with 25 posts per page, $StartPage is 25.
-		If you're on page 1, $StartPage is 0.
-	* $TotalRecords: The total number of records in the result set.
-		eg. if you're on a forum thread with 152 posts, $TotalRecords is 152.
-	* $ItemsPerPage: Self-explanatory. The number of records shown on each page
-		eg. if there are 25 posts per forum page, $ItemsPerPage is 25.
-	$ShowPages: The number of page links that are shown.
-		eg. If there are 20 pages that exist, but $ShowPages is only 11, only 11 links will be shown.
-	//----------------------------------------------------------------------------*/
-	$StartPage = ceil($StartPage);
-	$TotalPages = 0;
-	if ($TotalRecords > 0) {
-		$StartPage = min($StartPage, ceil($TotalRecords/$ItemsPerPage));
-
-		$ShowPages--;
-		$TotalPages = ceil($TotalRecords/$ItemsPerPage);
-
-		if ($TotalPages > $ShowPages) {
-			$StartPosition = $StartPage-round($ShowPages/2);
-
-			if ($StartPosition <= 0) {
-				$StartPosition = 1;
-			} else {
-				if ($StartPosition >= ($TotalPages-$ShowPages)) {
-					$StartPosition = $TotalPages-$ShowPages;
-				}
-			}
-
-			$StopPage = $ShowPages+$StartPosition;
-
-		} else {
-			$StopPage = $TotalPages;
-			$StartPosition = 1;
-		}
-
-		$StartPosition = max($StartPosition, 1);
-
-		$QueryString = get_url(array('page','post'));
-		if ($QueryString != '') {
-			$QueryString = '&amp;'.$QueryString;
-		}
-
-		$Pages = '';
-
-		if ($StartPage > 1) {
-			$Pages .= '<a href="'.$Location.'?page=1'.$QueryString.$Anchor.'"><strong>&lt;&lt; First</strong></a> ';
-			$Pages .= '<a href="'.$Location.'?page='.($StartPage-1).$QueryString.$Anchor.'" class="pager_prev"><strong>&lt; Prev</strong></a> | ';
-		}
-		//End change
-		
-		if (!$Mobile) {
-			for ($i = $StartPosition; $i <= $StopPage; $i++) {
-				//if ($i!=$StartPage) { $Pages.='<a href="'.$Location.'?page='.$i.$QueryString.'">'; }
-				if ($i != $StartPage) {
-					$Pages .= '<a href="'.$Location.'?page='.$i.$QueryString.$Anchor.'">';
-				}
-				$Pages .= "<strong>";
-				if($i*$ItemsPerPage > $TotalRecords) {
-					$Pages .= ((($i-1)*$ItemsPerPage)+1).'-'.($TotalRecords);
-				} else {
-					$Pages .= ((($i-1)*$ItemsPerPage)+1).'-'.($i*$ItemsPerPage);
-				}
-
-				$Pages .= "</strong>";
-				if ($i != $StartPage) {
-					$Pages.='</a>';
-				}
-				if ($i < $StopPage) {
-					$Pages.=" | ";
-				}
-			}
-		} else {
-			$Pages .= $StartPage;
-		}
-
-		if ($StartPage && $StartPage < $TotalPages) {
-			$Pages .= ' | <a href="'.$Location.'?page='.($StartPage+1).$QueryString.$Anchor.'" class="pager_next"><strong>Next &gt;</strong></a> ';
-			$Pages .= '<a href="'.$Location.'?page='.$TotalPages.$QueryString.$Anchor.'"><strong> Last &gt;&gt;</strong></a>';
-		}
-
-	}
-
-	if ($TotalPages > 1) {
-		return $Pages;
-	}
-
-}
-
-function send_email($To,$Subject,$Body,$From='noreply',$ContentType='text/plain') {
-	$Headers='MIME-Version: 1.0'."\r\n";
-	$Headers.='Content-type: '.$ContentType.'; charset=iso-8859-1'."\r\n";
-	$Headers.='From: '.SITE_NAME.' <'.$From.'@'.NONSSL_SITE_URL.'>'."\r\n";
-	$Headers.='Reply-To: '.$From.'@'.NONSSL_SITE_URL."\r\n";
-	$Headers.='X-Mailer: Project Gazelle'."\r\n";
-	$Headers.='Message-Id: <'.make_secret().'@'.NONSSL_SITE_URL.">\r\n";
-	$Headers.='X-Priority: 3'."\r\n";
-	mail($To,$Subject,$Body,$Headers,"-f ".$From."@".NONSSL_SITE_URL);
-}
-
-function get_size($Size, $Levels = 2) {
-	$Units = array(' B',' KB',' MB',' GB',' TB',' PB',' EB',' ZB',' YB');
-	$Size = (double) $Size;
-	for($Steps = 0; abs($Size) >= 1024; $Size /= 1024, $Steps++) {}
-	if(func_num_args() == 1 && $Steps >= 4) {
-		$Levels++;
-	}
-	return number_format($Size,$Levels).$Units[$Steps];
-}
-
-function get_bytes($Size) {
-	list($Value,$Unit) = sscanf($Size, "%f%s");
-	$Unit = ltrim($Unit);
-	if(empty($Unit)) {
-		return $Value ? round($Value) : 0;
-	}
-	switch(strtolower($Unit[0])) {
-		case 'k': return round($Value * 1024);
-		case 'm': return round($Value * 1048576);
-		case 'g': return round($Value * 1073741824);
-		case 't': return round($Value * 1099511627776);
-		default: return 0;
-	}
-}
-
-function human_format($Number) {
-	$Steps = 0;
-	while($Number>=1000) {
-		$Steps++;
-		$Number=$Number/1000;
-	}
-	switch ($Steps) {
-		case 0: return round($Number); break;
-		case 1: return round($Number,2).'k'; break;
-		case 2: return round($Number,2).'M'; break;
-		case 3: return round($Number,2).'G'; break;
-		case 4: return round($Number,2).'T'; break;
-		case 5: return round($Number,2).'P'; break;
-		default:
-			return round($Number,2).'E + '.$Steps*3;
-	}
-}
-
-function is_number($Str) {
-	$Return = true;
-	if ($Str < 0) { $Return = false; }
-	// We're converting input to a int, then string and comparing to original
-	$Return = ($Str == strval(intval($Str)) ? true : false);
-	return $Return;
-}
-
-function file_string($EscapeStr) {
-	return str_replace(array('"','*','/',':','<','>','?','\\','|'), '', $EscapeStr);
-}
-
-// This is preferable to htmlspecialchars because it doesn't screw up upon a double escape
-function display_str($Str) {
-	if ($Str === NULL || $Str === FALSE || is_array($Str)) {
-		return '';
-	}
-	if ($Str!='' && !is_number($Str)) {
-		$Str=make_utf8($Str);
-		$Str=mb_convert_encoding($Str,"HTML-ENTITIES","UTF-8");
-		$Str=preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,5};)/m","&amp;",$Str);
-
-		$Replace = array(
-			"'",'"',"<",">",
-			'&#128;','&#130;','&#131;','&#132;','&#133;','&#134;','&#135;','&#136;','&#137;','&#138;','&#139;','&#140;','&#142;','&#145;','&#146;','&#147;','&#148;','&#149;','&#150;','&#151;','&#152;','&#153;','&#154;','&#155;','&#156;','&#158;','&#159;'
-		);
-
-		$With=array(
-			'&#39;','&quot;','&lt;','&gt;',
-			'&#8364;','&#8218;','&#402;','&#8222;','&#8230;','&#8224;','&#8225;','&#710;','&#8240;','&#352;','&#8249;','&#338;','&#381;','&#8216;','&#8217;','&#8220;','&#8221;','&#8226;','&#8211;','&#8212;','&#732;','&#8482;','&#353;','&#8250;','&#339;','&#382;','&#376;'
-		);
-
-		$Str=str_replace($Replace,$With,$Str);
-	}
-	return $Str;
-}
-
-// Use sparingly
-function undisplay_str($Str) {
-	return mb_convert_encoding($Str, 'UTF-8', 'HTML-ENTITIES');
-}
-
-function make_utf8($Str) {
-	if ($Str!="") {
-		if (is_utf8($Str)) { $Encoding="UTF-8"; }
-		if (empty($Encoding)) { $Encoding=mb_detect_encoding($Str,'UTF-8, ISO-8859-1'); }
-		if (empty($Encoding)) { $Encoding="ISO-8859-1"; }
-		if ($Encoding=="UTF-8") { return $Str; }
-		else { return @mb_convert_encoding($Str,"UTF-8",$Encoding); }
-	}
-}
-
-function is_utf8($Str) {
-	return preg_match('%^(?:
-		[\x09\x0A\x0D\x20-\x7E]			 // ASCII
-		| [\xC2-\xDF][\x80-\xBF]			// non-overlong 2-byte
-		| \xE0[\xA0-\xBF][\x80-\xBF]		// excluding overlongs
-		| [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2} // straight 3-byte
-		| \xED[\x80-\x9F][\x80-\xBF]		// excluding surrogates
-		| \xF0[\x90-\xBF][\x80-\xBF]{2}	 // planes 1-3
-		| [\xF1-\xF3][\x80-\xBF]{3}		 // planes 4-15
-		| \xF4[\x80-\x8F][\x80-\xBF]{2}	 // plane 16
-		)*$%xs', $Str
-	);
-}
-
-// Escape an entire array for output
-// $Escape is either true, false, or a list of array keys to not escape
-function display_array($Array, $Escape = array()) {
-	foreach ($Array as $Key => $Val) {
-		if((!is_array($Escape) && $Escape == true) || !in_array($Key, $Escape)) {
-			$Array[$Key] = display_str($Val);
-		}
-	}
-	return $Array;
-}
-
-// Gets a tag ready for database input and display
-function sanitize_tag($str) {
-	$str = strtolower($str);
-	$str = preg_replace('/[^a-z0-9.]/', '', $str);
-	$str = preg_replace('/(^[.,]*)|([.,]*$)/','',$str);
-	$str = htmlspecialchars($str);
-	$str = db_string(trim($str));
-	return $str;
-}
-
-
-/**
- * Gets the alias of the tag, if there is no alias silently returns the original tag.
- * @return the tag
- */
-function get_alias_tag($str) {
-     global $DB;
-     $DB->query("SELECT AliasTag FROM tag_aliases WHERE BadTag = '". $str ."' LIMIT 1");
-        if($DB->record_count() > 0) {
-            list($AliasTag) = $DB->next_record();
-            return $AliasTag;
-     }
-     return $str;
-}
-
-// Generate a random string
-function make_secret($Length = 32) {
-	$Secret = '';
-	$Chars='abcdefghijklmnopqrstuvwxyz0123456789';
-	for($i=0; $i<$Length; $i++) {
-		$Rand = mt_rand(0, strlen($Chars)-1);
-		$Secret .= substr($Chars, $Rand, 1);
-	}
-	return str_shuffle($Secret);
-}
-
-//TODO: Read and add this one
-/*
-function make_secret($Length = 32) {
-	$Secret = '';
-	$Chars='abcdefghijklmnopqrstuvwxyz0123456789';
-	$CharLen = strlen($Chars)-1;
-	for ($i = 0; $i < $Length; ++$i) {
-		$Secret .= $Chars[mt_rand(0, $CharLen)];
-	}
-	return $Secret;
-}
-*/
-
-/**
- * Create a password hash. This method is deprecated and
- * should not be used to create new passwords
- *
- * @param $Str password
- * @param $Secret salt
- * @return password hash
- */
-function make_hash($Str,$Secret) {
-	return sha1(md5($Secret).$Str.sha1($Secret).SITE_SALT);
-}
-
-/**
- * Verify a password against a password hash
- *
- * @param $Password password
- * @param $Hash password hash
- * @param $Secret salt - Only used if the hash was created
- *                       with the deprecated make_hash() method
- * @return true on correct password
- */
-function check_password($Password, $Hash, $Secret='') {
-	if(!$Password || !$Hash) {
-		return false;
-	}
-	if(is_crypt_hash($Hash)) {
-		return crypt($Password, $Hash) == $Hash;
-	} elseif($Secret) {
-		return make_hash($Password, $Secret) == $Hash;
-	}
-	return false;
-}
-
-/**
- * Test if a given hash is a crypt hash
- *
- * @param $Hash password hash
- * @return true if hash is a crypt hash
- */
-function is_crypt_hash($Hash) {
-	return preg_match('/\$\d[axy]?\$/', substr($Hash, 0, 4));
-}
-
-/**
- * Create salted crypt hash for a given string with
- * settings specified in CRYPT_HASH_PREFIX
- *
- * @param $Str string to hash
- * @return salted crypt hash
- */
-function make_crypt_hash($Str) {
-	$Salt = CRYPT_HASH_PREFIX.gen_crypt_salt().'$';
-	return crypt($Str, $Salt);
-}
-
-/**
- * Create salt string for eksblowfish hashing. If /dev/urandom cannot be read,
- * fall back to an unsecure method based on mt_rand(). The last character needs
- * a special case as it must be either '.', 'O', 'e', or 'u'.
- *
- * @return salt suitable for eksblowfish hashing
- */
-function gen_crypt_salt() {
-	$Salt = '';
-	$Chars = "./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-	$Numchars = strlen($Chars) - 1;
-	if($Handle = @fopen('/dev/urandom', 'r')) {
-		$Bytes = fread($Handle, 22);
-		for($i = 0; $i < 21; $i++) {
-			$Salt .= $Chars[ord($Bytes[$i]) & $Numchars];
-		}
-		$Salt[$i] = $Chars[(ord($Bytes[$i]) & 3) << 4];
-	} else {
-		for($i = 0; $i < 21; $i++) {
-			$Salt .= $Chars[mt_rand(0, $Numchars)];
-		}
-		$Salt[$i] = $Chars[mt_rand(0, 3) << 4];
-	}
-	return $Salt;
-}
-
-/*
-Returns a username string for display
-$Class and $Title can be omitted for an abbreviated version
-$IsDonor, $IsWarned and $IsEnabled can be omitted for a *very* abbreviated version
-*/
-function format_username($UserID, $Badges = false, $IsWarned = true, $IsEnabled = true, $Class = false, $Title = false) {
-	global $Classes;
-
-	// This array is a hack that should be made less retarded, but whatevs
-	// 						  PermID => ShortForm
-	$SecondaryClasses = array(
-							 );
-	
-	if($UserID == 0) {
-		return 'System';
-	} 
-	
-	$UserInfo = user_info($UserID);
-	if($UserInfo['Username'] == '') {
-		return "Unknown [$UserID]";
-	}
-	
-	$Str = '';
-	
-	if ($Title) {
-		$Str .= '<strong><a href="user.php?id='.$UserID.'">'.$UserInfo['Username'].'</a></strong>';
-	} else {
-		$Str .= '<a href="user.php?id='.$UserID.'">'.$UserInfo['Username'].'</a>';
-	}
-
-	if ($Badges) {
-		$Str .= ($UserInfo['Donor'] == 1) ? '<a href="donate.php"><img src="'.STATIC_SERVER.'common/symbols/donor.png" alt="Donor" title="Donor" /></a>' : '';
-	}
-	$Str .= ($IsWarned && $UserInfo['Warned'] != '0000-00-00 00:00:00') ? '<a href="wiki.php?action=article&amp;id=218"><img src="'.STATIC_SERVER.'common/symbols/warned.png" alt="Warned" title="Warned" /></a>' : '';
-	$Str .= ($IsEnabled && $UserInfo['Enabled'] == 2) ? '<a href="rules.php"><img src="'.STATIC_SERVER.'common/symbols/disabled.png" alt="Banned" title="Be good, and you won\'t end up like this user" /></a>' : '';
-
-	if ($Badges) {
-		$ClassesDisplay = array();
-		foreach($SecondaryClasses as $PermID => $PermHTML) {
-			if ($UserInfo['ExtraClasses'][$PermID]) {
-				$ClassesDisplay[] = '<span class="secondary_class" title="'.$Classes[$PermID]['Name'].'">'.$PermHTML.'</span>';
-			}
-		}
-		if(!empty($ClassesDisplay)) {
-			$Str .= '&nbsp;'.implode('&nbsp;', $ClassesDisplay);
-		}
-	}
-
-	if ($Class) {
-		if ($Title) {
-			$Str .= ' <strong>('.make_class_string($UserInfo['PermissionID']).')</strong>';
-		} else {
-			$Str .= ' ('.make_class_string($UserInfo['PermissionID']).')';
-		}
-	}
-
-	if ($Title) {
-		// Image proxy CTs
-		if(check_perms('site_proxy_images') && !empty($UserInfo['Title'])) {
-			$UserInfo['Title'] = preg_replace_callback('~src=("?)(http.+?)(["\s>])~',
-				function($Matches) {
-					return 'src='.$Matches[1].'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&amp;i='.urlencode($Matches[2]).$Matches[3];
-				},
-				$UserInfo['Title']);
-		}
-		
-		if ($UserInfo['Title']) {
-			$Str .= ' <span class="user_title">('.$UserInfo['Title'].')</span>';
-		}
-	}
-	return $Str;
-}
-
-function make_class_string($ClassID) {
-	global $Classes;
-	return $Classes[$ClassID]['Name'];
-}
-
-//Write to the group log
-function write_group_log($GroupID, $TorrentID, $UserID, $Message, $Hidden) {
-	global $DB,$Time;
-	$DB->query("INSERT INTO group_log (GroupID, TorrentID, UserID, Info, Time, Hidden) VALUES (".$GroupID.", ".$TorrentID.", ".$UserID.", '".db_string($Message)."', '".sqltime()."', ".$Hidden.")");
-}
-
-// Write a message to the system log
-function write_log($Message) {
-	global $DB,$Time;
-	$DB->query('INSERT INTO log (Message, Time) VALUES (\''.db_string($Message).'\', \''.sqltime().'\')');
-}
-
-// Send a message to an IRC bot listening on SOCKET_LISTEN_PORT
-function send_irc($Raw) {
-	$IRCSocket = fsockopen(SOCKET_LISTEN_ADDRESS, SOCKET_LISTEN_PORT);
-	$Raw = str_replace(array("\n", "\r"), '', $Raw);
-	fwrite($IRCSocket, $Raw);
-	fclose($IRCSocket);
-}
-
-function delete_torrent($ID, $GroupID=0, $OcelotReason=-1) {
-	global $DB, $Cache, $LoggedUser;
-	if(!$GroupID) {
-		$DB->query("SELECT GroupID, UserID FROM torrents WHERE ID='$ID'");
-		list($GroupID, $UploaderID) = $DB->next_record();
-		
-	}
-	if(empty($UserID)) {
-		$DB->query("SELECT UserID FROM torrents WHERE ID='$ID'");
-		list($UserID) = $DB->next_record();
-	}
-
-	$RecentUploads = $Cache->get_value('recent_uploads_'.$UserID);
-	if(is_array($RecentUploads)) {
-		foreach($RecentUploads as $Key => $Recent) {
-			if($Recent['ID'] == $GroupID) {
-				$Cache->delete_value('recent_uploads_'.$UserID);
-			}
-		}
-	}
-	
-	
-	$DB->query("SELECT info_hash FROM torrents WHERE ID = ".$ID);
-	list($InfoHash) = $DB->next_record(MYSQLI_BOTH, false);
-	$DB->query("DELETE FROM torrents WHERE ID = ".$ID);
-	update_tracker('delete_torrent', array('info_hash' => rawurlencode($InfoHash), 'id' => $ID, 'reason' => $OcelotReason));
-	
-	$Cache->decrement('stats_torrent_count');
-
-	$DB->query("SELECT COUNT(ID) FROM torrents WHERE GroupID='$GroupID'");
-	list($Count) = $DB->next_record();
-
-	if($Count == 0) {
-		delete_group($GroupID);
-	} else {
-		update_hash($GroupID);
-		//Artists
-		$DB->query("SELECT ArtistID
-				FROM torrents_artists 
-				WHERE GroupID = ".$GroupID);
-		$ArtistIDs = $DB->collect('ArtistID');
-		foreach($ArtistIDs as $ArtistID) {
-			$Cache->delete_value('artist_'.$ArtistID);
-		}
-	}
-
-	// Torrent notifications
-	$DB->query("SELECT UserID FROM users_notify_torrents WHERE TorrentID='$ID'");
-	while(list($UserID) = $DB->next_record()) {
-		$Cache->delete_value('notifications_new_'.$UserID);
-	}
-	$DB->query("DELETE FROM users_notify_torrents WHERE TorrentID='$ID'");
-
-
-	$DB->query("UPDATE reportsv2 SET
-			Status='Resolved',
-			LastChangeTime='".sqltime()."',
-			ModComment='Report already dealt with (Torrent deleted)'
-		WHERE TorrentID=".$ID."
-			AND Status != 'Resolved'");
-	$Reports = $DB->affected_rows();
-	if($Reports) {
-		$Cache->decrement('num_torrent_reportsv2', $Reports);
-	}
-
-	$DB->query("DELETE FROM torrents_files WHERE TorrentID='$ID'");
-	$DB->query("DELETE FROM torrents_bad_tags WHERE TorrentID = ".$ID);
-	$DB->query("DELETE FROM torrents_bad_folders WHERE TorrentID = ".$ID);
-	$DB->query("DELETE FROM torrents_bad_files WHERE TorrentID = ".$ID);
-	$DB->query("DELETE FROM torrents_cassette_approved WHERE TorrentID = ".$ID);
-	$DB->query("DELETE FROM torrents_lossymaster_approved WHERE TorrentID = ".$ID);
-	$DB->query("DELETE FROM torrents_lossyweb_approved WHERE TorrentID = ".$ID);
-	$Cache->delete_value('torrent_download_'.$ID);
-	$Cache->delete_value('torrent_group_'.$GroupID);
-	$Cache->delete_value('torrents_details_'.$GroupID);
-}
-
-function delete_group($GroupID) {
-	global $DB, $Cache;
-
-	write_log("Group ".$GroupID." automatically deleted (No torrents have this group).");
-	//$DB->query("DELETE FROM group_log WHERE GroupID = ".$GroupID);
-
-	//Never call this unless you're certain the group is no longer used by any torrents
-	$DB->query("SELECT CategoryID FROM torrents_group WHERE ID='$GroupID'");
-	list($Category) = $DB->next_record();
-	if($Category == 1) {
-		$Cache->decrement('stats_album_count');
-	}
-	$Cache->decrement('stats_group_count');
-	
-	
-	
-	// Collages
-	$DB->query("SELECT CollageID FROM collages_torrents WHERE GroupID='$GroupID'");
-	if($DB->record_count()>0) {
-		$CollageIDs = $DB->collect('CollageID');
-		$DB->query("UPDATE collages SET NumTorrents=NumTorrents-1 WHERE ID IN (".implode(', ',$CollageIDs).")");
-		$DB->query("DELETE FROM collages_torrents WHERE GroupID='$GroupID'");
-
-		foreach($CollageIDs as $CollageID) {
-			$Cache->delete_value('collage_'.$CollageID);
-		}
-		$Cache->delete_value('torrent_collages_'.$GroupID);
-	}
-	
-	//Artists
-	//Collect the artist IDs and then wipe the torrents_artist entry
-	$DB->query("SELECT ArtistID FROM torrents_artists WHERE GroupID = ".$GroupID);
-	$Artists = $DB->collect('ArtistID');
-	
-	$DB->query("DELETE FROM torrents_artists WHERE GroupID='$GroupID'");
-	
-	foreach($Artists as $ArtistID) {
-		if(empty($ArtistID)) { continue; }
-		//Get a count of how many groups or requests use the artist ID
-		$DB->query("SELECT COUNT(ag.ArtistID)
-					FROM artists_group as ag 
-						LEFT JOIN requests_artists AS ra ON ag.ArtistID=ra.ArtistID 
-					WHERE ra.ArtistID IS NOT NULL
-						AND ag.ArtistID = '$ArtistID'");
-		list($ReqCount) = $DB->next_record();
-		$DB->query("SELECT COUNT(ag.ArtistID)
-					FROM artists_group as ag 
-						LEFT JOIN torrents_artists AS ta ON ag.ArtistID=ta.ArtistID 
-					WHERE ta.ArtistID IS NOT NULL
-						AND ag.ArtistID = '$ArtistID'");
-		list($GroupCount) = $DB->next_record();
-		if(($ReqCount + $GroupCount) == 0) {
-			//The only group to use this artist
-			delete_artist($ArtistID);
-		} else {
-			//Not the only group, still need to clear cache
-			$Cache->delete_value('artist_'.$ArtistID);
-		}
-	}
-	
-	// Requests
-	$DB->query("SELECT ID FROM requests WHERE GroupID='$GroupID'");
-	$Requests = $DB->collect('ID');
-	$DB->query("UPDATE requests SET GroupID = NULL WHERE GroupID = '$GroupID'");
-	foreach ($Requests as $RequestID) {
-		$Cache->delete_value('request_'.$RequestID);
-	}
-	
-	$DB->query("DELETE FROM torrents_group WHERE ID='$GroupID'");
-	$DB->query("DELETE FROM torrents_tags WHERE GroupID='$GroupID'");
-	$DB->query("DELETE FROM torrents_tags_votes WHERE GroupID='$GroupID'");
-	$DB->query("DELETE FROM torrents_comments WHERE GroupID='$GroupID'");
-	$DB->query("DELETE FROM bookmarks_torrents WHERE GroupID='$GroupID'");
-	$DB->query("DELETE FROM wiki_torrents WHERE PageID='$GroupID'");
-	$DB->query("REPLACE INTO sphinx_delta (ID,Time) VALUES ('$GroupID',UNIX_TIMESTAMP())"); // Tells Sphinx that the group is removed
-	
-	$Cache->delete_value('torrents_details_'.$GroupID);
-	$Cache->delete_value('torrent_group_'.$GroupID);
-	$Cache->delete_value('groups_artists_'.$GroupID);
-}
-
-function delete_artist($ArtistID) {
-	global $DB, $LoggedUser, $Cache;
-
-	$DB->query("SELECT Name FROM artists_group WHERE ArtistID = ".$ArtistID);
-	list($Name) = $DB->next_record(MYSQLI_NUM, false);
-	
-	// Delete requests
-	$DB->query("SELECT RequestID FROM requests_artists WHERE ArtistID=".$ArtistID." AND ArtistID != 0");
-	$Requests = $DB->to_array();
-	foreach($Requests AS $Request) {
-		list($RequestID) = $Request;
-		$DB->query('DELETE FROM requests WHERE ID='.$RequestID);
-		$DB->query('DELETE FROM requests_votes WHERE RequestID='.$RequestID);
-		$DB->query('DELETE FROM requests_tags WHERE RequestID='.$RequestID);
-		$DB->query('DELETE FROM requests_artists WHERE RequestID='.$RequestID);
-	}
-
-	// Delete artist
-	$DB->query('DELETE FROM artists_group WHERE ArtistID='.$ArtistID);
-	$DB->query('DELETE FROM artists_alias WHERE ArtistID='.$ArtistID);
-	$Cache->decrement('stats_artist_count');
-
-	// Delete wiki revisions
-	$DB->query('DELETE FROM wiki_artists WHERE PageID='.$ArtistID);
-
-	// Delete tags
-	$DB->query('DELETE FROM artists_tags WHERE ArtistID='.$ArtistID);
-
-	$Cache->delete_value('artist_'.$ArtistID);
-	// Record in log
-
-	if(!empty($LoggedUser['Username'])) {
-		$Username = $LoggedUser['Username'];
-	} else {
-		$Username = 'System';
-	}
-	write_log('Artist '.$ArtistID.' ('.$Name.') was deleted by '.$Username);
-}
-
-function warn_user($UserID, $Duration, $Reason) {
-	global $LoggedUser, $DB, $Cache, $Time;
-
-	$DB->query("SELECT Warned FROM users_info WHERE UserID=".$UserID." AND Warned <> '0000-00-00 00:00:00'");
-	if($DB->record_count() > 0) {
-		//User was already warned, appending new warning to old.
-		list($OldDate) = $DB->next_record();
-		$NewExpDate = date('Y-m-d H:i:s', strtotime($OldDate) + $Duration);
-
-		send_pm($UserID, 0, db_string("You have received multiple warnings."), db_string("When you received your latest warning (Set to expire on ".date("Y-m-d", (time() + $Duration))."), you already had a different warning (Set to expire on ".date("Y-m-d", strtotime($OldDate)).").\n\n Due to this collision, your warning status will now expire at ".$NewExpDate."."));
-
-		$AdminComment = date("Y-m-d").' - Warning (Clash) extended to expire at '.$NewExpDate.' by '.$LoggedUser['Username']."\nReason: $Reason\n\n";
-
-		$DB->query('UPDATE users_info SET
-			Warned=\''.db_string($NewExpDate).'\',
-			WarnedTimes=WarnedTimes+1,
-			AdminComment=CONCAT(\''.db_string($AdminComment).'\',AdminComment)
-			WHERE UserID=\''.db_string($UserID).'\'');
-	} else {
-		//Not changing, user was not already warned
-		$WarnTime = time_plus($Duration);
-
-		$Cache->begin_transaction('user_info_'.$UserID);
-		$Cache->update_row(false, array('Warned' => $WarnTime));
-		$Cache->commit_transaction(0);
-
-		$AdminComment = date("Y-m-d").' - Warned until '.$WarnTime.' by '.$LoggedUser['Username']."\nReason: $Reason\n\n";
-
-		$DB->query('UPDATE users_info SET
-			Warned=\''.db_string($WarnTime).'\',
-			WarnedTimes=WarnedTimes+1,
-			AdminComment=CONCAT(\''.db_string($AdminComment).'\',AdminComment)
-			WHERE UserID=\''.db_string($UserID).'\'');
-	}
-}
-
-/*-- update_hash function ------------------------------------------------*/
-/*------------------------------------------------------------------------*/
-/* This function is to update the cache and sphinx delta index to keep    */
-/* everything up to date                                                  */
-/*-- TODO ----------------------------------------------------------------*/
-/* Add in tag sorting based on positive negative votes algo               */
-/**************************************************************************/
-
-function update_hash($GroupID) {
-	global $DB, $Cache;
-	$DB->query("UPDATE torrents_group SET TagList=(SELECT REPLACE(GROUP_CONCAT(tags.Name SEPARATOR ' '),'.','_')
-		FROM torrents_tags AS t
-		INNER JOIN tags ON tags.ID=t.TagID
-		WHERE t.GroupID='$GroupID'
-		GROUP BY t.GroupID)
-		WHERE ID='$GroupID'");
-
-	$DB->query("REPLACE INTO sphinx_delta (ID, GroupName, TagList, Year, CategoryID, Time, ReleaseType, RecordLabel, CatalogueNumber, VanityHouse, Size, Snatched, Seeders, Leechers, LogScore, Scene, HasLog, HasCue, FreeTorrent, Media, Format, Encoding, RemasterYear, RemasterTitle, RemasterRecordLabel, RemasterCatalogueNumber, FileList)
-		SELECT
-		g.ID AS ID,
-		g.Name AS GroupName,
-		g.TagList,
-		g.Year,
-		g.CategoryID,
-		UNIX_TIMESTAMP(g.Time) AS Time,
-		g.ReleaseType,
-		g.RecordLabel,
-		g.CatalogueNumber,
-		g.VanityHouse,
-		MAX(CEIL(t.Size/1024)) AS Size,
-		SUM(t.Snatched) AS Snatched,
-		SUM(t.Seeders) AS Seeders,
-		SUM(t.Leechers) AS Leechers,
-		MAX(t.LogScore) AS LogScore,
-		MAX(t.Scene) AS Scene,
-		MAX(t.HasLog) AS HasLog,
-		MAX(t.HasCue) AS HasCue,
-		BIT_OR(t.FreeTorrent-1) AS FreeTorrent,
-		GROUP_CONCAT(DISTINCT t.Media SEPARATOR ' ') AS Media,
-		GROUP_CONCAT(DISTINCT t.Format SEPARATOR ' ') AS Format,
-		GROUP_CONCAT(DISTINCT t.Encoding SEPARATOR ' ') AS Encoding,
-		GROUP_CONCAT(DISTINCT t.RemasterYear SEPARATOR ' ') AS RemasterYear,
-		GROUP_CONCAT(DISTINCT t.RemasterTitle SEPARATOR ' ') AS RemasterTitle,
-		GROUP_CONCAT(DISTINCT t.RemasterRecordLabel SEPARATOR ' ') AS RemasterRecordLabel,
-		GROUP_CONCAT(DISTINCT t.RemasterCatalogueNumber SEPARATOR ' ') AS RemasterCatalogueNumber,
-		GROUP_CONCAT(REPLACE(REPLACE(FileList, '|||', '\n '), '_', ' ') SEPARATOR '\n ') AS FileList
-		FROM torrents AS t
-		JOIN torrents_group AS g ON g.ID=t.GroupID
-		WHERE g.ID=$GroupID
-		GROUP BY g.ID");
-
-	$DB->query("INSERT INTO sphinx_delta
-		(ID, ArtistName)
-		SELECT
-		GroupID,
-		GROUP_CONCAT(aa.Name separator ' ')
-		FROM torrents_artists AS ta
-		JOIN artists_alias AS aa ON aa.AliasID=ta.AliasID
-		JOIN torrents_group AS tg ON tg.ID=ta.GroupID
-		WHERE ta.GroupID=$GroupID AND ta.Importance IN ('1', '4', '5', '6')
-		GROUP BY tg.ID
-		ON DUPLICATE KEY UPDATE ArtistName=values(ArtistName)");
-	
-	$Cache->delete_value('torrents_details_'.$GroupID);
-	$Cache->delete_value('torrent_group_'.$GroupID);
-
-	$ArtistInfo = get_artist($GroupID);
-	foreach($ArtistInfo as $Importances => $Importance) {
-		foreach($Importance as $Artist) {
-			$Cache->delete_value('artist_'.$Artist['id']); //Needed for at least freeleech change, if not others.
-		}
-	}
-		
-	$Cache->delete_value('groups_artists_'.$GroupID);
-}
-
-// this function sends a PM to the userid $ToID and from the userid $FromID, sets date to now
-// this function no longer uses db_string() so you will need to escape strings before using this function!
-// set userid to 0 for a PM from 'system'
-// if $ConvID is not set, it auto increments it, ie. starting a new conversation
-function send_pm($ToID,$FromID,$Subject,$Body,$ConvID='') {
-	global $DB, $Cache, $Time;
-	if($ToID == 0 || $ToID == $FromID) {
-		// Don't allow users to send messages to the system or themselves
-		return;
-	}
-	if($ConvID=='') {
-		$DB->query("INSERT INTO pm_conversations(Subject) VALUES ('".$Subject."')");
-		$ConvID = $DB->inserted_id();
-		$DB->query("INSERT INTO pm_conversations_users
-				(UserID, ConvID, InInbox, InSentbox, SentDate, ReceivedDate, UnRead) VALUES
-				('$ToID', '$ConvID', '1','0','".sqltime()."', '".sqltime()."', '1')");
-		if ($FromID != 0) {
-			$DB->query("INSERT INTO pm_conversations_users
-				(UserID, ConvID, InInbox, InSentbox, SentDate, ReceivedDate, UnRead) VALUES
-				('$FromID', '$ConvID', '0','1','".sqltime()."', '".sqltime()."', '0')");
-		}
-		$ToID = array($ToID);
-	} else {
-		$DB->query("UPDATE pm_conversations_users SET
-				InInbox='1',
-				UnRead='1',
-				ReceivedDate='".sqltime()."'
-				WHERE UserID IN (".implode(',', $ToID).")
-				AND ConvID='$ConvID'");
-
-		$DB->query("UPDATE pm_conversations_users SET
-				InSentbox='1',
-				SentDate='".sqltime()."'
-				WHERE UserID='$FromID'
-				AND ConvID='$ConvID'");
-	}
-	$DB->query("INSERT INTO pm_messages
-			(SenderID, ConvID, SentDate, Body) VALUES
-			('$FromID', '$ConvID', '".sqltime()."', '".$Body."')");
-
-	// Clear the caches of the inbox and sentbox
-	//$DB->query("SELECT UnRead from pm_conversations_users WHERE ConvID='$ConvID' AND UserID='$ToID'");
-	foreach($ToID as $ID) {
-		$DB->query("SELECT COUNT(ConvID) FROM pm_conversations_users WHERE UnRead = '1' and UserID='$ID' AND InInbox = '1'");
-		list($UnRead) = $DB->next_record();
-		$Cache->cache_value('inbox_new_'.$ID, $UnRead);
-	}
-
-	//if ($UnRead == 0) {
-	//	$Cache->increment('inbox_new_'.$ToID);
-	//}
-	return $ConvID;
-}
-
-//Create thread function, things should already be escaped when sent here.
-//Almost all the code is stolen straight from the forums and tailored for new posts only
-function create_thread($ForumID, $AuthorID, $Title, $PostBody) {
-	global $DB, $Cache, $Time;
-	if(!$ForumID || !$AuthorID || !is_number($AuthorID) || !$Title || !$PostBody) {
-		return -1;
-	}
-
-	$DB->query("SELECT Username FROM users_main WHERE ID=".$AuthorID);
-	if($DB->record_count() < 1) {
-		return -2;
-	}
-	list($AuthorName) = $DB->next_record();
-
-	$ThreadInfo = array();
-	$ThreadInfo['IsLocked'] = 0;
-	$ThreadInfo['IsSticky'] = 0;
-
-	$DB->query("INSERT INTO forums_topics
-		(Title, AuthorID, ForumID, LastPostTime, LastPostAuthorID)
-		Values
-		('".$Title."', '".$AuthorID."', '$ForumID', '".sqltime()."', '".$AuthorID."')");
-	$TopicID = $DB->inserted_id();
-	$Posts = 1;
-
-	$DB->query("INSERT INTO forums_posts
-			(TopicID, AuthorID, AddedTime, Body)
-			VALUES
-			('$TopicID', '".$AuthorID."', '".sqltime()."', '".$PostBody."')");
-	$PostID = $DB->inserted_id();
-
-	$DB->query("UPDATE forums SET
-				NumPosts		  = NumPosts+1,
-				NumTopics		 = NumTopics+1,
-				LastPostID		= '$PostID',
-				LastPostAuthorID  = '".$AuthorID."',
-				LastPostTopicID   = '$TopicID',
-				LastPostTime	  = '".sqltime()."'
-				WHERE ID = '$ForumID'");
-
-	$DB->query("UPDATE forums_topics SET
-			NumPosts		  = NumPosts+1,
-			LastPostID		= '$PostID',
-			LastPostAuthorID  = '".$AuthorID."',
-			LastPostTime	  = '".sqltime()."'
-			WHERE ID = '$TopicID'");
-
-	// Bump this topic to head of the cache
-	list($Forum,,,$Stickies) = $Cache->get_value('forums_'.$ForumID);
-	if (!empty($Forum)) {
-		if (count($Forum) == TOPICS_PER_PAGE && $Stickies < TOPICS_PER_PAGE) {
-			array_pop($Forum);
-		}
-		$DB->query("SELECT f.IsLocked, f.IsSticky, f.NumPosts FROM forums_topics AS f WHERE f.ID ='$TopicID'");
-		list($IsLocked,$IsSticky,$NumPosts) = $DB->next_record();
-		$Part1 = array_slice($Forum,0,$Stickies,true); //Stickys
-		$Part2 = array(
-			$TopicID=>array(
-				'ID' => $TopicID,
-				'Title' => $Title,
-				'AuthorID' => $AuthorID,
-				'IsLocked' => $IsLocked,
-				'IsSticky' => $IsSticky,
-				'NumPosts' => $NumPosts,
-				'LastPostID' => $PostID,
-				'LastPostTime' => sqltime(),
-				'LastPostAuthorID' => $AuthorID,
-				)
-			); //Bumped thread
-		$Part3 = array_slice($Forum,$Stickies,TOPICS_PER_PAGE,true); //Rest of page
-		if ($Stickies > 0) {
-			$Part1 = array_slice($Forum,0,$Stickies,true); //Stickies
-			$Part3 = array_slice($Forum,$Stickies,TOPICS_PER_PAGE-$Stickies-1,true); //Rest of page
-		} else {
-			$Part1 = array();
-			$Part3 = $Forum;
-		}
-		if (is_null($Part1)) { $Part1 = array(); }
-		if (is_null($Part3)) { $Part3 = array(); }
-		$Forum = $Part1 + $Part2 + $Part3;
-		$Cache->cache_value('forums_'.$ForumID, array($Forum,'',0,$Stickies), 0);
-	}
-
-	//Update the forum root
-	$Cache->begin_transaction('forums_list');
-	$UpdateArray = array(
-		'NumPosts'=>'+1',
-		'NumTopics'=>'+1',
-		'LastPostID'=>$PostID,
-		'LastPostAuthorID'=>$AuthorID,
-		'LastPostTopicID'=>$TopicID,
-		'LastPostTime'=>sqltime(),
-		'Title'=>$Title,
-		'IsLocked'=>$ThreadInfo['IsLocked'],
-		'IsSticky'=>$ThreadInfo['IsSticky']
-		);
-
-	$UpdateArray['NumTopics']='+1';
-
-	$Cache->update_row($ForumID, $UpdateArray);
-	$Cache->commit_transaction(0);
-
-	$CatalogueID = floor((POSTS_PER_PAGE*ceil($Posts/POSTS_PER_PAGE)-POSTS_PER_PAGE)/THREAD_CATALOGUE);
-	$Cache->begin_transaction('thread_'.$TopicID.'_catalogue_'.$CatalogueID);
-	$Post = array(
-		'ID'=>$PostID,
-		'AuthorID'=>$LoggedUser['ID'],
-		'AddedTime'=>sqltime(),
-		'Body'=>$PostBody,
-		'EditedUserID'=>0,
-		'EditedTime'=>'0000-00-00 00:00:00',
-		'Username'=>''
-		);
-	$Cache->insert('', $Post);
-	$Cache->commit_transaction(0);
-
-	$Cache->begin_transaction('thread_'.$TopicID.'_info');
-	$Cache->update_row(false, array('Posts'=>'+1', 'LastPostAuthorID'=>$AuthorID));
-	$Cache->commit_transaction(0);
-
-	return $TopicID;
-}
-
-
-
-// Check to see if a user has the permission to perform an action
-function check_perms($PermissionName,$MinClass = 0) {
-	global $LoggedUser;
-	return (isset($LoggedUser['Permissions'][$PermissionName]) && $LoggedUser['Permissions'][$PermissionName] 
-	        && ($LoggedUser['Class']>=$MinClass || $LoggedUser['EffectiveClass']>=$MinClass))?true:false;
-}
-
-// TODO: make stricter, e.g. on all whitespace characters or Unicode normalisation
-function normalise_artist_name($ArtistName) {
-	// \u200e is &lrm;
-	$ArtistName = trim($ArtistName);
-	$ArtistName = preg_replace('/^(\xE2\x80\x8E)+/', '', $ArtistName);
-	$ArtistName = preg_replace('/(\xE2\x80\x8E)+$/', '', $ArtistName);
-	return trim(preg_replace('/ +/', ' ', $ArtistName));
-}
-
-function get_artists($GroupIDs, $Escape = array()) {
-	global $Cache, $DB;
-	$Results = array();
-	$DBs = array();
-	foreach($GroupIDs as $GroupID) {
-		if(!is_number($GroupID)) {
-			continue;
-		}
-		$Artists = $Cache->get_value('groups_artists_'.$GroupID);
-		if(is_array($Artists)) {
-			$Results[$GroupID] = $Artists;
-		} else {
-			$DBs[] = $GroupID;
-		}
-	}
-	if(count($DBs) > 0) {
-		$IDs = implode(',', $DBs);
-		if(empty($IDs)) {
-			$IDs = "null";
-		}
-		$DB->query("SELECT ta.GroupID,
-				ta.ArtistID,
-				aa.Name,
-				ta.Importance,
-				ta.AliasID
-			FROM torrents_artists AS ta 
-				JOIN artists_alias AS aa ON ta.AliasID = aa.AliasID 
-			WHERE ta.GroupID IN ($IDs) 
-			ORDER BY ta.GroupID ASC, 
-				ta.Importance ASC, 
-				aa.Name ASC;");
-		while(list($GroupID,$ArtistID,$ArtistName,$ArtistImportance,$AliasID) = $DB->next_record(MYSQLI_BOTH, false)) {
-			$Results[$GroupID][$ArtistImportance][] = array('id' => $ArtistID, 'name' => $ArtistName, 'aliasid' => $AliasID);
-			$New[$GroupID][$ArtistImportance][] = array('id' => $ArtistID, 'name' => $ArtistName, 'aliasid' => $AliasID);
-		}
-		foreach($DBs as $GroupID) {
-			if(isset($New[$GroupID])) {
-				$Cache->cache_value('groups_artists_'.$GroupID, $New[$GroupID]);
-			}
-			else {
-				$Cache->cache_value('groups_artists_'.$GroupID, array());
-			}
-		}
-		$Missing = array_diff($GroupIDs, array_keys($Results));
-		if(!empty($Missing)) {
-			$Results += array_fill_keys($Missing, array());
-		}
-	}
-	return $Results;
-}
-
-/**
- * Convenience class for when you just need one group
- * @param $GroupID
- * @return unknown_type
- */
-function get_artist($GroupID) {
-	$Results = get_artists(array($GroupID));
-	return $Results[$GroupID];
-}
-
-function display_artists($Artists, $MakeLink = true, $IncludeHyphen = true, $Escape = true) {
-	if(!empty($Artists)) {
-		$ampersand = ($Escape) ? ' &amp; ' : ' & ';
-		$link = '';
-		
-		$MainArtists = $Artists[1];
-		$Guests      = $Artists[2];
-		$Composers   = $Artists[4];
-		$Conductors  = $Artists[5];
-		$DJs         = $Artists[6];
-		
-		if ((count($MainArtists) + count($Conductors) + count($DJs) == 0) && (count($Composers) == 0)) {
-			return '';
-		}
-		
-		// Various Composers is not needed and is ugly and should die
-		switch(count($Composers)) {
-			case 0:
-				break;
-			case 1:
-				$link .= display_artist($Composers[0], $MakeLink, $Escape);
-				break;
-			case 2:
-				$link .= display_artist($Composers[0], $MakeLink, $Escape).$ampersand.display_artist($Composers[1], $MakeLink, $Escape);
-				break;
-		}
-
-		if ((count($Composers) > 0) && (count($Composers) < 3) && (count($MainArtists) > 0)) {
-			$link .= ' performed by ';
-		}
-		
-		$ComposerStr .= $link;
-		
-		switch(count($MainArtists)) {
-			case 0:
-				break;
-			case 1:
-				$link .= display_artist($MainArtists[0], $MakeLink, $Escape);
-				break;
-			case 2:
-				$link .= display_artist($MainArtists[0], $MakeLink, $Escape).$ampersand.display_artist($MainArtists[1], $MakeLink, $Escape);
-				break;
-			default:
-				$link .= 'Various Artists';
-		}
-		
-		/*if(!empty($Guests) &&  (count($MainArtists) + count($Composers) > 0) && (count($MainArtists) + count($Composers) + count($Conductors) < 3)) {
-			switch(count($Guests)) {
-				case 1:
-					$link .= ' with '.display_artist($Guests[0], $MakeLink, $Escape);
-					break;
-				case 2:
-					$link .= ' with '.display_artist($Guests[0], $MakeLink, $Escape).$ampersand.display_artist($Guests[1], $MakeLink, $Escape);
-					break;
-			}
-		}*/
-		
-		if ((count($Conductors) > 0) && (count($MainArtists) + count($Composers) > 0) && (count($Composers) < 3 || count($MainArtists) > 0)) {
-			$link .= ' under ';
-		}
-		switch(count($Conductors)) {
-			case 0:
-				break;
-			case 1:
-				$link .= display_artist($Conductors[0], $MakeLink, $Escape);
-				break;
-			case 2:
-				$link .= display_artist($Conductors[0], $MakeLink, $Escape).$ampersand.display_artist($Conductors[1], $MakeLink, $Escape);
-				break;
-			default:
-				$link .= ' Various Conductors';
-		}
-		
-		if ((count($Composers) > 0) && (count($MainArtists) + count($Conductors) > 3) && (count($MainArtists) > 1) && (count($Conductors) > 1)) {
-			$link = $ComposerStr . 'Various Artists';
-		} elseif ((count($Composers) > 2) && (count($MainArtists) + count($Conductors) == 0)) {
-			$link = 'Various Composers';
-		}
-				
-		// DJs override everything else
-		switch(count($DJs)) {
-			case 0:
-				break;
-			case 1:
-				$link = display_artist($DJs[0], $MakeLink, $Escape);
-				break;
-			case 2:
-				$link = display_artist($DJs[0], $MakeLink, $Escape).$ampersand.display_artist($DJs[1], $MakeLink, $Escape);
-				break;
-			default :
-				$link = 'Various DJs';
-		}
-		
-		return $link.($IncludeHyphen?' - ':'');
-	} else {
-		return '';
-	}
-}
-
-function display_artist($Artist, $MakeLink = true, $Escape = true) {
-	if ($MakeLink && !$Escape) {
-		error('Invalid parameters to display_artist()');
-	} elseif ($MakeLink) {
-		return '<a href="artist.php?id='.$Artist['id'].'">'.display_str($Artist['name']).'</a>';
-	} elseif ($Escape) {
-		return display_str($Artist['name']);
-	} else {
-		return $Artist['name'];
-	}
-}
-
-// Function to get data and torrents for an array of GroupIDs.
-// In places where the output from this is merged with sphinx filters, it will be in a different order.
-function get_groups($GroupIDs, $Return = true, $GetArtists = true, $Torrents = true) {
-	global $DB, $Cache;
-	
-	$Found = array_flip($GroupIDs);
-	$NotFound = array_flip($GroupIDs);
-	$Key = $Torrents ? 'torrent_group_' : 'torrent_group_light_';
-	
-	foreach($GroupIDs as $GroupID) {
-		$Data = $Cache->get_value($Key.$GroupID);
-		if(!empty($Data) && (@$Data['ver'] >= 4)) {
-			unset($NotFound[$GroupID]);
-			$Found[$GroupID] = $Data['d'];
-		}
-	}
-	
-	$IDs = implode(',',array_flip($NotFound));
-	
-	/*
-	Changing any of these attributes returned will cause very large, very dramatic site-wide chaos.
-	Do not change what is returned or the order thereof without updating:
-		torrents, artists, collages, bookmarks, better, the front page, 
-	and anywhere else the get_groups function is used.
-	*/
-	
-	if(count($NotFound)>0) {
-		$DB->query("SELECT g.ID, g.Name, g.Year, g.RecordLabel, g.CatalogueNumber, g.TagList, g.ReleaseType, g.VanityHouse FROM torrents_group AS g WHERE g.ID IN ($IDs)");
-	
-		while($Group = $DB->next_record(MYSQLI_ASSOC, true)) {
-			unset($NotFound[$Group['ID']]);
-			$Found[$Group['ID']] = $Group;
-			$Found[$Group['ID']]['Torrents'] = array();
-			$Found[$Group['ID']]['Artists'] = array();
-		}
-		
-		if ($Torrents) {
-			$DB->query("SELECT
-						ID, GroupID, Media, Format, Encoding, RemasterYear, Remastered, RemasterTitle, RemasterRecordLabel, RemasterCatalogueNumber, Scene, HasLog, HasCue, LogScore, FileCount, FreeTorrent, Size, Leechers, Seeders, Snatched, Time, ID AS HasFile
-						FROM torrents AS t WHERE GroupID IN($IDs) ORDER BY GroupID, Remastered, (RemasterYear <> 0) DESC, RemasterYear, RemasterTitle, RemasterRecordLabel, RemasterCatalogueNumber, Media, Format, Encoding, ID");
-			while($Torrent = $DB->next_record(MYSQLI_ASSOC, true)) {
-				$Found[$Torrent['GroupID']]['Torrents'][$Torrent['ID']] = $Torrent;
-		
-				$Cache->cache_value('torrent_group_'.$Torrent['GroupID'], array('ver'=>4, 'd'=>$Found[$Torrent['GroupID']]), 0);
-				$Cache->cache_value('torrent_group_light_'.$Torrent['GroupID'], array('ver'=>4, 'd'=>$Found[$Torrent['GroupID']]), 0);
-			}
-		} else {
-			foreach ($Found as $Group) {
-				$Cache->cache_value('torrent_group_light_'.$Group['ID'], array('ver'=>4, 'd'=>$Found[$Group['ID']]), 0);
-			}
-		}
-	}
-	if($GetArtists) {
-		$Artists = get_artists($GroupIDs);
-	} else {
-		$Artists = array();
-	}
-	
-	if($Return) { // If we're interested in the data, and not just caching it
-		foreach($Artists as $GroupID=>$Data) {
-			if(array_key_exists(1, $Data) || array_key_exists(4, $Data) || array_key_exists(6, $Data)) {
-				$Found[$GroupID]['Artists']=$Data[1]; // Only use main artists (legacy)
-				$Found[$GroupID]['ExtendedArtists'][1]=$Data[1];
-				$Found[$GroupID]['ExtendedArtists'][2]=$Data[2];
-				$Found[$GroupID]['ExtendedArtists'][3]=$Data[3];
-				$Found[$GroupID]['ExtendedArtists'][4]=$Data[4];
-				$Found[$GroupID]['ExtendedArtists'][5]=$Data[5];
-				$Found[$GroupID]['ExtendedArtists'][6]=$Data[6];
-			}
-			else {
-				$Found[$GroupID]['ExtendedArtists'] = false;
-			}
-		}
-
-		$Matches = array('matches'=>$Found, 'notfound'=>array_flip($NotFound));
-
-		return $Matches;
-	}
-}
-
-//Function to get data from an array of $RequestIDs.
-//In places where the output from this is merged with sphinx filters, it will be in a different order.
-function get_requests($RequestIDs, $Return = true) {
-	global $DB, $Cache;
-	
-	$Found = array_flip($RequestIDs);
-	$NotFound = array_flip($RequestIDs);
-	
-	foreach($RequestIDs as $RequestID) {
-		$Data = $Cache->get_value('request_'.$RequestID);
-		if(!empty($Data)) {
-			unset($NotFound[$RequestID]);
-			$Found[$RequestID] = $Data;
-		}
-	}
-	
-	$IDs = implode(',',array_flip($NotFound));
-
-	/*
-		Don't change without ensuring you change everything else that uses get_requests()
-	*/
-	
-	if(count($NotFound) > 0) {
-		$DB->query("SELECT
-					r.ID AS ID,
-					r.UserID,
-					u.Username,
-					r.TimeAdded,
-					r.LastVote,
-					r.CategoryID, 
-					r.Title, 
-					r.Year, 
-					r.Image,
-					r.Description,
-					r.CatalogueNumber,
-					r.RecordLabel,
-					r.ReleaseType, 
-					r.BitrateList,
-					r.FormatList, 
-					r.MediaList,
-					r.LogCue,
-					r.FillerID,
-					filler.Username,
-					r.TorrentID,
-					r.TimeFilled,
-					r.GroupID,
-					r.OCLC
-				FROM requests AS r
-					LEFT JOIN users_main AS u ON u.ID=r.UserID
-					LEFT JOIN users_main AS filler ON filler.ID=FillerID AND FillerID!=0
-				WHERE r.ID IN (".$IDs.")
-				ORDER BY ID");
-		
-		$Requests = $DB->to_array();
-		foreach($Requests as $Request) {
-			unset($NotFound[$Request['ID']]);
-			$Request['Tags'] = get_request_tags($Request['ID']);
-			$Found[$Request['ID']] = $Request;
-			$Cache->cache_value('request_'.$Request['ID'], $Request, 0);
-		}
-	}
-
-	if($Return) { // If we're interested in the data, and not just caching it
-		$Matches = array('matches'=>$Found, 'notfound'=>array_flip($NotFound));
-		return $Matches;
-	}
-}
-
-function update_sphinx_requests($RequestID) {
-	global $DB, $Cache;
-
-	$DB->query("REPLACE INTO sphinx_requests_delta (
-				ID, UserID, TimeAdded, LastVote, CategoryID, Title,
-				Year, ReleaseType, CatalogueNumber, BitrateList,
-				FormatList, MediaList, LogCue, FillerID, TorrentID,
-				TimeFilled, Visible, Votes, Bounty)
-			SELECT
-				ID, r.UserID, UNIX_TIMESTAMP(TimeAdded) AS TimeAdded,
-				UNIX_TIMESTAMP(LastVote) AS LastVote, CategoryID,
-				Title, Year, ReleaseType, CatalogueNumber, BitrateList,
-				FormatList, MediaList, LogCue, FillerID, TorrentID,
-				UNIX_TIMESTAMP(TimeFilled) AS TimeFilled, Visible,
-				COUNT(rv.UserID) AS Votes, SUM(rv.Bounty) >> 10 AS Bounty
-			FROM requests AS r LEFT JOIN requests_votes AS rv ON rv.RequestID=r.ID
-				wHERE ID = ".$RequestID."
-				GROUP BY r.ID");
-
-	$DB->query("UPDATE sphinx_requests_delta
-					SET ArtistList = (SELECT
-						GROUP_CONCAT(aa.Name SEPARATOR ' ')
-					FROM requests_artists AS ra
-						JOIN artists_alias AS aa ON aa.AliasID=ra.AliasID
-					WHERE ra.RequestID = ".$RequestID."
-					GROUP BY NULL)
-				WHERE ID = ".$RequestID);
-
-	$Cache->delete_value('requests_'.$RequestID);
-}
-
-function get_tags($TagNames) {
-	global $Cache, $DB;
-	$TagIDs = array();
-	foreach($TagNames as $Index => $TagName) {
-		$Tag = $Cache->get_value('tag_id_'.$TagName);
-		if(is_array($Tag)) {
-			unset($TagNames[$Index]);
-			$TagIDs[$Tag['ID']] = $Tag['Name'];
-		}
-	}
-	if(count($TagNames) > 0) {
-		$DB->query("SELECT ID, Name FROM tags WHERE Name IN ('".implode("', '", $TagNames)."')");
-		$SQLTagIDs = $DB->to_array();
-		foreach($SQLTagIDs as $Tag) {
-			$TagIDs[$Tag['ID']] = $Tag['Name'];
-			$Cache->cache_value('tag_id_'.$Tag['Name'], $Tag, 0);
-		}
-	}
-	
-	return($TagIDs);
-}
-
-function torrent_info($Data, $ShowMedia = false, $ShowEdition = false) {
-	$Info = array();
-	if(!empty($Data['Format'])) { $Info[]=$Data['Format']; }
-	if(!empty($Data['Encoding'])) { $Info[]=$Data['Encoding']; }
-	if(!empty($Data['HasLog'])) {
-		$Str = 'Log';
-		if(!empty($Data['LogScore'])) {
-			$Str.=' ('.$Data['LogScore'].'%)';
-		}
-		$Info[]=$Str;
-	}
-	if(!empty($Data['HasCue'])) { $Info[]='Cue'; }
-	if($ShowMedia && !empty($Data['Media'])) { $Info[]=$Data['Media']; }
-	if(!empty($Data['Scene'])) { $Info[]='Scene'; }
-	if($ShowEdition) {
-		$EditionInfo = array();
-		if(!empty($Data['RemasterYear'])) { $EditionInfo[]=$Data['RemasterYear']; }
-		if(!empty($Data['RemasterTitle'])) { $EditionInfo[]=$Data['RemasterTitle']; }
-		if(count($EditionInfo)) { $Info[]=implode(' ',$EditionInfo); }
-	}
-	if($Data['FreeTorrent'] == '1') { $Info[]='<strong>Freeleech!</strong>'; }
-	if($Data['FreeTorrent'] == '2') { $Info[]='<strong>Neutral Leech!</strong>'; }
-	if($Data['PersonalFL'] == 1) { $Info[]='<strong>Personal Freeleech!</strong>'; }
-	return implode(' / ', $Info);
-}
-
-// Echo data sent in a form, typically a text area
-function form($Index, $Return = false) {
-	if(!empty($_GET[$Index])) {
-		if($Return) {
-			return display_str($_GET[$Index]);
-		} else {
-			echo display_str($_GET[$Index]);
-		}
-	}
-}
-
-// Check/select tickboxes and <select>s
-function selected($Name, $Value, $Attribute='selected', $Array = array()) {
-	if(!empty($Array)) {
-		if(isset($Array[$Name]) && $Array[$Name]!=='') {
-			if($Array[$Name] == $Value) {
-				echo ' '.$Attribute.'="'.$Attribute.'"';
-			}
-		}
-	} else {
-		if(isset($_GET[$Name]) && $_GET[$Name]!=='') {
-			if($_GET[$Name] == $Value) {
-				echo ' '.$Attribute.'="'.$Attribute.'"';
-			}
-		}
-	}
-}
-function error($Error, $Ajax=false, $Log=false) {
-	global $Debug;
-	require(SERVER_ROOT.'/sections/error/index.php');
-	$Debug->profile();
-	die();
-}
-
-/**
- * @param BanReason 0 - Unknown, 1 - Manual, 2 - Ratio, 3 - Inactive, 4 - Unused.
- */
-
-function disable_users($UserIDs, $AdminComment, $BanReason = 1) {
-	global $Cache, $DB;
-	if(!is_array($UserIDs)) {
-		$UserIDs = array($UserIDs);
-	}
-	$DB->query("UPDATE users_info AS i JOIN users_main AS m ON m.ID=i.UserID
-		SET m.Enabled='2',
-		m.can_leech='0',
-		i.AdminComment = CONCAT('".sqltime()." - ".($AdminComment ? $AdminComment : 'Disabled by system')."\n\n', i.AdminComment),
-		i.BanDate='".sqltime()."',
-		i.BanReason='".$BanReason."',
-		i.RatioWatchDownload=".($BanReason == 2?'m.Downloaded':"'0'")."
-		WHERE m.ID IN(".implode(',',$UserIDs).") ");
-	$Cache->decrement('stats_user_count',$DB->affected_rows());
-	foreach($UserIDs as $UserID) {
-		/*
-		$Cache->cache_value('enabled_'.$UserID, 2, 2592000);
-		$Cache->begin_transaction('user_info_'.$UserID);
-		$Cache->update_row(false, array('Enabled' => 2));
-		$Cache->commit_transaction(0);
-		*/
-		$Cache->delete_value('enabled_'.$UserID);
-		$Cache->delete_value('user_info_'.$UserID);
-		$Cache->delete_value('user_info_heavy_'.$UserID);
-		$Cache->delete_value('user_stats_'.$UserID);
-	
-		$DB->query("SELECT SessionID FROM users_sessions WHERE UserID='$UserID' AND Active = 1");
-		while(list($SessionID) = $DB->next_record()) {
-			$Cache->delete_value('session_'.$UserID.'_'.$SessionID);
-		}
-		$Cache->delete_value('users_sessions_'.$UserID);
-		
-		
-		$DB->query("DELETE FROM users_sessions WHERE UserID='$UserID'");
-		
-	}
-	$DB->query("SELECT torrent_pass FROM users_main WHERE ID in (".implode(", ",$UserIDs).")");
-	$PassKeys = $DB->collect('torrent_pass');
-	$Concat = "";
-	foreach($PassKeys as $PassKey) {
-		if(strlen($Concat) > 4000) {
-			update_tracker('remove_users', array('passkeys' => $Concat));
-			$Concat = $PassKey;
-		} else {
-			$Concat .= $PassKey;
-		}
-	}
-	update_tracker('remove_users', array('passkeys' => $Concat));
-}
-
-
-/**
- * Send a GET request over a socket directly to the tracker
- * For example, update_tracker('change_passkey', array('oldpasskey' => OLD_PASSKEY, 'newpasskey' => NEW_PASSKEY)) will send the request:
- * GET /tracker_32_char_secret_code/update?action=change_passkey&oldpasskey=OLD_PASSKEY&newpasskey=NEW_PASSKEY HTTP/1.1
- * @param $Action The action to send
- * @param $Updates An associative array of key->value pairs to send to the tracker
- */
-function update_tracker($Action, $Updates, $ToIRC = false) {
-	global $Cache;
-	//Build request
-	$Get = '/update?action='.$Action;
-	foreach($Updates as $Key => $Value) {
-		$Get .= '&'.$Key.'='.$Value;
-	}
-
-	if($ToIRC != false) {
-		send_irc('PRIVMSG #tracker :'.$Get);
-	}
-	$Path = TRACKER_SECRET.$Get;
-
-	$Return = "";
-	$Attempts = 0;
-	while($Return != "success" && $Attempts < 3) {
-	
-		// Send update
-		$File = fsockopen(TRACKER_HOST, TRACKER_PORT, $ErrorNum, $ErrorString);
-		if($File) {
-			$Header = 'GET /'.$Path.' HTTP/1.1\r\n';
-			if(fwrite($File, $Header) === false) {
-				$Attempts++;
-				$Err = "Failed to fwrite()";
-				sleep(3);
-				continue;
-			}
-		} else {
-			$Attempts++;
-			$Err = "Failed to fsockopen() - ".$ErrorNum." - ".$ErrorString;
-			sleep(6);
-			continue;
-		}
-
-		// Check for response.
-
-		$ResHeader = '';
-		do {
-			$ResHeader .= fread($File, 1);
-		} while (!feof($File) && !ends_with($ResHeader, "\r\n\r\n"));
-
-		$Response = '';
-		while($Line = fgets($File)) {
-			$Response .= $Line;
-		}
-
-		$Return = chop($Response);
-		$Attempts++;
-	}
-
-	if($Return != "success") {
-		send_irc("PRIVMSG #tracker :{$Attempts} {$Err} {$Get}");
-		if($Cache->get_value('ocelot_error_reported') === false) {
-			send_irc("PRIVMSG ".ADMIN_CHAN." :Failed to update ocelot: ".$Err." : ".$Get);
-			$Cache->cache_value('ocelot_error_reported', true, 900);
-		}
-	}
-	return ($Return == "success");
-}
-/*
-function ends_with($Haystack, $Needle) {
-	return strrpos($Haystack, $Needle) === strlen($Haystack)-strlen($Needle);
-}
-*/
-
-/** This ends_with is slightly slower when the string is found, but a lot faster when it isn't.
- */
-function ends_with($Haystack, $Needle) {
-	return substr($Haystack, strlen($Needle) * -1) == $Needle;
-}
-
-function starts_with($Haystack, $Needle) {
-	return strpos($Haystack, $Needle) === 0;
-}
-
-/**
- * Variant of in_array() with trailing wildcard support
- * @param string $Needle, array $Haystack
- * @return true if (substring of) $Needle exists in $Haystack
- */
-function in_array_partial($Needle, $Haystack) {
-	static $Searches = array();
-	if(array_key_exists($Needle, $Searches)) {
-		return $Searches[$Needle];
-	}
-	foreach($Haystack as $String) {
-		if(substr($String, -1) == '*') {
-			if(!strncmp($Needle, $String, strlen($String)-1)) {
-				$Searches[$Needle] = true;
-				return true;
-			}
-		} elseif(!strcmp($Needle, $String)) {
-			$Searches[$Needle] = true;
-			return true;
-		}
-	}
-	$Searches[$Needle] = false;
-	return false;
-}
-
-/**
- * Will freeleech / neutralleech / normalise a set of torrents
- * @param array $TorrentIDs An array of torrents IDs to iterate over
- * @param int $FreeNeutral 0 = normal, 1 = fl, 2 = nl
- * @param int $FreeLeechType 0 = Unknown, 1 = Staff picks, 2 = Perma-FL (Toolbox, etc.), 3 = Vanity House
- */
-function freeleech_torrents($TorrentIDs, $FreeNeutral = 1, $FreeLeechType = 0) {
-	global $DB, $Cache, $LoggedUser;
-
-	if(!is_array($TorrentIDs)) {
-		$TorrentIDs = array($TorrentIDs);
-	}
-	
-	$DB->query("UPDATE torrents SET FreeTorrent = '".$FreeNeutral."', FreeLeechType = '".$FreeLeechType."' WHERE ID IN (".implode(", ", $TorrentIDs).")");
-	$DB->query("SELECT ID, GroupID, info_hash FROM torrents WHERE ID IN (".implode(", ", $TorrentIDs).") ORDER BY GroupID ASC");
-	$Torrents = $DB->to_array(false, MYSQLI_NUM, false);
-	$GroupIDs = $DB->collect('GroupID');
-
-	foreach($Torrents as $Torrent) {
-		list($TorrentID, $GroupID, $InfoHash) = $Torrent;
-		update_tracker('update_torrent', array('info_hash' => rawurlencode($InfoHash), 'freetorrent' => $FreeNeutral));
-		$Cache->delete_value('torrent_download_'.$TorrentID);
-		write_log($LoggedUser['Username']." marked torrent ".$TorrentID." freeleech type ".$FreeLeechType."!");
-		write_group_log($GroupID, $TorrentID, $LoggedUser['ID'], "marked as freeleech type ".$FreeLeechType."!", 0);
-	}
-
-	foreach($GroupIDs as $GroupID) {
-		update_hash($GroupID);
-	}
-}
-
-/**
- * Convenience function to allow for passing groups to freeleech_torrents()
- */	
-function freeleech_groups($GroupIDs, $FreeNeutral = 1, $FreeLeechType = 0) {
-	global $DB;
-
-	if(!is_array($GroupIDs)) {
-		$GroupIDs = array($GroupIDs);
-	}
-
-	$DB->query("SELECT ID from torrents WHERE GroupID IN (".implode(", ", $GroupIDs).")");
-	if($DB->record_count()) {
-		$TorrentIDs = $DB->collect('ID');
-		freeleech_torrents($TorrentIDs, $FreeNeutral, $FreeLeechType);
-	}
-}
-
-/**
- * Used to check if keys in $_POST and $_GET are all set
- * This reduces 'if' statement redundancy for a lot of variables
- */
-function isset_request($Request, $Keys=NULL, $AllowEmpty = False, $Error=0) {
-    if(isset($Keys)) {
-        foreach($Keys as $K) {
-            if(!isset($Request[$K]) || ($AllowEmpty == False && $Request[$K] == '')) {
-                error($Error);
-                break;
-            }
-        }
-    }
-    else {
-        foreach($Request as $R) {
-            if(!isset($R) || ($AllowEmpty == False && $R == '')) {
-                error($Error);
-                break;
-            }
-        }
-    }
-}
-
-/**
- * Test if there's an active lock with the given name
- *
- * @param string $LockName name on the lock
- * @return true if lock is active
- */
-function query_locked($LockName) {
-	global $Cache;
-	if ($Cache->get_value('query_lock_'.$LockName) !== false) {
-		return true;
-	}
-	return false;
-}
-
-/**
- * Add lock. Expiry time is one hour to avoid indefinite locks
- *
- * @param string $LockName name on the lock
- */
-function set_query_lock($LockName) {
-	global $Cache;
-	$Cache->cache_value('query_lock_'.$LockName, 1, 3600);
-}
-
-/**
- * Remove lock. Expiry time is one hour to avoid indefinite locks
- *
- * @param string $LockName name on the lock
- */
-function clear_query_lock($LockName) {
-	global $Cache;
-	$Cache->delete_value('query_lock_'.$LockName);
-}
 
 $Debug->set_flag('ending function definitions');
 //Include /sections/*/index.php
 $Document = basename(parse_url($_SERVER['SCRIPT_FILENAME'], PHP_URL_PATH), '.php');
-if(!preg_match('/^[a-z0-9]+$/i', $Document)) { error(404); }
+if (!preg_match('/^[a-z0-9]+$/i', $Document)) { error(404); }
 
 
 
 require(SERVER_ROOT.'/sections/'.$Document.'/index.php');
 $Debug->set_flag('completed module execution');
 
-/* Required in the absence of session_start() for providing that pages will change 
+/* Required in the absence of session_start() for providing that pages will change
 upon hit rather than being browser cached for changing content.
 
 Old versions of Internet Explorer choke when downloading binary files over HTTPS with disabled cache.
 Define the following constant in files that handle file downloads */
-if(!defined('IE_WORKAROUND_NO_CACHE_HEADERS')) {
+if (!defined('IE_WORKAROUND_NO_CACHE_HEADERS')) {
 	header('Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0');
 	header('Pragma: no-cache');
 }
diff --git a/classes/util.php b/classes/util.php
new file mode 100644
index 00000000..c4f2051c
--- /dev/null
+++ b/classes/util.php
@@ -0,0 +1,95 @@
+<?
+// This is a file of miscellaneous functions that are called so damn often
+// that it'd just be annoying to stick them in namespaces.
+
+/**
+ * Return true if the given string is numeric.
+ *
+ * @param string $Str
+ * @return true if $Str numeric
+ */
+function is_number($Str) {
+	$Return = true;
+	if ($Str < 0) { $Return = false; }
+	// We're converting input to a int, then string and comparing to original
+	$Return = ($Str == strval(intval($Str)) ? true : false);
+	return $Return;
+}
+
+
+/**
+ * HTML-escape a string for output.
+ * This is preferable to htmlspecialchars because it doesn't screw up upon a double escape.
+ *
+ * @param string $Str
+ * @return string escaped string.
+ */
+function display_str($Str) {
+	if ($Str === NULL || $Str === FALSE || is_array($Str)) {
+		return '';
+	}
+	if ($Str!='' && !is_number($Str)) {
+		$Str = Format::make_utf8($Str);
+		$Str = mb_convert_encoding($Str,"HTML-ENTITIES","UTF-8");
+		$Str = preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,5};)/m","&amp;",$Str);
+
+		$Replace = array(
+			"'",'"',"<",">",
+			'&#128;','&#130;','&#131;','&#132;','&#133;','&#134;','&#135;','&#136;',
+			'&#137;','&#138;','&#139;','&#140;','&#142;','&#145;','&#146;','&#147;',
+			'&#148;','&#149;','&#150;','&#151;','&#152;','&#153;','&#154;','&#155;',
+			'&#156;','&#158;','&#159;'
+		);
+
+		$With = array(
+			'&#39;','&quot;','&lt;','&gt;',
+			'&#8364;','&#8218;','&#402;','&#8222;','&#8230;','&#8224;','&#8225;','&#710;',
+			'&#8240;','&#352;','&#8249;','&#338;','&#381;','&#8216;','&#8217;','&#8220;',
+			'&#8221;','&#8226;','&#8211;','&#8212;','&#732;','&#8482;','&#353;','&#8250;',
+			'&#339;','&#382;','&#376;'
+		);
+
+		$Str = str_replace($Replace, $With, $Str);
+	}
+	return $Str;
+}
+
+
+/**
+ * Send a message to an IRC bot listening on SOCKET_LISTEN_PORT
+ *
+ * @param string $Raw An IRC protocol snippet to send.
+ */
+function send_irc($Raw) {
+	$IRCSocket = fsockopen(SOCKET_LISTEN_ADDRESS, SOCKET_LISTEN_PORT);
+	$Raw = str_replace(array("\n", "\r"), '', $Raw);
+	fwrite($IRCSocket, $Raw);
+	fclose($IRCSocket);
+}
+
+
+/**
+ * Display a critical error and kills the page.
+ *
+ * @param string $Error Error type. Automatically supported:
+ *	403, 404, 0 (invalid input), -1 (invalid request)
+ *	If you use your own string for Error, it becomes the error description.
+ * @param boolean $Ajax If true, the header/footer won't be shown, just the description.
+ * @param string $Log If true, the user is given a link to search $Log in the site log.
+ */
+function error($Error, $Ajax=false, $Log=false) {
+	global $Debug;
+	require(SERVER_ROOT.'/sections/error/index.php');
+	$Debug->profile();
+	die();
+}
+
+
+/**
+ * Convenience function. See doc in class_permissions.php
+ */
+function check_perms($PermissionName, $MinClass = 0) {
+	return Permissions::check_perms($PermissionName, $MinClass);
+}
+
+?>
diff --git a/design/privatefooter.php b/design/privatefooter.php
index e47be3b1..c3143bfe 100644
--- a/design/privatefooter.php
+++ b/design/privatefooter.php
@@ -24,7 +24,7 @@
 	<? if(!empty($LastActive)){ ?><p><a href="user.php?action=sessions" title="Manage Sessions">Last activity <?=time_diff($LastActive['LastUpdate'])?> from <?=$LastActive['IP']?>.</a></p><? } ?>
 	<p>
 		<strong>Time:</strong> <?=number_format(((microtime(true)-$ScriptStartTime)*1000),5)?> ms
-		<strong>Used:</strong> <?=get_size(memory_get_usage(true))?>
+		<strong>Used:</strong> <?=Format::get_size(memory_get_usage(true))?>
 		<strong>Load:</strong> <?=number_format($Load[0],2).' '.number_format($Load[1],2).' '.number_format($Load[2],2)?>
 		<strong>Date:</strong> <?=date('M d Y, H:i')?>
 
diff --git a/design/privateheader.php b/design/privateheader.php
index 8b296fba..6758396e 100644
--- a/design/privateheader.php
+++ b/design/privateheader.php
@@ -115,9 +115,9 @@
 	    	
 </ul>
 		<ul id="userinfo_stats">
-			<li id="stats_seeding"><a href="torrents.php?type=seeding&amp;userid=<?=$LoggedUser['ID']?>">Up</a>: <span class="stat"><?=get_size($LoggedUser['BytesUploaded'])?></span></li>
-			<li id="stats_leeching"><a href="torrents.php?type=leeching&amp;userid=<?=$LoggedUser['ID']?>">Down</a>: <span class="stat"><?=get_size($LoggedUser['BytesDownloaded'])?></span></li>
-			<li id="stats_ratio">Ratio: <span class="stat"><?=ratio($LoggedUser['BytesUploaded'], $LoggedUser['BytesDownloaded'])?></span></li>
+			<li id="stats_seeding"><a href="torrents.php?type=seeding&amp;userid=<?=$LoggedUser['ID']?>">Up</a>: <span class="stat"><?=Format::get_size($LoggedUser['BytesUploaded'])?></span></li>
+			<li id="stats_leeching"><a href="torrents.php?type=leeching&amp;userid=<?=$LoggedUser['ID']?>">Down</a>: <span class="stat"><?=Format::get_size($LoggedUser['BytesDownloaded'])?></span></li>
+			<li id="stats_ratio">Ratio: <span class="stat"><?=Format::get_ratio_html($LoggedUser['BytesUploaded'], $LoggedUser['BytesDownloaded'])?></span></li>
 <?	if(!empty($LoggedUser['RequiredRatio'])) {?>
 			<li id="stats_required"><a href="rules.php?p=ratio">Required</a>: <span class="stat"><?=number_format($LoggedUser['RequiredRatio'], 2)?></span></li>
 <?	} 
diff --git a/image.php b/image.php
index 67fd9c2e..6cb0bc27 100644
--- a/image.php
+++ b/image.php
@@ -53,7 +53,7 @@ function invisible($Image) {
 		$TotalAlpha += $Color['alpha'];
 	}
 	return (($TotalAlpha/$Count) == 127) ? true : false;
-	
+
 }
 
 function is_number($Str) {
diff --git a/sections/ajax/artist.php b/sections/ajax/artist.php
index e631c96b..4c66aecd 100644
--- a/sections/ajax/artist.php
+++ b/sections/ajax/artist.php
@@ -11,10 +11,6 @@ function compare($X, $Y){
 include(SERVER_ROOT.'/classes/class_text.php'); // Text formatting class
 $Text = new TEXT;
 
-// Similar artist map
-include(SERVER_ROOT.'/classes/class_artist.php');
-include(SERVER_ROOT.'/classes/class_artists_similar.php');
-
 $ArtistID = $_GET['id'];
 if(!is_number($ArtistID)) {
 	print json_encode(array('status' => 'failure'));
@@ -53,7 +49,7 @@ function compare($X, $Y){
 			wiki.Image,
 			wiki.body,
 			a.VanityHouse
-			FROM wiki_artists AS wiki 
+			FROM wiki_artists AS wiki
 			LEFT JOIN artists_group AS a ON wiki.RevisionID=a.RevisionID
 			WHERE wiki.RevisionID='$RevisionID' ";
 	} else {
@@ -91,7 +87,7 @@ function compare($X, $Y){
 			SUM(rv.Bounty) AS Bounty
 		FROM requests AS r
 			LEFT JOIN requests_votes AS rv ON rv.RequestID=r.ID
-			LEFT JOIN requests_artists AS ra ON r.ID=ra.RequestID 
+			LEFT JOIN requests_artists AS ra ON r.ID=ra.RequestID
 		WHERE ra.ArtistID = ".$ArtistID."
 			AND r.TorrentID = 0
 		GROUP BY r.ID
@@ -108,18 +104,18 @@ function compare($X, $Y){
 
 $LastReleaseType = 0;
 if(empty($Importances) || empty($TorrentList)) {
-	$DB->query("SELECT 
+	$DB->query("SELECT
 			DISTINCT ta.GroupID, ta.Importance, tg.VanityHouse
 			FROM torrents_artists AS ta
 			JOIN torrents_group AS tg ON tg.ID=ta.GroupID
 			WHERE ta.ArtistID='$ArtistID'
-			ORDER BY IF(ta.Importance IN ('2', '3', '4', '7'),ta.Importance, 1), 
+			ORDER BY IF(ta.Importance IN ('2', '3', '4', '7'),ta.Importance, 1),
 			    tg.ReleaseType ASC, tg.Year DESC, tg.Name DESC");
 
 	$GroupIDs = $DB->collect('GroupID');
 	$Importances = $DB->to_array('GroupID', MYSQLI_BOTH, false);
 	if(count($GroupIDs)>0) {
-		$TorrentList = get_groups($GroupIDs, true,true);
+		$TorrentList = Torrents::get_groups($GroupIDs, true,true);
 		$TorrentList = $TorrentList['matches'];
 	} else {
 		$TorrentList = array();
@@ -181,8 +177,8 @@ function compare($X, $Y){
 			$Tags[$Tag]['count']++;
 		}
 	}
-	
-	
+
+
 
 	$DisplayName ='<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
 	if(check_perms('users_mod')) {
@@ -197,9 +193,9 @@ function compare($X, $Y){
 			if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
 				unset($ExtendedArtists[2]);
 				unset($ExtendedArtists[3]);
-				$DisplayName = display_artists($ExtendedArtists).$DisplayName;
+				$DisplayName = Artists::display_artists($ExtendedArtists).$DisplayName;
 			} elseif(count($GroupArtists)>0) {
-				$DisplayName = display_artists(array(1 => $Artists), true, true).$DisplayName;
+				$DisplayName = Artists::display_artists(array(1 => $Artists), true, true).$DisplayName;
 			}
 			break;
 		case 1022:  // Show performers on composer pages
@@ -207,14 +203,14 @@ function compare($X, $Y){
 				unset($ExtendedArtists[4]);
 				unset($ExtendedArtists[3]);
 				unset($ExtendedArtists[6]);
-				$DisplayName = display_artists($ExtendedArtists).$DisplayName;
+				$DisplayName = Artists::display_artists($ExtendedArtists).$DisplayName;
 			} elseif(count($GroupArtists)>0) {
-				$DisplayName = display_artists(array(1 => $Artists), true, true).$DisplayName;
+				$DisplayName = Artists::display_artists(array(1 => $Artists), true, true).$DisplayName;
 			}
 			break;
 		default: // Show composers otherwise
 			if (!empty($ExtendedArtists[4])) {
-				$DisplayName = display_artists(array(4 => $ExtendedArtists[4]), true, true).$DisplayName;
+				$DisplayName = Artists::display_artists(array(4 => $ExtendedArtists[4]), true, true).$DisplayName;
 			}
 	}
 
diff --git a/sections/ajax/better/single.php b/sections/ajax/better/single.php
index 5d702495..70a5ebba 100644
--- a/sections/ajax/better/single.php
+++ b/sections/ajax/better/single.php
@@ -13,7 +13,7 @@
 	$Cache->cache_value('better_single_groupids', $GroupIDs, 30*60);
 }
 
-$Results = get_groups(array_keys($GroupIDs));
+$Results = Torrents::get_groups(array_keys($GroupIDs));
 
 $Results = $Results['matches'];
 
diff --git a/sections/ajax/better/transcode.php b/sections/ajax/better/transcode.php
index 9fc67bd2..4c767c2a 100644
--- a/sections/ajax/better/transcode.php
+++ b/sections/ajax/better/transcode.php
@@ -33,7 +33,7 @@
 // If some were fetched from memcached, get their artists
 if(!empty($Results['matches'])) { // Fetch the artists for groups
 	$GroupIDs = array_keys($Results['matches']);
-	$Artists = get_artists($GroupIDs);
+	$Artists = Artists::get_artists($GroupIDs);
 	foreach($Artists as $GroupID=>$Data) {
 		if(!empty($Data[1])) {
 			$Results['matches'][$GroupID]['Artists']=$Data[1]; // Only use main artists
@@ -44,7 +44,7 @@
 */
  // These ones were not found in the cache, run SQL
 if(!empty($Results['notfound'])) {
-	$SQLResults = get_groups($Results['notfound']);
+	$SQLResults = Torrents::get_groups($Results['notfound']);
 	
 	if(is_array($SQLResults['notfound'])) { // Something wasn't found in the db, remove it from results
 		reset($SQLResults['notfound']);
@@ -70,7 +70,7 @@
 	
 	$DisplayName = '';
 	if(count($Artists)>0) {
-		$DisplayName = display_artists(array('1'=>$Artists));
+		$DisplayName = Artists::display_artists(array('1'=>$Artists));
 	}
 	$DisplayName.='<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
 	if($GroupYear>0) { $DisplayName.=" [".$GroupYear."]"; }
diff --git a/sections/ajax/bookmarks/torrents.php b/sections/ajax/bookmarks/torrents.php
index 9df12701..a8babc40 100644
--- a/sections/ajax/bookmarks/torrents.php
+++ b/sections/ajax/bookmarks/torrents.php
@@ -41,7 +41,7 @@ function compare($X, $Y){
 	$GroupIDs = $DB->collect('GroupID');
 	$CollageDataList=$DB->to_array('GroupID', MYSQLI_ASSOC);
 	if(count($GroupIDs)>0) {
-		$TorrentList = get_groups($GroupIDs);
+		$TorrentList = Torrents::get_groups($GroupIDs);
 		$TorrentList = $TorrentList['matches'];
 	} else {
 		$TorrentList = array();
@@ -94,7 +94,7 @@ function compare($X, $Y){
 
 	$DisplayName = '';
 	if(count($GroupArtists)>0) {
-		$DisplayName = display_artists(array('1'=>$GroupArtists));
+		$DisplayName = Artists::display_artists(array('1'=>$GroupArtists));
 	}
 	$DisplayName .= '<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
 	if($GroupYear>0) { $DisplayName = $DisplayName. ' ['. $GroupYear .']';}
@@ -170,7 +170,7 @@ function compare($X, $Y){
 	
 	$DisplayName = '';
 	if(!empty($GroupArtists)) {
-		$DisplayName.= display_artists(array('1'=>$GroupArtists), false);
+		$DisplayName.= Artists::display_artists(array('1'=>$GroupArtists), false);
 	}
 	$DisplayName .= $GroupName;
 	if($GroupYear>0) { $DisplayName = $DisplayName. ' ['. $GroupYear .']';}
diff --git a/sections/ajax/browse.php b/sections/ajax/browse.php
index 714f3963..b8d6e065 100644
--- a/sections/ajax/browse.php
+++ b/sections/ajax/browse.php
@@ -12,7 +12,7 @@ function header_link($SortKey,$DefaultWay="desc") {
 		else { $NewWay="desc"; }
 	} else { $NewWay=$DefaultWay; }
 	
-	return "torrents.php?order_way=".$NewWay."&amp;order_by=".$SortKey."&amp;".get_url(array('order_way','order_by'));
+	return "torrents.php?order_way=".$NewWay."&amp;order_by=".$SortKey."&amp;".Format::get_url(array('order_way','order_by'));
 }
 
 $TokenTorrents = $Cache->get_value('users_tokens_'.$UserID);
@@ -284,7 +284,7 @@ function header_link($SortKey,$DefaultWay="desc") {
 
 // These ones were not found in the cache, run SQL
 if(!empty($Results['notfound'])) {
-	$SQLResults = get_groups($Results['notfound']);
+	$SQLResults = Torrents::get_groups($Results['notfound']);
 	
 	if(is_array($SQLResults['notfound'])) { // Something wasn't found in the db, remove it from results
 		reset($SQLResults['notfound']);
@@ -362,7 +362,7 @@ function header_link($SortKey,$DefaultWay="desc") {
 		if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
 			unset($ExtendedArtists[2]);
 			unset($ExtendedArtists[3]);
-			$DisplayName = display_artists($ExtendedArtists, false, false, true);
+			$DisplayName = Artists::display_artists($ExtendedArtists, false, false, true);
                         foreach ($ExtendedArtists[1] as $Artist) {
                             $JsonArtists[] = array(
                                 'id' => (int) $Artist['id'],
@@ -371,7 +371,7 @@ function header_link($SortKey,$DefaultWay="desc") {
                                 );
                         }
 		} elseif(!empty($Artists)) {
-			$DisplayName = display_artists(array(1=>$Artists), false, false, true);
+			$DisplayName = Artists::display_artists(array(1=>$Artists), false, false, true);
                         foreach ($Artists as $Artist) {
                             $JsonArtists[] = array(
                                 'id' => (int) $Artist['id'],
diff --git a/sections/ajax/forum/forum.php b/sections/ajax/forum/forum.php
index bc8bd16f..6cddf24d 100644
--- a/sections/ajax/forum/forum.php
+++ b/sections/ajax/forum/forum.php
@@ -28,7 +28,7 @@
 	$PerPage = POSTS_PER_PAGE;
 }
 
-list($Page,$Limit) = page_limit(TOPICS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(TOPICS_PER_PAGE);
 
 //---------- Get some data to start processing
 
@@ -80,7 +80,7 @@
 	);
 }
 
-$Pages=get_pages($Page,$Forums[$ForumID]['NumTopics'],TOPICS_PER_PAGE,9);
+$Pages=Format::get_pages($Page,$Forums[$ForumID]['NumTopics'],TOPICS_PER_PAGE,9);
 
 if (count($Forum) == 0) {
 	print
@@ -118,9 +118,9 @@
 		} else {
 			$Read = 'read';
 		}
-		$UserInfo = user_info($AuthorID);
+		$UserInfo = Users::user_info($AuthorID);
 		$AuthorName = $UserInfo['Username'];
-		$UserInfo = user_info($LastAuthorID);
+		$UserInfo = Users::user_info($LastAuthorID);
 		$LastAuthorName = $UserInfo['Username'];
 		
 		$JsonTopics[] = array(
diff --git a/sections/ajax/forum/main.php b/sections/ajax/forum/main.php
index 9e1bd235..f7e219c2 100644
--- a/sections/ajax/forum/main.php
+++ b/sections/ajax/forum/main.php
@@ -62,7 +62,7 @@
 	} else {
 		$Read = 'read';
 	}
-	$UserInfo = user_info($LastAuthorID);
+	$UserInfo = Users::user_info($LastAuthorID);
 	
 	$JsonForums[] = array(
 		'forumId' => (int) $ForumID,
diff --git a/sections/ajax/forum/thread.php b/sections/ajax/forum/thread.php
index 6ec8b27a..46766ee3 100644
--- a/sections/ajax/forum/thread.php
+++ b/sections/ajax/forum/thread.php
@@ -73,11 +73,11 @@
 } else {
 	$PostNum = 1;
 }
-list($Page,$Limit) = page_limit($PerPage, min($ThreadInfo['Posts'],$PostNum));
+list($Page,$Limit) = Format::page_limit($PerPage, min($ThreadInfo['Posts'],$PostNum));
 if(($Page-1)*$PerPage > $ThreadInfo['Posts']) {
 	$Page = ceil($ThreadInfo['Posts']/$PerPage);
 }
-list($CatalogueID,$CatalogueLimit) = catalogue_limit($Page,$PerPage,THREAD_CATALOGUE);
+list($CatalogueID,$CatalogueLimit) = Format::catalogue_limit($Page,$PerPage,THREAD_CATALOGUE);
 
 // Cache catalogue from which the page is selected, allows block caches and future ability to specify posts per page
 if(!$Catalogue = $Cache->get_value('thread_'.$ThreadID.'_catalogue_'.$CatalogueID)) {
@@ -96,7 +96,7 @@
 		$Cache->cache_value('thread_'.$ThreadID.'_catalogue_'.$CatalogueID, $Catalogue, 0);
 	}
 }
-$Thread = catalogue_select($Catalogue,$Page,$PerPage,THREAD_CATALOGUE);
+$Thread = Format::catalogue_select($Catalogue,$Page,$PerPage,THREAD_CATALOGUE);
 
 if ($_GET['updatelastread'] != '0') {
 	$LastPost = end($Thread);
@@ -220,8 +220,8 @@
 $JsonPosts = array();
 foreach ($Thread as $Key => $Post) {
 	list($PostID, $AuthorID, $AddedTime, $Body, $EditedUserID, $EditedTime) = array_values($Post);
-	list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(user_info($AuthorID));
-	$UserInfo = user_info($EditedUserID);
+	list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(Users::user_info($AuthorID));
+	$UserInfo = Users::user_info($EditedUserID);
 	$JsonPosts[] = array(
 		'postId' => (int) $PostID,
 		'addedTime' => $AddedTime,
diff --git a/sections/ajax/inbox/inbox.php b/sections/ajax/inbox/inbox.php
index 7f92f215..2ac43576 100644
--- a/sections/ajax/inbox/inbox.php
+++ b/sections/ajax/inbox/inbox.php
@@ -18,7 +18,7 @@
 	die();
 }
 
-list($Page,$Limit) = page_limit(MESSAGES_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(MESSAGES_PER_PAGE);
 
 $Sort = empty($_GET['sort']) || $_GET['sort'] != "unread" ? "Date DESC" : "cu.Unread = '1' DESC, DATE DESC";
 
@@ -70,14 +70,14 @@
 list($NumResults) = $DB->next_record();
 $DB->set_query_id($Results);
 
-$CurURL = get_url(array('sort'));
+$CurURL = Format::get_url(array('sort'));
 if(empty($CurURL)) {
 	$CurURL = "inbox.php?";
 } else {
 	$CurURL = "inbox.php?".$CurURL."&";
 }
 
-$Pages=get_pages($Page,$NumResults,MESSAGES_PER_PAGE,9);
+$Pages=Format::get_pages($Page,$NumResults,MESSAGES_PER_PAGE,9);
 
 $JsonMessages = array();
 while(list($ConvID, $Subject, $Unread, $Sticky, $ForwardedID, $ForwardedName, $SenderID, $Username, $Donor, $Warned, $Enabled, $Date) = $DB->next_record()) {
diff --git a/sections/ajax/inbox/viewconv.php b/sections/ajax/inbox/viewconv.php
index 7e5a4887..3b680b2c 100644
--- a/sections/ajax/inbox/viewconv.php
+++ b/sections/ajax/inbox/viewconv.php
@@ -46,7 +46,7 @@
 
 while(list($PMUserID, $Username) = $DB->next_record()) {
 	$PMUserID = (int)$PMUserID;
-	$Users[$PMUserID]['UserStr'] = format_username($PMUserID, true, true, true, true);
+	$Users[$PMUserID]['UserStr'] = Users::format_username($PMUserID, true, true, true, true);
 	$Users[$PMUserID]['Username'] = $Username;
 }
 $Users[0]['UserStr'] = 'System'; // in case it's a message from the system
diff --git a/sections/ajax/notifications.php b/sections/ajax/notifications.php
index 51f44f32..835acf0c 100644
--- a/sections/ajax/notifications.php
+++ b/sections/ajax/notifications.php
@@ -12,7 +12,7 @@
 }
 
 define('NOTIFICATIONS_PER_PAGE', 50);
-list($Page,$Limit) = page_limit(NOTIFICATIONS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(NOTIFICATIONS_PER_PAGE);
 
 $TokenTorrents = $Cache->get_value('users_tokens_'.$LoggedUser['ID']);
 if (empty($TokenTorrents)) {
@@ -36,10 +36,10 @@
 list($TorrentCount) = $DB->next_record();
 
 if(count($GroupIDs)) {
-	$TorrentGroups = get_groups($GroupIDs);
+	$TorrentGroups = Torrents::get_groups($GroupIDs);
 	$TorrentGroups = $TorrentGroups['matches'];
 
-	// Need some extra info that get_groups() doesn't return
+	// Need some extra info that Torrents::get_groups() doesn't return
 	$DB->query("SELECT ID, CategoryID FROM torrents_group WHERE ID IN (".implode(',', $GroupIDs).")");
 	$GroupCategoryIDs = $DB->to_array('ID', MYSQLI_ASSOC, false);
 
diff --git a/sections/ajax/request.php b/sections/ajax/request.php
index 73e9b3a5..06fb9ce9 100644
--- a/sections/ajax/request.php
+++ b/sections/ajax/request.php
@@ -31,7 +31,7 @@
 
 //First things first, lets get the data for the request.
 
-$Request = get_requests(array($RequestID));	
+$Request = Requests::get_requests(array($RequestID));	
 $Request = $Request['matches'][$RequestID];
 if(empty($Request)) {
 	print
@@ -59,8 +59,8 @@
 //Do we need to get artists?
 if($CategoryName == "Music") {
 	$ArtistForm = get_request_artists($RequestID);
-	$ArtistName = display_artists($ArtistForm, false, true);
-	$ArtistLink = display_artists($ArtistForm, true, true);
+	$ArtistName = Artists::display_artists($ArtistForm, false, true);
+	$ArtistLink = Artists::display_artists($ArtistForm, true, true);
 	
 	if($IsFilled) {
 		$DisplayLink = $ArtistLink."<a href='torrents.php?torrentid=".$TorrentID."'>".$Title."</a> [".$Year."]";
@@ -141,7 +141,7 @@
 	$Cache->cache_value('request_comments_'.$RequestID, $Results, 0);
 }
 
-list($Page,$Limit) = page_limit(TORRENT_COMMENTS_PER_PAGE,$Results);
+list($Page,$Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE,$Results);
 
 //Get the cache catalogue
 $CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE*$Page-TORRENT_COMMENTS_PER_PAGE)/THREAD_CATALOGUE);
@@ -175,7 +175,7 @@
 $JsonRequestComments = array();
 foreach($Thread as $Key => $Post){
 	list($PostID, $AuthorID, $AddedTime, $Body, $EditedUserID, $EditedTime, $EditedUsername) = array_values($Post);
-	list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(user_info($AuthorID));
+	list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(Users::user_info($AuthorID));
 	$JsonRequestComments[] = array(
 		'postId' => (int) $PostID,
 		'authorId' => (int) $AuthorID,
@@ -183,7 +183,7 @@
 		'donor' => $Donor == 1,
 		'warned' => ($Warned!='0000-00-00 00:00:00'),
 		'enabled' => ($Enabled == 2 ? false : true),
-		'class' => make_class_string($PermissionID),
+		'class' => Users::make_class_string($PermissionID),
 		'addedTime' => $AddedTime,
 		'avatar' => $Avatar,
 		'comment' => $Text->full_format($Body),
diff --git a/sections/ajax/requests.php b/sections/ajax/requests.php
index 348d9ec3..a029743d 100644
--- a/sections/ajax/requests.php
+++ b/sections/ajax/requests.php
@@ -5,12 +5,12 @@
 $Queries = array();
 
 $OrderWays = array('year', 'votes', 'bounty', 'created', 'lastvote', 'filled');
-list($Page,$Limit) = page_limit(REQUESTS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(REQUESTS_PER_PAGE);
 $Submitted = !empty($_GET['submit']);
 					
 //Paranoia					
-$UserInfo = user_info((int)$_GET['userid']);
-$Perms = get_permissions($UserInfo['PermissionID']);
+$UserInfo = Users::user_info((int)$_GET['userid']);
+$Perms = Permissions::get_permissions($UserInfo['PermissionID']);
 $UserClass = $Perms['Class'];
 
 $BookmarkView = false;
@@ -96,12 +96,12 @@
 	$Tags = explode(',', $_GET['tags']);
 	$TagNames = array();
 	foreach ($Tags as $Tag) {
-		$Tag = sanitize_tag($Tag);
+		$Tag = Misc::sanitize_tag($Tag);
 		if(!empty($Tag)) {
 			$TagNames[] = $Tag;
 		}
 	}
-	$Tags = get_tags($TagNames);
+	$Tags = Misc::get_tags($TagNames);
 }
 
 if(empty($_GET['tags_type']) && !empty($Tags)) {
@@ -278,7 +278,7 @@
 //We don't use sphinxapi's default cache searcher, we use our own functions
 
 if(!empty($SphinxResults['notfound'])) {
-	$SQLResults = get_requests($SphinxResults['notfound']);
+	$SQLResults = Requests::get_requests($SphinxResults['notfound']);
 	if(is_array($SQLResults['notfound'])) {
 		//Something wasn't found in the db, remove it from results
 		reset($SQLResults['notfound']);
diff --git a/sections/ajax/subscriptions.php b/sections/ajax/subscriptions.php
index cf546a59..5fc16a3b 100644
--- a/sections/ajax/subscriptions.php
+++ b/sections/ajax/subscriptions.php
@@ -23,7 +23,7 @@
 } else {
 	$PerPage = POSTS_PER_PAGE;
 }
-list($Page,$Limit) = page_limit($PerPage);
+list($Page,$Limit) = Format::page_limit($PerPage);
 
 if($LoggedUser['CustomForums']) {
 	unset($LoggedUser['CustomForums']['']);
diff --git a/sections/ajax/tcomments.php b/sections/ajax/tcomments.php
index 5da0d628..9d93afc1 100644
--- a/sections/ajax/tcomments.php
+++ b/sections/ajax/tcomments.php
@@ -19,9 +19,9 @@
 if(isset($_GET['postid']) && is_number($_GET['postid']) && $Results > TORRENT_COMMENTS_PER_PAGE) {
 	$DB->query("SELECT COUNT(ID) FROM torrents_comments WHERE GroupID = $GroupID AND ID <= $_GET[postid]");
 	list($PostNum) = $DB->next_record();
-	list($Page,$Limit) = page_limit(TORRENT_COMMENTS_PER_PAGE,$PostNum);
+	list($Page,$Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE,$PostNum);
 } else {
-	list($Page,$Limit) = page_limit(TORRENT_COMMENTS_PER_PAGE,$Results);
+	list($Page,$Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE,$Results);
 }
 
 //Get the cache catalogue
@@ -57,7 +57,7 @@
 $JsonComments = array();
 foreach ($Thread as $Key => $Post) {
 	list($PostID, $AuthorID, $AddedTime, $Body, $EditedUserID, $EditedTime, $EditedUsername) = array_values($Post);
-	list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(user_info($AuthorID));
+	list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(Users::user_info($AuthorID));
 	$JsonComments[] = array(
 		'postId' => (int) $PostID,
 		'addedTime' => $AddedTime,
diff --git a/sections/ajax/top10/torrents.php b/sections/ajax/top10/torrents.php
index ec5655df..ce63d336 100644
--- a/sections/ajax/top10/torrents.php
+++ b/sections/ajax/top10/torrents.php
@@ -146,7 +146,7 @@ function generate_torrent_json($Caption, $Tag, $Details, $Limit) {
 			$Format,$Encoding,$Media,$Scene,$HasLog,$HasCue,$LogScore,$Year,$GroupYear,
 			$RemasterTitle,$Snatched,$Seeders,$Leechers,$Data) = $Detail;
 
-		$Artist = display_artists(get_artist($GroupID), false, true);
+		$Artist = Artists::display_artists(Artists::get_artist($GroupID), false, true);
 		$TruncArtist = substr($Artist, 0, strlen($Artist)-3);
 
 		$TagList=array();
diff --git a/sections/ajax/torrentgroup.php b/sections/ajax/torrentgroup.php
index 2467bd6b..2c8ebaf6 100644
--- a/sections/ajax/torrentgroup.php
+++ b/sections/ajax/torrentgroup.php
@@ -20,7 +20,7 @@ function filter_by_key($input, $keys) { return array_intersect_key($input, array
 
 $TorrentDetails = filter_by_key($TorrentCache[0][0], $GroupAllowed);
 
-$ArtistForm = get_artist($GroupID);
+$ArtistForm = Artists::get_artist($GroupID);
 if($TorrentDetails['CategoryID'] == 0) {
 	$CategoryName = "Unknown";
 } else {
diff --git a/sections/ajax/userhistory/post_history.php b/sections/ajax/userhistory/post_history.php
index ef3fdc7d..676e39d5 100644
--- a/sections/ajax/userhistory/post_history.php
+++ b/sections/ajax/userhistory/post_history.php
@@ -1,5 +1,5 @@
 <?
-//TODO: replace 24-43 with user_info()
+//TODO: replace 24-43 with Users::user_info()
 /*
 User post history page
 */
@@ -32,7 +32,7 @@ function error_out($reason = "") {
 	$PerPage = POSTS_PER_PAGE;
 }
 
-list($Page,$Limit) = page_limit($PerPage);
+list($Page,$Limit) = Format::page_limit($PerPage);
 
 if(($UserInfo = $Cache->get_value('user_info_'.$UserID)) === FALSE) {
 	$DB->query("SELECT
diff --git a/sections/ajax/usersearch.php b/sections/ajax/usersearch.php
index 4b6c9fcc..216fa3ec 100644
--- a/sections/ajax/usersearch.php
+++ b/sections/ajax/usersearch.php
@@ -13,7 +13,7 @@
 if(isset($_GET['username'])){
 	$_GET['username'] = trim($_GET['username']);
 
-	list($Page,$Limit) = page_limit(USERS_PER_PAGE);
+	list($Page,$Limit) = Format::page_limit(USERS_PER_PAGE);
 	$DB->query("SELECT SQL_CALC_FOUND_ROWS
 		ID,
 		Username,
@@ -42,7 +42,7 @@
 		'donor' => $Donor == 1,
 		'warned' => ($Warned!='0000-00-00 00:00:00'),
 		'enabled' => ($Enabled == 2 ? false : true),
-		'class' => make_class_string($PermissionID)
+		'class' => Users::make_class_string($PermissionID)
 	);
 }
 
diff --git a/sections/artist/add_alias.php b/sections/artist/add_alias.php
index 694b950f..05d191ac 100644
--- a/sections/artist/add_alias.php
+++ b/sections/artist/add_alias.php
@@ -4,7 +4,7 @@
 if(!check_perms('torrents_edit')) { error(403); }
 $ArtistID = $_POST['artistid'];
 $Redirect = $_POST['redirect'];
-$AliasName = normalise_artist_name($_POST['name']);
+$AliasName = Artists::normalise_artist_name($_POST['name']);
 $DBAliasName = db_string($AliasName);
 if(!$Redirect) { $Redirect = 0; }
 
@@ -35,7 +35,7 @@
 		if($ArtistID == $CloneArtistID && $Redirect == 0) {
 			if($CloneRedirect != 0) {
 				$DB->query("UPDATE artists_alias SET ArtistID='".$ArtistID."', Redirect=0 WHERE AliasID='".$CloneAliasID."'");
-				write_log("Redirection for the alias $CloneAliasID ($DBAliasName) for the artist $ArtistID was removed by user $LoggedUser[ID] ($LoggedUser[Username])");
+				Misc::write_log("Redirection for the alias $CloneAliasID ($DBAliasName) for the artist $ArtistID was removed by user $LoggedUser[ID] ($LoggedUser[Username])");
 			} else {
 				error('No changes were made as the target alias did not redirect anywhere.');
 			}
@@ -66,7 +66,7 @@
 	$DB->query("SELECT Name FROM artists_group WHERE ArtistID = ".$ArtistID);
 	list($ArtistName) = $DB->next_record(MYSQLI_NUM, false);
 
-	write_log("The alias ".$AliasID." (".$DBAliasName.") was added to the artist ".$ArtistID." (".db_string($ArtistName).") by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].")");
+	Misc::write_log("The alias ".$AliasID." (".$DBAliasName.") was added to the artist ".$ArtistID." (".db_string($ArtistName).") by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].")");
 }
 header('Location: '.$_SERVER['HTTP_REFERER']);
 ?>
diff --git a/sections/artist/artist.php b/sections/artist/artist.php
index 3b1c8b95..2a3a0120 100644
--- a/sections/artist/artist.php
+++ b/sections/artist/artist.php
@@ -13,7 +13,6 @@ function compare($X, $Y){
 include(SERVER_ROOT.'/sections/requests/functions.php');
 
 // Similar artist map
-include(SERVER_ROOT.'/classes/class_artist.php');
 include(SERVER_ROOT.'/classes/class_artists_similar.php');
 
 include(SERVER_ROOT.'/classes/class_image_tools.php');
@@ -33,7 +32,7 @@ function compare($X, $Y){
 if($Data) {
 	$Data = unserialize($Data);
 	list($K, list($Name, $Image, $Body, $NumSimilar, $SimilarArray, $TorrentList, $Importances, $VanityHouseArtist)) = each($Data);
-	
+
 } else {
 	if ($RevisionID) {
 		$sql = "SELECT
@@ -41,7 +40,7 @@ function compare($X, $Y){
 			wiki.Image,
 			wiki.body,
 			a.VanityHouse
-			FROM wiki_artists AS wiki 
+			FROM wiki_artists AS wiki
 			LEFT JOIN artists_group AS a ON wiki.RevisionID=a.RevisionID
 			WHERE wiki.RevisionID='$RevisionID' ";
 	} else {
@@ -56,9 +55,9 @@ function compare($X, $Y){
 	}
 	$sql .= " GROUP BY a.ArtistID";
 	$DB->query($sql);
-	
+
 	if($DB->record_count()==0) { error(404); }
-	
+
 	list($Name, $Image, $Body, $VanityHouseArtist) = $DB->next_record(MYSQLI_NUM, array(0));
 }
 
@@ -86,12 +85,12 @@ function compare($X, $Y){
 			SUM(rv.Bounty) AS Bounty
 		FROM requests AS r
 			LEFT JOIN requests_votes AS rv ON rv.RequestID=r.ID
-			LEFT JOIN requests_artists AS ra ON r.ID=ra.RequestID 
+			LEFT JOIN requests_artists AS ra ON r.ID=ra.RequestID
 		WHERE ra.ArtistID = ".$ArtistID."
 			AND r.TorrentID = 0
 		GROUP BY r.ID
 		ORDER BY Votes DESC");
-	
+
 	if($DB->record_count() > 0) {
 		$Requests = $DB->to_array();
 	} else {
@@ -103,19 +102,19 @@ function compare($X, $Y){
 
 $LastReleaseType = 0;
 if(empty($Importances) || empty($TorrentList)) {
-	$DB->query("SELECT 
+	$DB->query("SELECT
 			DISTINCTROW ta.GroupID, ta.Importance, tg.VanityHouse
 			FROM torrents_artists AS ta
 			JOIN torrents_group AS tg ON tg.ID=ta.GroupID
 			WHERE ta.ArtistID='$ArtistID'
-			ORDER BY IF(ta.Importance IN ('2', '3', '4', '7'),1000 + ta.Importance, tg.ReleaseType) ASC, 
+			ORDER BY IF(ta.Importance IN ('2', '3', '4', '7'),1000 + ta.Importance, tg.ReleaseType) ASC,
 			    tg.Year DESC, tg.Name DESC");
-	
+
 	$GroupIDs = $DB->collect('GroupID');
 	$Importances = $DB->to_array(false, MYSQLI_BOTH, false);
-	
+
 	if(count($GroupIDs)>0) {
-		$TorrentList = get_groups($GroupIDs, true,true);
+		$TorrentList = Torrents::get_groups($GroupIDs, true,true);
 		$TorrentList = $TorrentList['matches'];
 	} else {
 		$TorrentList = array();
@@ -138,32 +137,32 @@ function compare($X, $Y){
 			//$TorrentList[$GroupID]['ReleaseType'] = 1024;
 			$GuestAlbums = true;
 			break;
-			
+
 		case '3':
 			$Importances[$ID]['ReleaseType'] = 1023;
 			//$TorrentList[$GroupID]['ReleaseType'] = 1023;
 			$RemixerAlbums = true;
 			break;
-			
+
 		case '4':
 			$Importances[$ID]['ReleaseType'] = 1022;
 			//$TorrentList[$GroupID]['ReleaseType'] = 1022;
 			$ComposerAlbums = true;
 			break;
-			
+
 		case '7':
 			$Importances[$ID]['ReleaseType'] = 1021;
 			//$TorrentList[$GroupID]['ReleaseType'] = 1021;
 			$ProducerAlbums = true;
 			break;
-			
+
 		default:
 			$Importances[$ID]['ReleaseType'] = $TorrentList[$Group['GroupID']]['ReleaseType'];
 	}
-	
+
 	if(!in_array($Importances[$ID]['ReleaseType'], $UsedReleases)) {
 		$UsedReleases[] = $Importances[$ID]['ReleaseType'];
-	}	
+	}
 }
 
 if(!empty($GuestAlbums)) {
@@ -199,7 +198,7 @@ function compare($X, $Y){
 				$DisplayName = $ReleaseTypes[$ReleaseID]."s";
 				break;
 		}
-		
+
 		if (!empty($LoggedUser['DiscogView']) || (isset($LoggedUser['HideTypes']) && in_array($ReleaseID, $LoggedUser['HideTypes']))) {
 			$ToggleStr = " onclick=\"$('.releases_$ReleaseID').show(); return true;\"";
 		} else {
@@ -225,7 +224,7 @@ function compare($X, $Y){
 	$TagList = explode(' ',str_replace('_','.',$Group['TagList']));
 
 	$TorrentTags = array();
-	
+
 	// $Tags array is for the sidebar on the right.  Skip compilations and soundtracks.
 	if ($Group['ReleaseType'] != 7 && $Group['ReleaseType'] != 3) {
 		foreach($TagList as $Tag) {	
@@ -238,14 +237,14 @@ function compare($X, $Y){
 	}
 	$TorrentTags = implode(', ', $TorrentTags);
 	$TorrentTags = '<br /><div class="tags">'.$TorrentTags.'</div>';
-	
+
 	foreach ($Group['Torrents'] as $TorrentID => $Torrent) {
 		$NumTorrents++;
-		
+
 		$Torrent['Seeders'] = (int)$Torrent['Seeders'];
 		$Torrent['Leechers'] = (int)$Torrent['Leechers'];
 		$Torrent['Snatched'] = (int)$Torrent['Snatched'];
-		
+
 		$NumSeeders+=$Torrent['Seeders'];
 		$NumLeechers+=$Torrent['Leechers'];
 		$NumSnatches+=$Torrent['Snatched'];
@@ -264,31 +263,31 @@ function compare($X, $Y){
 	list($GroupID, $GroupName, $GroupYear, $GroupRecordLabel, $GroupCatalogueNumber, $TagList, $ReleaseType, $GroupVanityHouse, $Torrents, $Artists, $ExtendedArtists) = array_values($TorrentList[$Group['GroupID']]);
 	$ReleaseType = $Group['ReleaseType'];
 	$GroupVanityHouse = $Group['VanityHouse'];
-	
+
 	if ($GroupID == $OldGroupID && $ReleaseType == $OldReleaseType) {
 		continue;
 	} else {
 		$OldGroupID = $GroupID;
 		$OldReleaseType = $ReleaseType;
 	}
-	
+
 	if (!empty($LoggedUser['DiscogView']) || (isset($LoggedUser['HideTypes']) && in_array($ReleaseType, $LoggedUser['HideTypes']))) {
 		$HideDiscog = ' hidden';
 	} else {
 		$HideDiscog = '';
 	}
-	
+
 	$TagList = explode(' ',str_replace('_','.',$TagList));
 
 	$TorrentTags = array();
-	
+
 	// $Tags array is for the sidebar on the right.  Skip compilations and soundtracks.
 	foreach($TagList as $Tag) {
 		$TorrentTags[] = '<a href="torrents.php?taglist='.$Tag.'">'.$Tag.'</a>';
 	}
 	$TorrentTags = implode(', ', $TorrentTags);
 	$TorrentTags = '<br /><div class="tags">'.$TorrentTags.'</div>';
-	
+
 	if($ReleaseType!=$LastReleaseType) {
 		switch($ReleaseTypes[$ReleaseType]) {
 			case "Remix" :
@@ -322,13 +321,13 @@ function compare($X, $Y){
 		$LastReleaseType = $ReleaseType;
 	}
 
-	
+
 	$DisplayName ='<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
 	if(check_perms('users_mod') || check_perms('torrents_fix_ghosts')) {
 		$DisplayName .= ' [<a href="torrents.php?action=fix_group&amp;groupid='.$GroupID.'&amp;artistid='.$ArtistID.'&amp;auth='.$LoggedUser['AuthKey'].'" title="Fix ghost DB entry">Fix</a>]';
 	}
 
-	
+
 	switch($ReleaseType){
 		case 1023: // Remixes, DJ Mixes, Guest artists, and Producers need the artist name
 		case 1024:
@@ -337,9 +336,9 @@ function compare($X, $Y){
 			if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
 				unset($ExtendedArtists[2]);
 				unset($ExtendedArtists[3]);
-				$DisplayName = display_artists($ExtendedArtists).$DisplayName;
+				$DisplayName = Artists::display_artists($ExtendedArtists).$DisplayName;
 			} elseif(count($GroupArtists)>0) {
-				$DisplayName = display_artists(array(1 => $Artists), true, true).$DisplayName;
+				$DisplayName = Artists::display_artists(array(1 => $Artists), true, true).$DisplayName;
 			}
 			break;
 		case 1022:  // Show performers on composer pages
@@ -347,14 +346,14 @@ function compare($X, $Y){
 				unset($ExtendedArtists[4]);
 				unset($ExtendedArtists[3]);
 				unset($ExtendedArtists[6]);
-				$DisplayName = display_artists($ExtendedArtists).$DisplayName;
+				$DisplayName = Artists::display_artists($ExtendedArtists).$DisplayName;
 			} elseif(count($GroupArtists)>0) {
-				$DisplayName = display_artists(array(1 => $Artists), true, true).$DisplayName;
+				$DisplayName = Artists::display_artists(array(1 => $Artists), true, true).$DisplayName;
 			}
 			break;
 		default: // Show composers otherwise
 			if (!empty($ExtendedArtists[4])) {
-				$DisplayName = display_artists(array(4 => $ExtendedArtists[4]), true, true).$DisplayName;
+				$DisplayName = Artists::display_artists(array(4 => $ExtendedArtists[4]), true, true).$DisplayName;
 			}
 	}
 
@@ -383,19 +382,19 @@ function compare($X, $Y){
 
 	$EditionID = 0;
 	unset($FirstUnknown);
-	
+
 	foreach ($Torrents as $TorrentID => $Torrent) {
 		if ($Torrent['Remastered'] && !$Torrent['RemasterYear']) {
 			$FirstUnknown = !isset($FirstUnknown);
 		}
-			
+
 		if (in_array($TorrentID, $TokenTorrents) && empty($Torrent['FreeTorrent'])) {
 			$Torrent['PersonalFL'] = 1;
 		}
 
 		if($Torrent['RemasterTitle'] != $LastRemasterTitle || $Torrent['RemasterYear'] != $LastRemasterYear ||
 		   $Torrent['RemasterRecordLabel'] != $LastRemasterRecordLabel || $Torrent['RemasterCatalogueNumber'] != $LastRemasterCatalogueNumber || $FirstUnknown || $Torrent['Media'] != $LastMedia) {
-	
+
 			$EditionID++;
 
 			if($Torrent['Remastered'] && $Torrent['RemasterYear'] != 0) {
@@ -405,7 +404,7 @@ function compare($X, $Y){
 				if($Torrent['RemasterCatalogueNumber']) { $RemasterName .= $AddExtra.display_str($Torrent['RemasterCatalogueNumber']); $AddExtra=' / '; }
 				if($Torrent['RemasterTitle']) { $RemasterName .= $AddExtra.display_str($Torrent['RemasterTitle']); $AddExtra=' / '; }
 				$RemasterName .= $AddExtra.display_str($Torrent['Media']);
-					
+
 ?>
 	<tr class="releases_<?=$ReleaseType?> groupid_<?=$GroupID?> edition group_torrent discog<?=$HideDiscog.$HideTorrents?>">
 		<td colspan="6" class="edition_info"><strong><a href="#" onclick="toggle_edition(<?=$GroupID?>, <?=$EditionID?>, this, event)" title="Collapse this edition. Hold &quot;Ctrl&quot; while clicking to collapse all editions in this torrent group.">&minus;</a> <?=$RemasterName?></strong></a></td>
@@ -438,14 +437,14 @@ function compare($X, $Y){
 		<td colspan="2">
 			<span>
 				[ <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>" title="Download"><?=$Torrent['HasFile'] ? 'DL' : 'Missing'?></a>
-<?		if (($LoggedUser['FLTokens'] > 0) && ($Torrent['Size'] < 1073741824) 
+<?		if (($LoggedUser['FLTokens'] > 0) && ($Torrent['Size'] < 1073741824)
 			&& !in_array($TorrentID, $TokenTorrents) && empty($Torrent['FreeTorrent']) && ($LoggedUser['CanLeech'] == '1')) { ?>
 						| <a href="torrents.php?action=download&amp;id=<?=$TorrentID ?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>&amp;usetoken=1" title="Use a FL Token" onclick="return confirm('Are you sure you want to use a freeleech token here?');">FL</a>
 <?		} ?> ]
 			</span>
-			&nbsp;&nbsp;&raquo;&nbsp; <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=torrent_info($Torrent)?></a>
+			&nbsp;&nbsp;&raquo;&nbsp; <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=Torrents::torrent_info($Torrent)?></a>
 		</td>
-		<td class="nobr"><?=get_size($Torrent['Size'])?></td>
+		<td class="nobr"><?=Format::get_size($Torrent['Size'])?></td>
 		<td><?=number_format($Torrent['Snatched'])?></td>
 		<td<?=($Torrent['Seeders']==0)?' class="r00"':''?>><?=number_format($Torrent['Seeders'])?></td>
 		<td><?=number_format($Torrent['Leechers'])?></td>
@@ -457,12 +456,12 @@ function compare($X, $Y){
 			</table>
 		</div>
 <?}
-	
+
 $TorrentDisplayList = ob_get_clean();
 
 //----------------- End building list and getting stats
 
-show_header($Name, 'browse,requests,bbcode');
+View::show_header($Name, 'browse,requests,bbcode');
 ?>
 <div class="thin">
 	<div class="header">
@@ -494,7 +493,7 @@ function compare($X, $Y){
 			<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Unbookmark('artist', <?=$ArtistID?>,'[Bookmark]');return false;">[Remove bookmark]</a>
 
 <?
-	} else { 
+	} else {
 ?>
 			<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Bookmark('artist', <?=$ArtistID?>,'[Remove bookmark]');return false;">[Bookmark]</a>
 <?
@@ -557,11 +556,11 @@ function compare($X, $Y){
 				<form class="download_form" name="zip" action="artist.php" method="post">
 					<input type="hidden" name="action" value="download" />
 					<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-					<input type="hidden" name="artistid" value="<?=$ArtistID?>" /> 
+					<input type="hidden" name="artistid" value="<?=$ArtistID?>" />
 				<ul id="list" class="nobullet">
 <? foreach ($ZIPList as $ListItem) { ?>
 					<li id="list<?=$ListItem?>">
-						<input type="hidden" name="list[]" value="<?=$ListItem?>" /> 
+						<input type="hidden" name="list[]" value="<?=$ListItem?>" />
 						<span style="float:left;"><?=$ZIPOptions[$ListItem]['2']?></span>
 						<a href="#" onclick="remove_selection('<?=$ListItem?>');return false;" style="float:right;" title="Remove format from the Collector">[X]</a>
 						<br style="clear:all;" />
@@ -597,7 +596,7 @@ function compare($X, $Y){
 					<option value="1"<? if($ZIPPrefs==1){ echo ' selected="selected"'; } ?>>Prefer Best Seeded</option>
 					<option value="2"<? if($ZIPPrefs==2){ echo ' selected="selected"'; } ?>>Prefer Bonus Tracks</option>
 				</select>
-				<input type="submit" style="width:210px" value="Download" /> 
+				<input type="submit" style="width:210px" value="Download" />
 				</form>
 			</div>
 		</div>
@@ -656,10 +655,10 @@ function compare($X, $Y){
 			<ul class="stats nobullet">
 <?
 	if($NumSimilar == 0) { ?>
-				<li><span style="font-style: italic;">None found</span></li> 
+				<li><span style="font-style: italic;">None found</span></li>
 <?	}
 	$First = true;
-	foreach ($SimilarArray as $SimilarArtist) {	
+	foreach ($SimilarArray as $SimilarArtist) {
 		list($Artist2ID, $Artist2Name, $Score, $SimilarID) = $SimilarArtist;
 		$Score = $Score/100;
 		if($First) {
@@ -730,7 +729,7 @@ function compare($X, $Y){
 
 			if($CategoryName == "Music") {
 				$ArtistForm = get_request_artists($RequestID);
-				$ArtistLink = display_artists($ArtistForm, true, true);
+				$ArtistLink = Artists::display_artists($ArtistForm, true, true);
 				$FullName = $ArtistLink."<a href='requests.php?action=view&amp;id=".$RequestID."'>".$Title." [".$Year."]</a>";
 			} else if($CategoryName == "Audiobooks" || $CategoryName == "Comedy") {
 				$FullName = "<a href='requests.php?action=view&amp;id=".$RequestID."'>".$Title." [".$Year."]</a>";
@@ -764,7 +763,7 @@ function compare($X, $Y){
 <?		} ?>
 			</td>
 			<td>
-				<span id="bounty_<?=$RequestID?>"><?=get_size($Bounty)?></span>
+				<span id="bounty_<?=$RequestID?>"><?=Format::get_size($Bounty)?></span>
 			</td>
 			<td>
 				<?=time_diff($TimeAdded)?>
@@ -815,7 +814,7 @@ function compare($X, $Y){
 
 
 
-<? } // if $NumSimilar>0 
+<? } // if $NumSimilar>0
 
 if($NumSimilar>0) { ?>
 
@@ -894,14 +893,14 @@ function require(file, callback) {
 	</div>
 </div>
 <?
-show_footer();
+View::show_footer();
 
 
 // Cache page for later use
 
-if($RevisionID) { 
+if($RevisionID) {
 	$Key = "artist_$ArtistID"."_revision_$RevisionID";
-} else { 
+} else {
 	$Key = 'artist_'.$ArtistID;
 }
 
diff --git a/sections/artist/artist_rearrange.php b/sections/artist/artist_rearrange.php
index 6a1fa5af..c4cd40a0 100644
--- a/sections/artist/artist_rearrange.php
+++ b/sections/artist/artist_rearrange.php
@@ -13,7 +13,6 @@ function compare($X, $Y){
 
 
 // Similar artist map
-include(SERVER_ROOT.'/classes/class_artist.php');
 include(SERVER_ROOT.'/classes/class_artists_similar.php');
 
 $ArtistID = $_GET['id'];
@@ -31,7 +30,7 @@ function compare($X, $Y){
 if($Data) {
 	$Data = unserialize($Data);
 	list($K, list($Name, $Image, $Body, $NumSimilar, $SimilarArray, $TorrentList, $GroupMeta)) = each($Data);
-	
+
 } else {
 	$sql = "SELECT
 		a.Name,
@@ -48,9 +47,9 @@ function compare($X, $Y){
 	}
 	$sql .= " GROUP BY a.ArtistID";
 	$DB->query($sql, MYSQLI_NUM, true);
-	
+
 	if($DB->record_count()==0) { error(404); }
-	
+
 	list($Name, $Image, $Body, $VanityHouseArtist) = $DB->next_record();
 }
 
@@ -72,12 +71,12 @@ function compare($X, $Y){
 			SUM(rv.Bounty) AS Bounty
 		FROM requests AS r
 			LEFT JOIN requests_votes AS rv ON rv.RequestID=r.ID
-			LEFT JOIN requests_artists AS ra ON r.ID=ra.RequestID 
+			LEFT JOIN requests_artists AS ra ON r.ID=ra.RequestID
 		WHERE ra.ArtistID = ".$ArtistID."
 			AND r.TorrentID = 0
 		GROUP BY r.ID
 		ORDER BY Votes DESC");
-	
+
 	if($DB->record_count() > 0) {
 		$Requests = $DB->to_array();
 	} else {
@@ -89,17 +88,17 @@ function compare($X, $Y){
 
 $LastReleaseType = 0;
 if(empty($GroupMeta) || empty($TorrentList)) {
-	$DB->query("SELECT 
+	$DB->query("SELECT
 			DISTINCT ta.GroupID, ta.Importance, tg.VanityHouse
 			FROM torrents_artists AS ta
 			JOIN torrents_group AS tg ON tg.ID=ta.GroupID
 			WHERE ta.ArtistID='$ArtistID'
 			ORDER BY ta.Importance, tg.ReleaseType ASC, tg.Year DESC");
-	
+
 	$GroupIDs = $DB->collect('GroupID');
 	$GroupMeta = $DB->to_array('GroupID', MYSQLI_BOTH, false);
 	if(count($GroupIDs)>0) {
-		$TorrentList = get_groups($GroupIDs, true, true);
+		$TorrentList = Torrents::get_groups($GroupIDs, true, true);
 		$TorrentList = $TorrentList['matches'];
 	} else {
 		$TorrentList = array();
@@ -204,7 +203,7 @@ function display_name($ReleaseType) {
 $OpenTable = false;
 foreach ($TorrentListByReleaseType as $ReleaseType => $TorrentListForReleaseType) {
 	$NumTorrentsReleaseType = count($TorrentListForReleaseType);
-	if($OpenTable) { 
+	if($OpenTable) {
 		?></table><?
 		$OpenTable = false;
 	}
@@ -223,12 +222,12 @@ function display_name($ReleaseType) {
 
 	if ((isset($LoggedUser['ArtistOptions']) && array_key_exists($ReleaseType, $LoggedUser['ArtistOptions'])) && $LoggedUser['ArtistOptions'][$ReleaseType] == 0) {
 		$HideDiscog = " hidden";
-		$HideDiscogDefault = true;		
+		$HideDiscogDefault = true;
 	}
 	else {
 		$HideDiscog = "";
-		$HideDiscogDefault = false;	
-	}	
+		$HideDiscogDefault = false;
+	}
 	?>
 	<table class="torrent_table grouped release_table releases_<?=$ReleaseType?>_table<?=$NumTorrentsReleaseType==0?" empty hidden":""?>" id="torrents_<?=$ReleaseTypeLabel?>">
 		<tr class="colhead_dark">
@@ -267,7 +266,7 @@ function display_name($ReleaseType) {
 		$TagList = explode(' ',str_replace('_','.',$TagList));
 
 		$TorrentTags = array();
-	
+
 		// $Tags array is for the sidebar on the right
 		foreach($TagList as $Tag) {
 			if(!isset($Tags[$Tag])) {
@@ -281,11 +280,11 @@ function display_name($ReleaseType) {
 		$TorrentTags = '<br /><div class="tags">'.$TorrentTags.'</div>';
 
 		if (($ReleaseType == 1023) || ($ReleaseType == 1024)) {
-			$ArtistPrefix = display_artists(array(1 => $GroupArtists));
+			$ArtistPrefix = Artists::display_artists(array(1 => $GroupArtists));
 		} else {
 			$ArtistPrefix = '';
 		}
-	
+
 		$DisplayName = $ArtistPrefix . '<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
 		if($GroupYear>0) { $DisplayName = $GroupYear. ' - '.$DisplayName; }
 
@@ -307,33 +306,33 @@ function display_name($ReleaseType) {
 		$LastRemasterRecordLabel = '';
 		$LastRemasterCatalogueNumber = '';
 		$LastMedia = '';
-	
+
 		$EditionID = 0;
-	
+
 		foreach ($Torrents as $TorrentID => $Torrent) {
 			$NumTorrents++;
-		
+
 			$Torrent['Seeders'] = (int)$Torrent['Seeders'];
 			$Torrent['Leechers'] = (int)$Torrent['Leechers'];
 			$Torrent['Snatched'] = (int)$Torrent['Snatched'];
-		
+
 			$NumSeeders+=$Torrent['Seeders'];
 			$NumLeechers+=$Torrent['Leechers'];
 			$NumSnatches+=$Torrent['Snatched'];
-		
+
 			if($Torrent['RemasterTitle'] != $LastRemasterTitle || $Torrent['RemasterYear'] != $LastRemasterYear ||
 			$Torrent['RemasterRecordLabel'] != $LastRemasterRecordLabel || $Torrent['RemasterCatalogueNumber'] != $LastRemasterCatalogueNumber || $Torrent['Media'] != $LastMedia) {
-		
+
 				$EditionID++;
-			
-				if($Torrent['RemasterTitle']  || $Torrent['RemasterYear'] || $Torrent['RemasterRecordLabel'] || $Torrent['RemasterCatalogueNumber']) {				
+
+				if($Torrent['RemasterTitle']  || $Torrent['RemasterYear'] || $Torrent['RemasterRecordLabel'] || $Torrent['RemasterCatalogueNumber']) {
 					$RemasterName = $Torrent['RemasterYear'];
 					$AddExtra = " - ";
 					if($Torrent['RemasterRecordLabel']) { $RemasterName .= $AddExtra.display_str($Torrent['RemasterRecordLabel']); $AddExtra=' / '; }
 					if($Torrent['RemasterCatalogueNumber']) { $RemasterName .= $AddExtra.display_str($Torrent['RemasterCatalogueNumber']); $AddExtra=' / '; }
 					if($Torrent['RemasterTitle']) { $RemasterName .= $AddExtra.display_str($Torrent['RemasterTitle']); $AddExtra=' / '; }
 					$RemasterName .= $AddExtra.display_str($Torrent['Media']);
-				
+
 ?>
 	<tr class="releases_<?=$ReleaseType?> groupid_<?=$GroupID?> edition group_torrent discog <?=$HideDiscog?>">
 		<td colspan="7" class="artist_normalcol edition_info"><strong><a href="#" onclick="toggle_edition(<?=$GroupID?>, <?=$EditionID?>, this, event)" title="Collapse this edition. Hold &quot;Ctrl&quot; while clicking to collapse all editions in this torrent group.">&minus;</a> <?=$RemasterName?></strong></a></td>
@@ -363,9 +362,9 @@ function display_name($ReleaseType) {
 			<span>
 				[ <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>" title="Download">DL</a> ]
 			</span>
-			&nbsp;&nbsp;&raquo;&nbsp; <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=torrent_info($Torrent)?></a>
+			&nbsp;&nbsp;&raquo;&nbsp; <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=Torrents::torrent_info($Torrent)?></a>
 		</td>
-		<td class="artist_normalcol nobr"><?=get_size($Torrent['Size'])?></td>
+		<td class="artist_normalcol nobr"><?=Format::get_size($Torrent['Size'])?></td>
 		<td class="artist_normalcol"><?=number_format($Torrent['Snatched'])?></td>
 		<td class="artist_normalcol<?=($Torrent['Seeders']==0)?' r00':''?>"><?=number_format($Torrent['Seeders'])?></td>
 		<td class="artist_normalcol"><?=number_format($Torrent['Leechers'])?></td>
@@ -387,7 +386,7 @@ function display_name($ReleaseType) {
 
 //----------------- End building list and getting stats
 
-show_header($Name, 'browse,requests,artists,bbcode');
+View::show_header($Name, 'browse,requests,artists,bbcode');
 ?>
 <div class="thin">
 	<div class="header">
@@ -426,7 +425,7 @@ function display_name($ReleaseType) {
 			<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Unbookmark('artist', <?=$ArtistID?>,'[Bookmark]');return false;">[Remove bookmark]</a>
 
 <?
-	} else { 
+	} else {
 ?>
 			<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Bookmark('artist', <?=$ArtistID?>,'[Remove bookmark]');return false;">[Bookmark]</a>
 <?
@@ -588,7 +587,7 @@ function display_name($ReleaseType) {
 
 			if($CategoryName == "Music") {
 				$ArtistForm = get_request_artists($RequestID);
-				$ArtistLink = display_artists($ArtistForm, true, true);
+				$ArtistLink = Artists::display_artists($ArtistForm, true, true);
 				$FullName = $ArtistLink."<a href='requests.php?action=view&amp;id=".$RequestID."'>".$Title." [".$Year."]</a>";
 			} else if($CategoryName == "Audiobooks" || $CategoryName == "Comedy") {
 				$FullName = "<a href='requests.php?action=view&amp;id=".$RequestID."'>".$Title." [".$Year."]</a>";
@@ -619,10 +618,10 @@ function display_name($ReleaseType) {
 <?  	if(check_perms('site_vote')){ ?>
 				<input type="hidden" id="auth" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
 				&nbsp;&nbsp; <a href="javascript:Vote(0)"><strong>(+)</strong></a>
-<?		} ?> 
+<?		} ?>
 			</td>
 			<td>
-				<?=get_size($Bounty)?>
+				<?=Format::get_size($Bounty)?>
 			</td>
 			<td>
 				<?=time_diff($TimeAdded)?>
@@ -675,7 +674,7 @@ function display_name($ReleaseType) {
 	</div>
 </div>
 <?
-show_footer();
+View::show_footer();
 
 
 // Cache page for later use
diff --git a/sections/artist/change_artistid.php b/sections/artist/change_artistid.php
index c07bf826..fa9aa649 100644
--- a/sections/artist/change_artistid.php
+++ b/sections/artist/change_artistid.php
@@ -90,13 +90,13 @@
 	if(!empty($Groups)) {
 		foreach($Groups as $GroupID) {
 			$Cache->delete_value('groups_artists_'.$GroupID);
-			update_hash($GroupID);
+			Torrents::update_hash($GroupID);
 		}
 	}
 	if(!empty($Requests)) {
 		foreach($Requests as $RequestID) {
 			$Cache->delete_value('request_artist_'.$RequestID);
-			update_sphinx_requests($RequestID);
+			Requests::update_sphinx_requests($RequestID);
 		}
 	}
 	if(!empty($BookmarkUsers)) {
@@ -116,11 +116,11 @@
 	// Delete the old artist
 	$DB->query("DELETE FROM artists_group WHERE ArtistID = $ArtistID");
 
-	write_log("The artist ".$ArtistID." (".$ArtistName.") was made into a non-redirecting alias of artist ".$NewArtistID." (".$NewArtistName.") by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].")");
+	Misc::write_log("The artist ".$ArtistID." (".$ArtistName.") was made into a non-redirecting alias of artist ".$NewArtistID." (".$NewArtistName.") by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].")");
 
 	header("Location: artist.php?action=edit&artistid=$NewArtistID");
 } else {
-	show_header('Merging Artists');
+	View::show_header('Merging Artists');
 ?>
 	<div class="header">
 		<h2>Confirm merge</h2>
@@ -138,6 +138,6 @@
 		</div>
 	</form>
 <?
-	show_footer();
+	View::show_footer();
 }
 ?>
diff --git a/sections/artist/delete.php b/sections/artist/delete.php
index 566dabc5..cb428014 100644
--- a/sections/artist/delete.php
+++ b/sections/artist/delete.php
@@ -14,7 +14,7 @@
 
 if(!check_perms('site_delete_artist') || !check_perms('torrents_delete')) { error(403); }
 
-show_header('Artist deleted');
+View::show_header('Artist deleted');
 
 $DB->query('SELECT Name FROM artists_group WHERE ArtistID='.$ArtistID);
 list($Name) = $DB->next_record();
@@ -76,9 +76,9 @@
 }
 
 if($Count == 0) {
-	delete_artist($ArtistID);
+	Artists::delete_artist($ArtistID);
 ?>
 	<div class="thin">Artist deleted!</div>
 <?
 }
-show_footer();?>
+View::show_footer();?>
diff --git a/sections/artist/delete_alias.php b/sections/artist/delete_alias.php
index 6109bb5f..21655132 100644
--- a/sections/artist/delete_alias.php
+++ b/sections/artist/delete_alias.php
@@ -32,6 +32,6 @@
 $DB->query("DELETE FROM artists_alias WHERE AliasID='$AliasID'");
 $DB->query("UPDATE artists_alias SET Redirect='0' WHERE Redirect='$AliasID'");
 
-write_log("The alias ".$AliasID." (".$AliasName.") was removed from the artist ".$ArtistID." (".$ArtistName.") by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].")");
+Misc::write_log("The alias ".$AliasID." (".$AliasName.") was removed from the artist ".$ArtistID." (".$ArtistName.") by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].")");
 
 header('Location: '.$_SERVER['HTTP_REFERER']);
diff --git a/sections/artist/download.php b/sections/artist/download.php
index 9734e1b0..70226cf1 100644
--- a/sections/artist/download.php
+++ b/sections/artist/download.php
@@ -126,7 +126,7 @@
 
 $DB->query($SQL);
 $Downloads = $DB->to_array('1',MYSQLI_NUM,false);
-$Artists = get_artists($GroupIDs, false);
+$Artists = Artists::get_artists($GroupIDs, false);
 $Skips = array();
 $TotalSize = 0;
 if(count($Downloads)) {
@@ -139,10 +139,10 @@
 
 require(SERVER_ROOT.'/classes/class_torrent.php');
 require(SERVER_ROOT.'/classes/class_zip.php');
-$Zip = new ZIP(file_string($ArtistName));
+$Zip = new ZIP(Misc::file_string($ArtistName));
 foreach($Downloads as $Download) {
 	list($Rank, $GroupID, $TorrentID, $Media, $Format, $Encoding, $ReleaseType, $Year, $Album, $Size) = $Download;
-	$Artist = display_artists($Artists[$GroupID],false,true,false);
+	$Artist = Artists::display_artists($Artists[$GroupID],false,true,false);
 	if ($Rank == 100) {
 		$Skips[] = $Artist.$Album.' '.$Year;
 		continue;
@@ -163,22 +163,22 @@
 	// We need this section for long file names :/
 	$TorrentName='';
 	$TorrentInfo='';
-	$TorrentName = file_string($Artist.$Album);
-	if ($Year   >   0) { $TorrentName.=' - '.file_string($Year); }
-	if ($Media  != '') { $TorrentInfo .= file_string($Media); }
+	$TorrentName = Misc::file_string($Artist.$Album);
+	if ($Year   >   0) { $TorrentName.=' - '.Misc::file_string($Year); }
+	if ($Media  != '') { $TorrentInfo .= Misc::file_string($Media); }
 	if ($Format != '') {
 		if ($TorrentInfo!='') { $TorrentInfo .= ' - '; }
-		$TorrentInfo .= file_string($Format);
+		$TorrentInfo .= Misc::file_string($Format);
 	}
 	if ($Encoding!='') {
 		if ($TorrentInfo != '') { $TorrentInfo.=' - '; }
-		$TorrentInfo .= file_string($Encoding);
+		$TorrentInfo .= Misc::file_string($Encoding);
 	}
 	if ($TorrentInfo != '') { $TorrentInfo = " ($TorrentInfo)"; }
 	if (strlen($TorrentName) + strlen($TorrentInfo) + 3 > 200) {
-		$TorrentName = file_string($Album).(($Year>0)?(' - '.file_string($Year)):'');
+		$TorrentName = Misc::file_string($Album).(($Year>0)?(' - '.Misc::file_string($Year)):'');
 	}
-	$FileName = cut_string($TorrentName.$TorrentInfo, 180, true, false);
+	$FileName = Format::cut_string($TorrentName.$TorrentInfo, 180, true, false);
 	
 	$Zip->add_file($Tor->enc(), $ReleaseTypeName.'/'.$FileName.'.torrent');
 }
@@ -186,9 +186,9 @@
 $Skipped = count($Skips);
 $Downloaded = $Analyzed - $Skipped;
 $Time = number_format(((microtime(true)-$ScriptStartTime)*1000),5).' ms';
-$Used = get_size(memory_get_usage(true));
+$Used = Format::get_size(memory_get_usage(true));
 $Date = date('M d Y, H:i');
-$Zip->add_file('Collector Download Summary - '.SITE_NAME."\r\n\r\nUser:\t\t$LoggedUser[Username]\r\nPasskey:\t$LoggedUser[torrent_pass]\r\n\r\nTime:\t\t$Time\r\nUsed:\t\t$Used\r\nDate:\t\t$Date\r\n\r\nTorrents Analyzed:\t\t$Analyzed\r\nTorrents Filtered:\t\t$Skipped\r\nTorrents Downloaded:\t$Downloaded\r\n\r\nTotal Size of Torrents (Ratio Hit): ".get_size($TotalSize)."\r\n\r\nAlbums Unavailable within your criteria (consider making a request for your desired format):\r\n".implode("\r\n",$Skips), 'Summary.txt');
+$Zip->add_file('Collector Download Summary - '.SITE_NAME."\r\n\r\nUser:\t\t$LoggedUser[Username]\r\nPasskey:\t$LoggedUser[torrent_pass]\r\n\r\nTime:\t\t$Time\r\nUsed:\t\t$Used\r\nDate:\t\t$Date\r\n\r\nTorrents Analyzed:\t\t$Analyzed\r\nTorrents Filtered:\t\t$Skipped\r\nTorrents Downloaded:\t$Downloaded\r\n\r\nTotal Size of Torrents (Ratio Hit): ".Format::get_size($TotalSize)."\r\n\r\nAlbums Unavailable within your criteria (consider making a request for your desired format):\r\n".implode("\r\n",$Skips), 'Summary.txt');
 $Settings = array(implode(':',$_REQUEST['list']),$_REQUEST['preference']);
 $Zip->close_stream();
 
diff --git a/sections/artist/edit.php b/sections/artist/edit.php
index 35b0afc5..80a8c048 100644
--- a/sections/artist/edit.php
+++ b/sections/artist/edit.php
@@ -30,7 +30,7 @@
 list($Name, $Image, $Body, $VanityHouse) = $DB->next_record(MYSQLI_NUM, true);
 
 // Start printing form
-show_header('Edit artist');
+View::show_header('Edit artist');
 ?>
 <div class="thin">
 	<div class="header">
@@ -122,4 +122,4 @@
 	</div>
 <? } ?> 
 </div>
-<? show_footer() ?>
\ No newline at end of file
+<? View::show_footer() ?>
\ No newline at end of file
diff --git a/sections/artist/history.php b/sections/artist/history.php
index 3ff9e710..6d16bb6c 100644
--- a/sections/artist/history.php
+++ b/sections/artist/history.php
@@ -21,7 +21,7 @@
 $DB->query("SELECT Name FROM artists_group WHERE ArtistID='$ArtistID'");
 list($Name) = $DB->next_record(MYSQLI_NUM, true);
 
-show_header("Revision history for ".$Name); // Set title
+View::show_header("Revision history for ".$Name); // Set title
 
 // Start printing form
 ?>
@@ -34,5 +34,5 @@
 ?>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/artist/rename.php b/sections/artist/rename.php
index 4daa4853..1532faba 100644
--- a/sections/artist/rename.php
+++ b/sections/artist/rename.php
@@ -23,7 +23,7 @@
 authorize();
 
 $ArtistID = $_POST['artistid'];
-$NewName = normalise_artist_name($_POST['name']);
+$NewName = Artists::normalise_artist_name($_POST['name']);
 
 if(!$ArtistID || !is_number($ArtistID)) { error(404); }
 
@@ -56,7 +56,7 @@
 	if(!empty($Groups)) {
 		foreach($Groups as $GroupID) {
 			$Cache->delete_value('groups_artists_'.$GroupID); // Delete group artist cache
-			update_hash($GroupID);
+			Torrents::update_hash($GroupID);
 		}
 	}
 
@@ -67,7 +67,7 @@
 	if(!empty($Requests)) {
 		foreach($Requests as $RequestID) {
 			$Cache->delete_value('request_artists_'.$RequestID); // Delete group artist cache
-			update_sphinx_requests($RequestID);
+			Requests::update_sphinx_requests($RequestID);
 		}
 	}
 	$TargetArtistID = $ArtistID;
@@ -89,7 +89,7 @@
 	if(!empty($Groups)) {
 		foreach($Groups as $GroupID) {
 			$Cache->delete_value('groups_artists_'.$GroupID);
-			update_hash($GroupID);
+			Torrents::update_hash($GroupID);
 		}
 	}
 
@@ -100,7 +100,7 @@
 	if(!empty($Requests)) {
 		foreach($Requests as $RequestID) {
 			$Cache->delete_value('request_artists_'.$RequestID);
-			update_sphinx_requests($RequestID);
+			Requests::update_sphinx_requests($RequestID);
 		}
 	}
 
@@ -112,7 +112,7 @@
 		if(!empty($Groups)) {
 			foreach($Groups as $GroupID) {
 				$Cache->delete_value('groups_artists_'.$GroupID);
-				update_hash($GroupID);
+				Torrents::update_hash($GroupID);
 			}
 		}
 
@@ -123,7 +123,7 @@
 		if(!empty($Requests)) {
 			foreach($Requests as $RequestID) {
 				$Cache->delete_value('request_artists_'.$RequestID);
-				update_sphinx_requests($RequestID);
+				Requests::update_sphinx_requests($RequestID);
 			}
 		}
 	}
diff --git a/sections/better/better.php b/sections/better/better.php
index 6cad4848..27a93cf7 100644
--- a/sections/better/better.php
+++ b/sections/better/better.php
@@ -1,6 +1,6 @@
 <?
 //Include the header
-show_header('Better');
+View::show_header('Better');
 ?>
 <div class="thin">
 	<h3 id="general">Pursuit of Perfection</h3>
@@ -98,4 +98,4 @@
 		</table>
 	</div>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/better/files.php b/sections/better/files.php
index d1991ba5..27af98c4 100644
--- a/sections/better/files.php
+++ b/sections/better/files.php
@@ -16,13 +16,13 @@
 	$All = false;
 }
 
-show_header('Torrents with bad file names');
+View::show_header('Torrents with bad file names');
 $DB->query("SELECT tfi.TorrentID, t.GroupID FROM torrents_bad_files AS tfi JOIN torrents AS t ON t.ID = tfi.TorrentID ".$Join." ORDER BY tfi.TimeAdded ASC");
 $TorrentsInfo = $DB->to_array('TorrentID', MYSQLI_ASSOC);
 foreach($TorrentsInfo as $Torrent) {
 	$GroupIDs[] = $Torrent['GroupID'];
 }
-$Results = get_groups($GroupIDs);
+$Results = Torrents::get_groups($GroupIDs);
 $Results = $Results['matches'];
 ?>
 <div class="header">
@@ -49,13 +49,13 @@
 
 	$DisplayName = '';
 	if(count($Artists)>0) {
-		$DisplayName = display_artists(array('1'=>$Artists));
+		$DisplayName = Artists::display_artists(array('1'=>$Artists));
 	}
 	$DisplayName.='<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
 	if($GroupYear>0) { $DisplayName.=" [".$GroupYear."]"; }
 	if($ReleaseType>0) { $DisplayName.=" [".$ReleaseTypes[$ReleaseType]."]"; }
 	
-	$ExtraInfo = torrent_info($Torrents[$TorrentID]);
+	$ExtraInfo = Torrents::torrent_info($Torrents[$TorrentID]);
 	if($ExtraInfo) {
 		$DisplayName.=' - '.$ExtraInfo;
 	}
@@ -85,5 +85,5 @@
 	</table>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/better/folders.php b/sections/better/folders.php
index af54f581..1df566aa 100644
--- a/sections/better/folders.php
+++ b/sections/better/folders.php
@@ -16,13 +16,13 @@
 	$All = false;
 }
 
-show_header('Torrents with bad folder names');
+View::show_header('Torrents with bad folder names');
 $DB->query("SELECT tbf.TorrentID, t.GroupID FROM torrents_bad_folders AS tbf JOIN torrents AS t ON t.ID = tbf.TorrentID ".$Join." ORDER BY tbf.TimeAdded ASC");
 $TorrentsInfo = $DB->to_array('TorrentID', MYSQLI_ASSOC);
 foreach($TorrentsInfo as $Torrent) {
 	$GroupIDs[] = $Torrent['GroupID'];
 }
-$Results = get_groups($GroupIDs);
+$Results = Torrents::get_groups($GroupIDs);
 $Results = $Results['matches'];
 ?>
 <div class="header">
@@ -50,14 +50,14 @@
 
 	$DisplayName = '';
 	if(count($Artists)>0) {
-		$DisplayName = display_artists(array('1'=>$Artists));
+		$DisplayName = Artists::display_artists(array('1'=>$Artists));
 	}
 	$DisplayName.='<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
 	if($GroupYear>0) {
 		$DisplayName.=" [".$GroupYear."]";
 	}
 	if($ReleaseType>0) { $DisplayName.=" [".$ReleaseTypes[$ReleaseType]."]"; }
-	$ExtraInfo = torrent_info($Torrents[$TorrentID]);
+	$ExtraInfo = Torrents::torrent_info($Torrents[$TorrentID]);
 	if($ExtraInfo) {
 		$DisplayName.=' - '.$ExtraInfo;
 	}
@@ -87,5 +87,5 @@
 	</table>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/better/single.php b/sections/better/single.php
index 1fbc47dc..5e2acce7 100644
--- a/sections/better/single.php
+++ b/sections/better/single.php
@@ -13,9 +13,9 @@
 	$Cache->cache_value('better_single_groupids', $GroupIDs, 30*60);
 }
 
-$Results = get_groups(array_keys($GroupIDs));
+$Results = Torrents::get_groups(array_keys($GroupIDs));
 
-show_header('Single seeder FLACs');
+View::show_header('Single seeder FLACs');
 ?>
 <div class="thin">
 	<table width="100%" class="torrent_table">
@@ -30,7 +30,7 @@
 	
 	$DisplayName = '';
 	if(count($Artists)>0) {
-		$DisplayName = display_artists(array('1'=>$Artists));
+		$DisplayName = Artists::display_artists(array('1'=>$Artists));
 	}
 	$DisplayName.='<a href="torrents.php?id='.$GroupID.'&amp;torrentid='.$FlacID.'" title="View Torrent">'.$GroupName.'</a>';
 	if($GroupYear>0) { $DisplayName.=" [".$GroupYear."]"; }
@@ -59,5 +59,5 @@
 	</table>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/better/snatch.php b/sections/better/snatch.php
index 6b70cd30..17a72a8c 100644
--- a/sections/better/snatch.php
+++ b/sections/better/snatch.php
@@ -49,9 +49,9 @@
 
 if(count($GroupIDs) == 0) { error('No results found'); }
 
-$Results = get_groups($GroupIDs);
+$Results = Torrents::get_groups($GroupIDs);
 
-show_header('Transcode Snatches');
+View::show_header('Transcode Snatches');
 ?>
 <div class="linkbox">
 <? if($SeedingOnly) { ?>
@@ -76,7 +76,7 @@
 	
 	$DisplayName = '';
 	if(count($Artists)>0) {
-		$DisplayName = display_artists(array('1'=>$Artists));
+		$DisplayName = Artists::display_artists(array('1'=>$Artists));
 	}
 	$DisplayName.='<a href="torrents.php?id='.$GroupID.'&amp;torrentid='.$FlacID.'" title="View Torrent">'.$GroupName.'</a>';
 	if($GroupYear>0) { $DisplayName.=" [".$GroupYear."]"; }
@@ -116,5 +116,5 @@
 	</table>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/better/tags.php b/sections/better/tags.php
index 844e8ccd..86136a28 100644
--- a/sections/better/tags.php
+++ b/sections/better/tags.php
@@ -16,13 +16,13 @@
 	$All = false;
 }
 
-show_header('Torrents with bad tags');
+View::show_header('Torrents with bad tags');
 $DB->query("SELECT tbt.TorrentID, t.GroupID FROM torrents_bad_tags AS tbt JOIN torrents AS t ON t.ID = tbt.TorrentID ".$Join." ORDER BY tbt.TimeAdded ASC");
 $TorrentsInfo = $DB->to_array('TorrentID', MYSQLI_ASSOC);
 foreach($TorrentsInfo as $Torrent) {
 	$GroupIDs[] = $Torrent['GroupID'];
 }
-$Results = get_groups($GroupIDs);
+$Results = Torrents::get_groups($GroupIDs);
 $Results = $Results['matches'];
 ?>
 <div class="header">
@@ -49,14 +49,14 @@
 	list($GroupID, $GroupName, $GroupYear, $GroupRecordLabel, $GroupCatalogueNumber, $TorrentTags, $ReleaseType, $GroupVanityHouse, $Torrents, $Artists) = array_values($Results[$Info['GroupID']]);
 	$DisplayName = '';
 	if(count($Artists)>0) {
-		$DisplayName = display_artists(array('1'=>$Artists));
+		$DisplayName = Artists::display_artists(array('1'=>$Artists));
 	}
 	$DisplayName.='<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
 	if($GroupYear>0) {
 		$DisplayName.=" [".$GroupYear."]";
 	}
 	if($ReleaseType>0) { $DisplayName.=" [".$ReleaseTypes[$ReleaseType]."]"; }
-	$ExtraInfo = torrent_info($Torrents[$TorrentID]);
+	$ExtraInfo = Torrents::torrent_info($Torrents[$TorrentID]);
 	if($ExtraInfo) {
 		$DisplayName.=' - '.$ExtraInfo;
 	}
@@ -86,5 +86,5 @@
 	</table>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/better/transcode.php b/sections/better/transcode.php
index 8196e19f..62e692b7 100644
--- a/sections/better/transcode.php
+++ b/sections/better/transcode.php
@@ -33,7 +33,7 @@
 // If some were fetched from memcached, get their artists
 if(!empty($Results['matches'])) { // Fetch the artists for groups
 	$GroupIDs = array_keys($Results['matches']);
-	$Artists = get_artists($GroupIDs);
+	$Artists = Artists::get_artists($GroupIDs);
 	foreach($Artists as $GroupID=>$Data) {
 		if(!empty($Data[1])) {
 			$Results['matches'][$GroupID]['Artists']=$Data[1]; // Only use main artists
@@ -44,7 +44,7 @@
 */
  // These ones were not found in the cache, run SQL
 if(!empty($Results['notfound'])) {
-	$SQLResults = get_groups($Results['notfound']);
+	$SQLResults = Torrents::get_groups($Results['notfound']);
 	
 	if(is_array($SQLResults['notfound'])) { // Something wasn't found in the db, remove it from results
 		reset($SQLResults['notfound']);
@@ -64,7 +64,7 @@
 $Results = $Results['matches'];
 
 
-show_header('Transcode Search');
+View::show_header('Transcode Search');
 ?>
 <br />
 <div class="thin">
@@ -96,7 +96,7 @@
 	
 	$DisplayName = '';
 	if(count($Artists)>0) {
-		$DisplayName = display_artists(array('1'=>$Artists));
+		$DisplayName = Artists::display_artists(array('1'=>$Artists));
 	}
 	$DisplayName.='<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
 	if($GroupYear>0) { $DisplayName.=" [".$GroupYear."]"; }
@@ -142,5 +142,5 @@
 	</table>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/better/upload.php b/sections/better/upload.php
index d5debc57..a5e102a9 100644
--- a/sections/better/upload.php
+++ b/sections/better/upload.php
@@ -43,9 +43,9 @@
 
 if(count($GroupIDs) == 0) { error('No results found'); }
 
-$Results = get_groups($GroupIDs);
+$Results = Torrents::get_groups($GroupIDs);
 
-show_header('Transcode Uploads');
+View::show_header('Transcode Uploads');
 ?>
 <div class="thin">
 	<table width="100%" class="torrent_table">
@@ -63,7 +63,7 @@
 	
 	$DisplayName = '';
 	if(count($Artists)>0) {
-		$DisplayName = display_artists(array('1'=>$Artists));
+		$DisplayName = Artists::display_artists(array('1'=>$Artists));
 	}
 	$DisplayName.='<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
 	if($GroupYear>0) { $DisplayName.=" [".$GroupYear."]"; }
@@ -103,5 +103,5 @@
 	</table>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/blog/index.php b/sections/blog/index.php
index eff79182..63e40c74 100644
--- a/sections/blog/index.php
+++ b/sections/blog/index.php
@@ -2,7 +2,7 @@
 enforce_login();
 
 define('ANNOUNCEMENT_FORUM_ID', 19);
-show_header('Blog','bbcode');
+View::show_header('Blog','bbcode');
 require(SERVER_ROOT.'/classes/class_text.php');
 $Text = new TEXT;
 
@@ -55,7 +55,7 @@
 						header('Location: blog.php');
 					} 
 				} else {
-					$ThreadID = create_thread(ANNOUNCEMENT_FORUM_ID, $LoggedUser[ID], $Title, $Body);
+					$ThreadID = Misc::create_thread(ANNOUNCEMENT_FORUM_ID, $LoggedUser[ID], $Title, $Body);
 					if($ThreadID < 1) {
 						error(0);
 					}
@@ -169,5 +169,5 @@
 ?>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/bookmarks/add.php b/sections/bookmarks/add.php
index 8ecd6b29..8555b291 100644
--- a/sections/bookmarks/add.php
+++ b/sections/bookmarks/add.php
@@ -46,7 +46,7 @@
 			if ($Freeleech == "1") { $Title .= " / Freeleech!"; }
 			if ($Freeleech == "2") { $Title .= " / Neutral leech!"; }
 	
-			$UploaderInfo = user_info($UploaderID);
+			$UploaderInfo = Users::user_info($UploaderID);
 			$Item = $Feed->item($Title, 
 								$Text->strip_bbcode($Body),
 								'torrents.php?action=download&amp;authkey=[[AUTHKEY]]&amp;torrent_pass=[[PASSKEY]]&amp;id='.$TorrentID,
diff --git a/sections/bookmarks/artists.php b/sections/bookmarks/artists.php
index 91c561f6..25300978 100644
--- a/sections/bookmarks/artists.php
+++ b/sections/bookmarks/artists.php
@@ -27,7 +27,7 @@
 
 $Title = ($Sneaky)?"$Username's bookmarked artists":'Your bookmarked artists';
 
-show_header($Title,'browse');
+View::show_header($Title,'browse');
 
 ?>
 <div class="thin">
@@ -46,7 +46,7 @@
 	</div>
 </div><!--content-->
 <?
-	show_footer();
+	View::show_footer();
 	die();
 } ?>
 	<table width="100%" class="artist_table">
@@ -92,6 +92,6 @@
 	</div>
 </div>
 <?
-show_footer();
+View::show_footer();
 $Cache->cache_value('bookmarks_'.$UserID, serialize(array(array($Username, $TorrentList, $CollageDataList))), 3600);
 ?>
diff --git a/sections/bookmarks/torrents.php b/sections/bookmarks/torrents.php
index f86c1f1e..d1658a1c 100644
--- a/sections/bookmarks/torrents.php
+++ b/sections/bookmarks/torrents.php
@@ -43,7 +43,7 @@ function compare($X, $Y){
 	$GroupIDs = $DB->collect('GroupID');
 	$CollageDataList=$DB->to_array('GroupID', MYSQLI_ASSOC);
 	if(count($GroupIDs)>0) {
-		$TorrentList = get_groups($GroupIDs);
+		$TorrentList = Torrents::get_groups($GroupIDs);
 		$TorrentList = $TorrentList['matches'];
 	} else {
 		$TorrentList = array();
@@ -103,9 +103,9 @@ function compare($X, $Y){
 	if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
 			unset($ExtendedArtists[2]);
 			unset($ExtendedArtists[3]);
-			$DisplayName = display_artists($ExtendedArtists);
+			$DisplayName = Artists::display_artists($ExtendedArtists);
 	} elseif(count($GroupArtists)>0) {
-			$DisplayName = display_artists(array('1'=>$GroupArtists));
+			$DisplayName = Artists::display_artists(array('1'=>$GroupArtists));
 	} else {
 		$DisplayName = '';
 	}
@@ -210,9 +210,9 @@ function compare($X, $Y){
 <?			} ?>
 			| <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" title="Report">RP</a> ]
 			</span>
-			&nbsp;&nbsp;&raquo;&nbsp; <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=torrent_info($Torrent)?></a>
+			&nbsp;&nbsp;&raquo;&nbsp; <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=Torrents::torrent_info($Torrent)?></a>
 		</td>
-		<td class="nobr"><?=get_size($Torrent['Size'])?></td>
+		<td class="nobr"><?=Format::get_size($Torrent['Size'])?></td>
 		<td><?=number_format($Torrent['Snatched'])?></td>
 		<td<?=($Torrent['Seeders']==0)?' class="r00"':''?>><?=number_format($Torrent['Seeders'])?></td>
 		<td><?=number_format($Torrent['Leechers'])?></td>
@@ -255,7 +255,7 @@ function compare($X, $Y){
 			<span style="float:right;"><?=time_diff($AddedTime);?></span>
 
 		</td>
-		<td class="nobr"><?=get_size($Torrent['Size'])?></td>
+		<td class="nobr"><?=Format::get_size($Torrent['Size'])?></td>
 		<td><?=number_format($Torrent['Snatched'])?></td>
 		<td<?=($Torrent['Seeders']==0)?' class="r00"':''?>><?=number_format($Torrent['Seeders'])?></td>
 		<td><?=number_format($Torrent['Leechers'])?></td>
@@ -272,9 +272,9 @@ function compare($X, $Y){
 	if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5])|| !empty($ExtendedArtists[6])) {
 		unset($ExtendedArtists[2]);
 		unset($ExtendedArtists[3]);
-		$DisplayName .= display_artists($ExtendedArtists, false);
+		$DisplayName .= Artists::display_artists($ExtendedArtists, false);
 	} elseif(count($GroupArtists)>0) {
-		$DisplayName .= display_artists(array('1'=>$GroupArtists), false);
+		$DisplayName .= Artists::display_artists(array('1'=>$GroupArtists), false);
 	}
 	$DisplayName .= $GroupName;
 	if($GroupYear>0) { $DisplayName = $DisplayName. ' ['. $GroupYear .']';}
@@ -308,7 +308,7 @@ function compare($X, $Y){
 	$CollagePages[] = $CollagePage;
 }
 
-show_header($Title, 'browse,collage');
+View::show_header($Title, 'browse,collage');
 ?>
 <div class="thin">
 	<div class="header">
@@ -330,7 +330,7 @@ function compare($X, $Y){
 	</div>
 </div><!--content-->
 <?
-	show_footer();
+	View::show_footer();
 	die();
 } ?>
 	<div class="sidebar">
@@ -423,6 +423,6 @@ function compare($X, $Y){
 	</div>
 </div>
 <?
-show_footer();
+View::show_footer();
 $Cache->cache_value('bookmarks_torrent_'.$UserID.'_full', serialize(array(array($TorrentList, $CollageDataList))), 3600);
 ?>
diff --git a/sections/chat/index.php b/sections/chat/index.php
index 47588fb2..25693756 100644
--- a/sections/chat/index.php
+++ b/sections/chat/index.php
@@ -1,6 +1,6 @@
 <?
 enforce_login();
-show_header('IRC');
+View::show_header('IRC');
 
 $DB->query("SELECT IRCKey FROM users_main WHERE ID = $LoggedUser[ID]");
 list($IRCKey) = $DB->next_record();
@@ -89,5 +89,5 @@
 	}
 }
 
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/collages/all_comments.php b/sections/collages/all_comments.php
index 84b87a11..9e3a5387 100644
--- a/sections/collages/all_comments.php
+++ b/sections/collages/all_comments.php
@@ -19,7 +19,7 @@
 	error(0);
 }
 
-list($Page,$Limit) = page_limit(POSTS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(POSTS_PER_PAGE);
 
 //Get the cache catalogue
 $CatalogueID = floor((POSTS_PER_PAGE*$Page-POSTS_PER_PAGE)/THREAD_CATALOGUE);
@@ -50,7 +50,7 @@
 list($Name) = $DB->next_record();
 
 // Start printing
-show_header('Comments for collage '.$Name, 'comments,bbcode');
+View::show_header('Comments for collage '.$Name, 'comments,bbcode');
 ?>
 <div class="thin">
 	<div class="header">
@@ -60,7 +60,7 @@
 		</h2>
 		<div class="linkbox">
 <?
-$Pages=get_pages($Page,$Posts,POSTS_PER_PAGE,9);
+$Pages=Format::get_pages($Page,$Posts,POSTS_PER_PAGE,9);
 echo $Pages;
 ?>
 		</div>
@@ -70,13 +70,13 @@
 //---------- Begin printing
 foreach($Thread as $Post){
 	list($PostID, $AuthorID, $AddedTime, $Body) = $Post;
-	list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(user_info($AuthorID));
+	list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(Users::user_info($AuthorID));
 ?>
 <table class="forum_post box vertical_margin<?=$HeavyInfo['DisableAvatars'] ? ' noavatar' : ''?>" id="post<?=$PostID?>">
 	<tr class="colhead_dark">
 		<td colspan="2">
 			<span style="float:left;"><a href='#post<?=$PostID?>'>#<?=$PostID?></a>
-				by <?=format_username($AuthorID, true, true, true, true, true)?> <?=time_diff($AddedTime)?> <a href="reports.php?action=report&amp;type=collages_comment&amp;id=<?=$PostID?>">[Report Comment]</a>
+				by <?=Users::format_username($AuthorID, true, true, true, true, true)?> <?=time_diff($AddedTime)?> <a href="reports.php?action=report&amp;type=collages_comment&amp;id=<?=$PostID?>">[Report Comment]</a>
 <? if (!$ThreadInfo['IsLocked']){ ?>				- <a href="#quickpost" onclick="Quote('<?=$PostID?>','<?=$Username?>');">[Quote]</a><? }
 if ($AuthorID == $LoggedUser['ID'] || check_perms('site_moderate_forums')){ ?>				- <a href="#post<?=$PostID?>" onclick="Edit_Form('<?=$PostID?>');">[Edit]</a><? }
 if (check_perms('site_moderate_forums')){ ?>				- <a href="#post<?=$PostID?>" onclick="Delete('<?=$PostID?>');">[Delete]</a> <? } ?>
@@ -130,4 +130,4 @@
 		<?=$Pages?>
 	</div>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/collages/browse.php b/sections/collages/browse.php
index 491b8608..c834ad6c 100644
--- a/sections/collages/browse.php
+++ b/sections/collages/browse.php
@@ -4,7 +4,7 @@
 include(SERVER_ROOT.'/classes/class_text.php'); // Text formatting class
 $Text = new TEXT;
 
-list($Page,$Limit) = page_limit(COLLAGES_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(COLLAGES_PER_PAGE);
 
 
 $OrderVals = array('Time', 'Name', 'Torrents');
@@ -32,7 +32,7 @@
 if(!empty($_GET['tags'])) {
 	$Tags = explode(',',db_string(trim($_GET['tags'])));
 	foreach($Tags as $ID=>$Tag) {
-		$Tags[$ID] = sanitize_tag($Tag);
+		$Tags[$ID] = Misc::sanitize_tag($Tag);
 	}
 }
 
@@ -102,8 +102,8 @@
 	if(!is_number($UserID)) {
 		error(404);
 	}
-	$User = user_info($UserID);
-	$Perms = get_permissions($User['PermissionID']);
+	$User = Users::user_info($UserID);
+	$Perms = Permissions::get_permissions($User['PermissionID']);
 	$UserClass = $Perms['Class'];
 
 	$UserLink = '<a href="user.php?id='.$UserID.'">'.$User['Username'].'</a>';
@@ -138,7 +138,7 @@
 $DB->query("SELECT FOUND_ROWS()");
 list($NumResults) = $DB->next_record();
 
-show_header(($BookmarkView)?'Your bookmarked collages':'Browse collages');
+View::show_header(($BookmarkView)?'Your bookmarked collages':'Browse collages');
 ?>
 <div class="thin">
 	<div class="header">
@@ -247,7 +247,7 @@
 <? } ?>
 <br /><br />
 <?
-$Pages=get_pages($Page,$NumResults,COLLAGES_PER_PAGE,9);
+$Pages=Format::get_pages($Page,$NumResults,COLLAGES_PER_PAGE,9);
 echo $Pages;
 ?>
 	</div>
@@ -261,7 +261,7 @@
 <?	} ?>
 </div><!--box-->
 </div><!--content-->
-<? show_footer(); die();
+<? View::show_footer(); die();
 } ?>
 <table width="100%" class="collage_table">
 	<tr class="colhead">
@@ -304,12 +304,12 @@
 <? } ?>
 		</td>
 		<td><?=(int)$NumTorrents?></td>
-		<td><?=format_username($UserID, false, false, false)?></td>
+		<td><?=Users::format_username($UserID, false, false, false)?></td>
 	</tr>
 <? } ?>
 </table>
 	<div class="linkbox"><?=$Pages?></div>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/collages/collage.php b/sections/collages/collage.php
index 10253a00..ee3596d1 100644
--- a/sections/collages/collage.php
+++ b/sections/collages/collage.php
@@ -83,7 +83,7 @@ function compare($X, $Y){
 	$GroupIDs = $DB->collect('GroupID');
 	$CollageDataList=$DB->to_array('GroupID', MYSQLI_ASSOC);
 	if(count($GroupIDs)>0) {
-		$TorrentList = get_groups($GroupIDs);
+		$TorrentList = Torrents::get_groups($GroupIDs);
 		$TorrentList = $TorrentList['matches'];
 	} else {
 		$TorrentList = array();
@@ -157,9 +157,9 @@ function compare($X, $Y){
 	if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5])|| !empty($ExtendedArtists[6])) {
 			unset($ExtendedArtists[2]);
 			unset($ExtendedArtists[3]);
-			$DisplayName .= display_artists($ExtendedArtists);
+			$DisplayName .= Artists::display_artists($ExtendedArtists);
 	} elseif(count($GroupArtists)>0) {
-			$DisplayName .= display_artists(array('1'=>$GroupArtists));
+			$DisplayName .= Artists::display_artists(array('1'=>$GroupArtists));
 	}
 	
 	$DisplayName .= '<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
@@ -255,9 +255,9 @@ function compare($X, $Y){
 <?			} ?>
 				| <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" title="Report">RP</a> ]
 			</span>
-			&nbsp;&nbsp;&raquo;&nbsp; <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=torrent_info($Torrent)?></a>
+			&nbsp;&nbsp;&raquo;&nbsp; <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=Torrents::torrent_info($Torrent)?></a>
 		</td>
-		<td class="nobr"><?=get_size($Torrent['Size'])?></td>
+		<td class="nobr"><?=Format::get_size($Torrent['Size'])?></td>
 		<td><?=number_format($Torrent['Snatched'])?></td>
 		<td<?=($Torrent['Seeders']==0)?' class="r00"':''?>><?=number_format($Torrent['Seeders'])?></td>
 		<td><?=number_format($Torrent['Leechers'])?></td>
@@ -295,7 +295,7 @@ function compare($X, $Y){
 			<strong><?=$DisplayName?></strong>
 			<?=$TorrentTags?>
 		</td>
-		<td class="nobr"><?=get_size($Torrent['Size'])?></td>
+		<td class="nobr"><?=Format::get_size($Torrent['Size'])?></td>
 		<td><?=number_format($Torrent['Snatched'])?></td>
 		<td<?=($Torrent['Seeders']==0)?' class="r00"':''?>><?=number_format($Torrent['Seeders'])?></td>
 		<td><?=number_format($Torrent['Leechers'])?></td>
@@ -312,9 +312,9 @@ function compare($X, $Y){
 	if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5])|| !empty($ExtendedArtists[6])) {
 		unset($ExtendedArtists[2]);
 		unset($ExtendedArtists[3]);
-		$DisplayName .= display_artists($ExtendedArtists, false);
+		$DisplayName .= Artists::display_artists($ExtendedArtists, false);
 	} elseif(count($GroupArtists)>0) {
-		$DisplayName .= display_artists(array('1'=>$GroupArtists), false);
+		$DisplayName .= Artists::display_artists(array('1'=>$GroupArtists), false);
 	}
 	$DisplayName .= $GroupName;
 	if($GroupYear>0) { $DisplayName = $DisplayName. ' ['. $GroupYear .']';}
@@ -361,7 +361,7 @@ function compare($X, $Y){
 	$CollagePages[] = $CollagePage;
 }
 
-show_header($Name,'browse,collage,bbcode');
+View::show_header($Name,'browse,collage,bbcode');
 ?>
 <div class="thin">
 	<div class="header">
@@ -521,7 +521,7 @@ function compare($X, $Y){
 	$i++;
 	if($i>5) { break; }
 ?>
-					<li><?=format_username($ID, false, false, false)?> (<?=$User['count']?>)</li>
+					<li><?=Users::format_username($ID, false, false, false)?> (<?=$User['count']?>)</li>
 <?
 }
 ?>
@@ -575,7 +575,7 @@ function compare($X, $Y){
 	list($CommentID, $Body, $UserID, $Username, $CommentTime) = $Comment;
 ?>
 		<div class="box comment">
-			<div class="head">By <?=format_username($UserID, false, false, false) ?> <?=time_diff($CommentTime) ?> <a href="reports.php?action=report&amp;type=collages_comment&amp;id=<?=$CommentID?>">[Report Comment]</a></div>
+			<div class="head">By <?=Users::format_username($UserID, false, false, false) ?> <?=time_diff($CommentTime) ?> <a href="reports.php?action=report&amp;type=collages_comment&amp;id=<?=$CommentID?>">[Report Comment]</a></div>
 			<div class="pad"><?=$Text->full_format($Body)?></div>
 		</div>
 <?
@@ -648,7 +648,7 @@ function compare($X, $Y){
 	</div>
 </div>
 <?
-show_footer();
+View::show_footer();
 
 $Cache->cache_value('collage_'.$CollageID, serialize(array(array($Name, $Description, $CollageDataList, $TorrentList, $CommentList, $Deleted, $CollageCategoryID, $CreatorID, $Locked, $MaxGroups, $MaxGroupsPerUser))), 3600);
 ?>
diff --git a/sections/collages/delete.php b/sections/collages/delete.php
index 950fb8f3..7fc6c54c 100644
--- a/sections/collages/delete.php
+++ b/sections/collages/delete.php
@@ -12,7 +12,7 @@
 	error(403);
 }
 
-show_header('Delete collage');
+View::show_header('Delete collage');
 ?>
 <div class="thin center">
 	<div class="box" style="width:600px; margin:0px auto;">
@@ -32,5 +32,5 @@
 	</div>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/collages/download.php b/sections/collages/download.php
index eea370b2..97ffd3d8 100644
--- a/sections/collages/download.php
+++ b/sections/collages/download.php
@@ -121,7 +121,7 @@
 
 $DB->query($SQL);
 $Downloads = $DB->to_array('1',MYSQLI_NUM,false);
-$Artists = get_artists($DB->collect('GroupID'), false);
+$Artists = Artists::get_artists($DB->collect('GroupID'), false);
 $Skips = array();
 $TotalSize = 0;
 
@@ -135,10 +135,10 @@
 
 require(SERVER_ROOT.'/classes/class_torrent.php');
 require(SERVER_ROOT.'/classes/class_zip.php');
-$Zip = new ZIP(file_string($CollageName));
+$Zip = new ZIP(Misc::file_string($CollageName));
 foreach($Downloads as $Download) {
 	list($Rank, $GroupID, $TorrentID, $Media, $Format, $Encoding, $Year, $Album, $Size) = $Download;
-	$Artist = display_artists($Artists[$GroupID],false,true,false);
+	$Artist = Artists::display_artists($Artists[$GroupID],false,true,false);
 	if ($Rank == 100) {
 		$Skips[] = $Artist.$Album.' '.$Year;
 		continue;
@@ -152,23 +152,23 @@
 	// We need this section for long file names :/
 	$TorrentName='';
 	$TorrentInfo='';
-	$TorrentName = file_string($Artist.$Album);
-	if ($Year   >   0) { $TorrentName.=' - '.file_string($Year); }
-	if ($Media  != '') { $TorrentInfo .= file_string($Media); }
+	$TorrentName = Misc::file_string($Artist.$Album);
+	if ($Year   >   0) { $TorrentName.=' - '.Misc::file_string($Year); }
+	if ($Media  != '') { $TorrentInfo .= Misc::file_string($Media); }
 	if ($Format != '') {
 		if ($TorrentInfo!='') { $TorrentInfo .= ' - '; }
-		$TorrentInfo .= file_string($Format);
+		$TorrentInfo .= Misc::file_string($Format);
 	}
 	if ($Encoding!='') {
 		if ($TorrentInfo != '') { $TorrentInfo.=' - '; }
-		$TorrentInfo .= file_string($Encoding);
+		$TorrentInfo .= Misc::file_string($Encoding);
 	}
 	if ($TorrentInfo != '') { $TorrentInfo = " ($TorrentInfo)"; }
 	if (strlen($TorrentName) + strlen($TorrentInfo) + 3 > 200) {
-		$TorrentName = file_string($Album).(($Year>0)?(' - '.file_string($Year)):'');
+		$TorrentName = Misc::file_string($Album).(($Year>0)?(' - '.Misc::file_string($Year)):'');
 	}
 	$FileName = $TorrentName.$TorrentInfo;
-	$FileName = cut_string($FileName, 192, true, false);
+	$FileName = Format::cut_string($FileName, 192, true, false);
 	
 	$Zip->add_file($Tor->enc(), $FileName.'.torrent');
 }
@@ -176,9 +176,9 @@
 $Skipped = count($Skips);
 $Downloaded = $Analyzed - $Skipped;
 $Time = number_format(((microtime(true)-$ScriptStartTime)*1000),5).' ms';
-$Used = get_size(memory_get_usage(true));
+$Used = Format::get_size(memory_get_usage(true));
 $Date = date('M d Y, H:i');
-$Zip->add_file('Collector Download Summary - '.SITE_NAME."\r\n\r\nUser:\t\t$LoggedUser[Username]\r\nPasskey:\t$LoggedUser[torrent_pass]\r\n\r\nTime:\t\t$Time\r\nUsed:\t\t$Used\r\nDate:\t\t$Date\r\n\r\nTorrents Analyzed:\t\t$Analyzed\r\nTorrents Filtered:\t\t$Skipped\r\nTorrents Downloaded:\t$Downloaded\r\n\r\nTotal Size of Torrents (Ratio Hit): ".get_size($TotalSize)."\r\n\r\nAlbums Unavailable within your criteria (consider making a request for your desired format):\r\n".implode("\r\n",$Skips), 'Summary.txt');
+$Zip->add_file('Collector Download Summary - '.SITE_NAME."\r\n\r\nUser:\t\t$LoggedUser[Username]\r\nPasskey:\t$LoggedUser[torrent_pass]\r\n\r\nTime:\t\t$Time\r\nUsed:\t\t$Used\r\nDate:\t\t$Date\r\n\r\nTorrents Analyzed:\t\t$Analyzed\r\nTorrents Filtered:\t\t$Skipped\r\nTorrents Downloaded:\t$Downloaded\r\n\r\nTotal Size of Torrents (Ratio Hit): ".Format::get_size($TotalSize)."\r\n\r\nAlbums Unavailable within your criteria (consider making a request for your desired format):\r\n".implode("\r\n",$Skips), 'Summary.txt');
 $Settings = array(implode(':',$_REQUEST['list']),$_REQUEST['preference']);
 $Zip->close_stream();
 
diff --git a/sections/collages/edit.php b/sections/collages/edit.php
index 8a53d941..f18ed9e7 100644
--- a/sections/collages/edit.php
+++ b/sections/collages/edit.php
@@ -8,7 +8,7 @@
 
 if($CategoryID == 0 && $UserID!=$LoggedUser['ID'] && !check_perms('site_collages_delete')) { error(403); }
 
-show_header('Edit collage');
+View::show_header('Edit collage');
 ?>
 <div class="thin">
 	<div class="header">
@@ -76,4 +76,4 @@
 		</table>
 	</form>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/collages/edit_handle.php b/sections/collages/edit_handle.php
index d899c43d..27dc2c4a 100644
--- a/sections/collages/edit_handle.php
+++ b/sections/collages/edit_handle.php
@@ -20,7 +20,7 @@
 
 $TagList = explode(',',$_POST['tags']);
 foreach($TagList as $ID=>$Tag) {
-	$TagList[$ID] = sanitize_tag($Tag);
+	$TagList[$ID] = Misc::sanitize_tag($Tag);
 }
 $TagList = implode(' ',$TagList);
 
diff --git a/sections/collages/manage.php b/sections/collages/manage.php
index 2d3611a0..d6258eeb 100644
--- a/sections/collages/manage.php
+++ b/sections/collages/manage.php
@@ -21,13 +21,13 @@
 
 	$CollageDataList=$DB->to_array('GroupID', MYSQLI_ASSOC);
 	if(count($GroupIDs)>0) {
-		$TorrentList = get_groups($GroupIDs);
+		$TorrentList = Torrents::get_groups($GroupIDs);
 		$TorrentList = $TorrentList['matches'];
 	} else {
 		$TorrentList = array();
 	}
 
-	show_header('Manage collage '.$Name);
+	View::show_header('Manage collage '.$Name);
 
 ?>
 
@@ -85,9 +85,9 @@
 		if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
 			unset($ExtendedArtists[2]);
 			unset($ExtendedArtists[3]);
-			$DisplayName .= display_artists($ExtendedArtists, true, false);
+			$DisplayName .= Artists::display_artists($ExtendedArtists, true, false);
 		} elseif(count($GroupArtists)>0) {
-			$DisplayName .= display_artists(array('1'=>$GroupArtists), true, false);
+			$DisplayName .= Artists::display_artists(array('1'=>$GroupArtists), true, false);
 		}
 		$TorrentLink = '<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
 		$GroupYear = $GroupYear > 0 ? $GroupYear : '';
@@ -104,7 +104,7 @@
 							<td><?=$GroupYear?></td>
 							<td><?=$DisplayName?>	</td>
 							<td><?=$TorrentLink?></td>
-							<td class="nobr"><?=format_username($UserID, $Username)?></td>
+							<td class="nobr"><?=Users::format_username($UserID, $Username)?></td>
 							<td class="nobr">
 								<input type="hidden" name="action" value="manage_handle" />
 								<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
@@ -131,4 +131,4 @@
 		</div>
 	</form>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/collages/new.php b/sections/collages/new.php
index e9433f9b..f3c0b2c2 100644
--- a/sections/collages/new.php
+++ b/sections/collages/new.php
@@ -1,5 +1,5 @@
 <?
-show_header('Create a collage');
+View::show_header('Create a collage');
 
 if (!check_perms('site_collages_renamepersonal')) {
 	$ChangeJS = "OnChange=\"if ( this.options[this.selectedIndex].value == '0') { $('#namebox').hide(); $('#personal').show(); } else { $('#namebox').show(); $('#personal').hide(); }\"";
@@ -86,4 +86,4 @@
 		</table>
 	</form>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/collages/new_handle.php b/sections/collages/new_handle.php
index a4e80a1e..d8ce2fb4 100644
--- a/sections/collages/new_handle.php
+++ b/sections/collages/new_handle.php
@@ -66,7 +66,7 @@
 
 $TagList = explode(',',$_POST['tags']);
 foreach($TagList as $ID=>$Tag) {
-	$TagList[$ID] = sanitize_tag($Tag);
+	$TagList[$ID] = Misc::sanitize_tag($Tag);
 }
 $TagList = implode(' ',$TagList);
 
@@ -77,7 +77,7 @@
 
 $CollageID = $DB->inserted_id();
 $Cache->delete_value('collage_'.$CollageID);
-write_log("Collage ".$CollageID." (".$_POST['name'].") was created by ".$LoggedUser['Username']);
+Misc::write_log("Collage ".$CollageID." (".$_POST['name'].") was created by ".$LoggedUser['Username']);
 header('Location: collages.php?id='.$CollageID);
 
 ?>
diff --git a/sections/collages/recover.php b/sections/collages/recover.php
index 478db893..6da6500d 100644
--- a/sections/collages/recover.php
+++ b/sections/collages/recover.php
@@ -13,11 +13,11 @@
 	} else {
 		$DB->query("UPDATE collages SET Deleted = '0' WHERE ID=$CollageID");
 		$Cache->delete_value('collage_'.$CollageID);
-		write_log("Collage ".$CollageID." was recovered by ".$LoggedUser['Username']);
+		Misc::write_log("Collage ".$CollageID." was recovered by ".$LoggedUser['Username']);
 		header("Location: collages.php?id=$CollageID");
 	}
 }
-show_header("Collage recovery!");
+View::show_header("Collage recovery!");
 ?>
 <div class="thin center">
 	<div class="box" style="width:600px; margin:0px auto;">
@@ -35,5 +35,5 @@
 		</div>
 	</div>
 </div>
-<? show_footer();
+<? View::show_footer();
 
diff --git a/sections/collages/take_delete.php b/sections/collages/take_delete.php
index 057b3501..6f5824bd 100644
--- a/sections/collages/take_delete.php
+++ b/sections/collages/take_delete.php
@@ -35,7 +35,7 @@
 	$DB->query("UPDATE collages SET Deleted = '1' WHERE ID='$CollageID'");
 }
 
-write_log("Collage ".$CollageID." (".$Name.") was deleted by ".$LoggedUser['Username'].": ".$Reason);
+Misc::write_log("Collage ".$CollageID." (".$Name.") was deleted by ".$LoggedUser['Username'].": ".$Reason);
 
 $Cache->delete_value('collage_'.$CollageID);
 header('Location: collages.php');
diff --git a/sections/comments/index.php b/sections/comments/index.php
index c17c51ed..f1d4b13e 100644
--- a/sections/comments/index.php
+++ b/sections/comments/index.php
@@ -17,14 +17,14 @@
 	if(!is_number($UserID)) {
 		error(404);
 	}
-	$UserInfo = user_info($UserID);
+	$UserInfo = Users::user_info($UserID);
 	$Username = $UserInfo['Username'];
 	if($LoggedUser['ID'] == $UserID) {
 		$Self = true;
 	} else {
 		$Self = false;
 	}
-	$Perms = get_permissions($UserInfo['PermissionID']);
+	$Perms = Permissions::get_permissions($UserInfo['PermissionID']);
 	$UserClass = $Perms['Class'];
 	if (!check_paranoia('torrentcomments', $UserInfo['Paranoia'], $UserClass, $UserID)) { error(403); }
 } else {
@@ -39,7 +39,7 @@
 	$PerPage = POSTS_PER_PAGE;
 }
 
-list($Page,$Limit) = page_limit($PerPage);
+list($Page,$Limit) = Format::page_limit($PerPage);
 $OtherLink = '';
 
 if($MyTorrents) {
@@ -51,7 +51,7 @@
 else {
 	$Conditions = "WHERE tc.AuthorID = $UserID";
 	$Title = 'Comments made by '.($Self?'you':$Username);
-	$Header = 'Torrent comments left by '.($Self?'you':format_username($UserID, false, false, false)).'';
+	$Header = 'Torrent comments left by '.($Self?'you':Users::format_username($UserID, false, false, false)).'';
 	if($Self) $OtherLink = '<a href="comments.php?action=my_torrents">Display comments left on your uploads</a>';
 }
 
@@ -82,14 +82,14 @@
 
 $DB->query("SELECT FOUND_ROWS()");
 list($Results) = $DB->next_record();
-$Pages=get_pages($Page,$Results,$PerPage, 11);
+$Pages=Format::get_pages($Page,$Results,$PerPage, 11);
 
 $DB->set_query_id($Comments);
 $GroupIDs = $DB->collect('GroupID');
 
-$Artists = get_artists($GroupIDs);
+$Artists = Artists::get_artists($GroupIDs);
 
-show_header($Title,'bbcode');
+View::show_header($Title,'bbcode');
 $DB->set_query_id($Comments);
 
 ?><div class="thin">
@@ -107,14 +107,14 @@
 <?
 
 while(list($UserID, $TorrentID, $GroupID, $Title, $PostID, $Body, $AddedTime, $EditedTime, $EditorID) = $DB->next_record()) {
-	$UserInfo = user_info($UserID);
+	$UserInfo = Users::user_info($UserID);
 	?>
 	<table class="forum_post box vertical_margin<?=$HeavyInfo['DisableAvatars'] ? ' noavatar' : ''?>" id="post<?=$PostID?>">
 		<tr class="colhead_dark">
 			<td  colspan="2">
 				<span style="float:left;"><a href="torrents.php?id=<?=$GroupID?>&amp;postid=<?=$PostID?>#post<?=$PostID?>">#<?=$PostID?></a>
-					by <strong><?=format_username($UserID, true, true, true, true, false)?></strong> <?=time_diff($AddedTime) ?>
-					on <?=display_artists($Artists[$GroupID])?><a href="torrents.php?id=<?=$GroupID?>"><?=$Title?></a>
+					by <strong><?=Users::format_username($UserID, true, true, true, true, false)?></strong> <?=time_diff($AddedTime) ?>
+					on <?=Artists::display_artists($Artists[$GroupID])?><a href="torrents.php?id=<?=$GroupID?>"><?=$Title?></a>
 				</span>
 			</td>
 		</tr>
@@ -144,7 +144,7 @@
 ?>
 				<br /><br />
 				Last edited by
-				<?=format_username($EditorID, false, false, false) ?> <?=time_diff($EditedTime)?>
+				<?=Users::format_username($EditorID, false, false, false) ?> <?=time_diff($EditedTime)?>
 <?
 				}
 ?>
@@ -164,6 +164,6 @@
 </div>
 <?
 
-show_footer();
+View::show_footer();
 
 ?>
diff --git a/sections/donate/cancel.php b/sections/donate/cancel.php
index 37590515..7c37bd55 100644
--- a/sections/donate/cancel.php
+++ b/sections/donate/cancel.php
@@ -1,6 +1,6 @@
 <?
 enforce_login();
-show_header('Donation Canceled');
+View::show_header('Donation Canceled');
 ?>
 <div class="thin">
 	<div class="header">
@@ -10,4 +10,4 @@
 		<p>It's the thought that counts. Please reconsider donating in the future.</p>
 	</div>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/donate/complete.php b/sections/donate/complete.php
index f27b8e2a..04fdf4ab 100644
--- a/sections/donate/complete.php
+++ b/sections/donate/complete.php
@@ -1,6 +1,6 @@
 <?
 enforce_login();
-show_header('Donation Complete');
+View::show_header('Donation Complete');
 ?>
 <div class="thin">
 	<div class="header">
@@ -10,4 +10,4 @@
 		<p>Thank you for your donation! If this is your first time donating you will now have received 2 invitations and a <img src="<?=STATIC_SERVER?>common/symbols/donor.png" alt="Donor" />.</p>
 	</div>
 </div>
-<? show_footer();?>
+<? View::show_footer();?>
diff --git a/sections/donate/donate.php b/sections/donate/donate.php
index e637985a..f1d88959 100644
--- a/sections/donate/donate.php
+++ b/sections/donate/donate.php
@@ -13,10 +13,10 @@
 	$Cache->cache_value('stats_user_count', $UserCount, 0); //inf cache
 }
 
-$DonorPerms = get_permissions(DONOR);
+$DonorPerms = Permissions::get_permissions(DONOR);
 
 if ($_GET['miner']) { $LoggedUser['BitcoinMiner'] = 1; $_GET['showminer'] = 1; }
-show_header('Donate');
+View::show_header('Donate');
 
 
 ?>
@@ -103,4 +103,4 @@
 	</div>
 </div>
 <!-- END Donate -->
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/donate/donate_gpal.php b/sections/donate/donate_gpal.php
index e7381d12..af46a1d9 100644
--- a/sections/donate/donate_gpal.php
+++ b/sections/donate/donate_gpal.php
@@ -13,9 +13,9 @@
 	$Cache->cache_value('stats_user_count', $UserCount, 0); //inf cache
 }
 
-$DonorPerms = get_permissions(DONOR);
+$DonorPerms = Permissions::get_permissions(DONOR);
 
-show_header('Donate');
+View::show_header('Donate');
 
 
 ?>
@@ -105,4 +105,4 @@
 	</div>
 </div>
 <!-- END Donate -->
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/donate/ipn.php b/sections/donate/ipn.php
index 4778ee3b..82bd6433 100644
--- a/sections/donate/ipn.php
+++ b/sections/donate/ipn.php
@@ -47,10 +47,10 @@
 						$Cache->begin_transaction('user_info_heavy_'.$_POST['custom']);
 						$Cache->update_row(false, array('Invites' => $Invites));
 						$Cache->commit_transaction(0);
-						send_pm($_POST['custom'],0,db_string('Thank you for your donation'),db_string('Your donation from '.$_POST['payer_email'].' of '.$_POST['mc_gross'].' '.PAYPAL_CURRENCY.' has been successfully processed. Because this is your first time donating, you have now been awarded Donor status as represented by the <3 found on your profile and next to your username where it appears. This has entitled you to a additional site features which you can now explore, and has granted you '.DONOR_INVITES.' invitations to share with others. Thank you for supporting '.SITE_NAME.'.'),'');
+						Misc::send_pm($_POST['custom'],0,db_string('Thank you for your donation'),db_string('Your donation from '.$_POST['payer_email'].' of '.$_POST['mc_gross'].' '.PAYPAL_CURRENCY.' has been successfully processed. Because this is your first time donating, you have now been awarded Donor status as represented by the <3 found on your profile and next to your username where it appears. This has entitled you to a additional site features which you can now explore, and has granted you '.DONOR_INVITES.' invitations to share with others. Thank you for supporting '.SITE_NAME.'.'),'');
 					} else {
 						//Repeat donor
-						send_pm($_POST['custom'],0,db_string('Thank you for your donation'),db_string('Your donation from '.$_POST['payer_email'].' of '.$_POST['mc_gross'].' '.PAYPAL_CURRENCY.' has been successfully processed. Your continued support is highly appreciated and helps to make this place possible.'),'');
+						Misc::send_pm($_POST['custom'],0,db_string('Thank you for your donation'),db_string('Your donation from '.$_POST['payer_email'].' of '.$_POST['mc_gross'].' '.PAYPAL_CURRENCY.' has been successfully processed. Your continued support is highly appreciated and helps to make this place possible.'),'');
 					}
 					
 					
@@ -60,7 +60,7 @@
 	} else {
 		if ($_POST['mc_gross'] > 0) {
 			//Donation less than minimum
-			send_pm($_POST['custom'],0,db_string('Thank you for your donation'),db_string('Your donation from '.$_POST['payer_email'].' of '.$_POST['mc_gross'].' '.PAYPAL_CURRENCY.' has been successfully processed. Unfortunately however this donation was less than the specified minimum donation of '.PAYPAL_MINIMUM.' '.PAYPAL_CURRENCY.' and while we are grateful, no special privileges have been awarded to you.'),'');
+			Misc::send_pm($_POST['custom'],0,db_string('Thank you for your donation'),db_string('Your donation from '.$_POST['payer_email'].' of '.$_POST['mc_gross'].' '.PAYPAL_CURRENCY.' has been successfully processed. Unfortunately however this donation was less than the specified minimum donation of '.PAYPAL_MINIMUM.' '.PAYPAL_CURRENCY.' and while we are grateful, no special privileges have been awarded to you.'),'');
 		} else {
 			//Failed pending donation
 			$Message = "User http://".NONSSL_SITE_URL."/user.php?id=".$_POST['custom']." had donation of ".$TotalDonated." ".PAYPAL_CURRENCY." at ".$DonationTime." UTC from ".$_POST['payer_email']." returned.";
@@ -83,7 +83,7 @@
 				$Cache->begin_transaction('user_info_heavy_'.$_POST['custom']);
 				$Cache->update_row(false, array('Invites' => $Invites));
 				$Cache->commit_transaction(0);
-				send_pm($_POST['custom'],0,db_string('Notice of donation failure'),db_string('PapPal has just notified us that the donation you sent from '.$_POST['payer_email'].' of '.$TotalDonated.' '.PAYPAL_CURRENCY.' at '.$DonationTime.' UTC has been revoked. Because of this your special privileges have been revoked, and your invites removed.'),'');
+				Misc::send_pm($_POST['custom'],0,db_string('Notice of donation failure'),db_string('PapPal has just notified us that the donation you sent from '.$_POST['payer_email'].' of '.$TotalDonated.' '.PAYPAL_CURRENCY.' at '.$DonationTime.' UTC has been revoked. Because of this your special privileges have been revoked, and your invites removed.'),'');
 				
 				
 				send_irc("PRIVMSG ".BOT_REPORT_CHAN." :".$Message);
@@ -100,7 +100,7 @@
 } else {
 	$DB->query("INSERT INTO ip_bans
 	(FromIP, ToIP, Reason) VALUES
-	('".ip2unsigned($_SERVER['REMOTE_ADDR'])."','".ip2long($_SERVER['REMOTE_ADDR'])."', 'Attempted to exploit donation system.')");
+	('".Tools::ip_to_unsigned($_SERVER['REMOTE_ADDR'])."','".ip2long($_SERVER['REMOTE_ADDR'])."', 'Attempted to exploit donation system.')");
 }
 fclose ($Socket);
 if (check_perms('site_debug')) {
diff --git a/sections/error/index.php b/sections/error/index.php
index 13dce62a..459f4417 100644
--- a/sections/error/index.php
+++ b/sections/error/index.php
@@ -2,7 +2,7 @@
 
 function notify ($Channel, $Message) {
 	global $LoggedUser;
-	send_irc("PRIVMSG ".$Channel." :".$Message." error by ".(!empty($LoggedUser['ID']) ? "https://".SSL_SITE_URL."/user.php?id=".$LoggedUser['ID'] ." (".$LoggedUser['Username'].")" : $_SERVER['REMOTE_ADDR']." (".geoip($_SERVER['REMOTE_ADDR']).")")." accessing https://".SSL_SITE_URL."".$_SERVER['REQUEST_URI'].(!empty($_SERVER['HTTP_REFERER'])? " from ".$_SERVER['HTTP_REFERER'] : ''));
+	send_irc("PRIVMSG ".$Channel." :".$Message." error by ".(!empty($LoggedUser['ID']) ? "https://".SSL_SITE_URL."/user.php?id=".$LoggedUser['ID'] ." (".$LoggedUser['Username'].")" : $_SERVER['REMOTE_ADDR']." (".Tools::geoip($_SERVER['REMOTE_ADDR']).")")." accessing https://".SSL_SITE_URL."".$_SERVER['REQUEST_URI'].(!empty($_SERVER['HTTP_REFERER'])? " from ".$_SERVER['HTTP_REFERER'] : ''));
 }
 
 $Errors = array('403','404','413','504');
@@ -47,7 +47,7 @@ function notify ($Channel, $Message) {
 	}
 
 	if(empty($Ajax) && $Error != -1) {
-		show_header($Title);
+		View::show_header($Title);
 ?>
 	<div class="thin">
 		<div class="header">
@@ -58,7 +58,7 @@ function notify ($Channel, $Message) {
 		</div>
 	</div>
 <?
-		show_footer();
+		View::show_footer();
 	} else {
 		echo $Description;
 	}
diff --git a/sections/forums/ajax_get_edit.php b/sections/forums/ajax_get_edit.php
index 4c9cde6e..63ae5983 100644
--- a/sections/forums/ajax_get_edit.php
+++ b/sections/forums/ajax_get_edit.php
@@ -65,7 +65,7 @@
 <? if($Depth < count($Edits)) { ?>
 					<a href="#edit_info_<?=$PostID?>" onclick="LoadEdit('<?=$Type?>', <?=$PostID?>, <?=($Depth + 1)?>); return false;">&laquo;</a>
 					<?=(($Depth == 0) ? 'Last edited by' : 'Edited by')?>
-					<?=format_username($UserID, false, false, false) ?> <?=time_diff($Time,2,true,true)?>
+					<?=Users::format_username($UserID, false, false, false) ?> <?=time_diff($Time,2,true,true)?>
 <? } else { ?>
 					<em>Original Post</em>
 <? }
diff --git a/sections/forums/edit_rules.php b/sections/forums/edit_rules.php
index 0bd48b94..b87dd3ce 100644
--- a/sections/forums/edit_rules.php
+++ b/sections/forums/edit_rules.php
@@ -30,7 +30,7 @@
 $DB->query("SELECT ThreadID FROM forums_specific_rules WHERE ForumID = ".$ForumID);
 $ThreadIDs = $DB->collect('ThreadID');
 
-show_header();
+View::show_header();
 ?>
 <div class="thin box pad">
 	<div class="header">
@@ -70,5 +70,5 @@
 	</table>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/forums/forum.php b/sections/forums/forum.php
index 15d97b60..fa951f83 100644
--- a/sections/forums/forum.php
+++ b/sections/forums/forum.php
@@ -22,7 +22,7 @@
 	$PerPage = POSTS_PER_PAGE;
 }
 
-list($Page,$Limit) = page_limit(TOPICS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(TOPICS_PER_PAGE);
 
 //---------- Get some data to start processing
 
@@ -64,7 +64,7 @@
 if($LoggedUser['CustomForums'][$ForumID] != 1 && $Forums[$ForumID]['MinClassRead'] > $LoggedUser['Class']) { error(403); }
 
 // Start printing
-show_header('Forums > '. $Forums[$ForumID]['Name']);
+View::show_header('Forums > '. $Forums[$ForumID]['Name']);
 ?>
 <div class="thin">
 	<h2><a href="forums.php">Forums</a> &gt; <?=$ForumName?></h2>
@@ -137,7 +137,7 @@
 <? } ?>
 	<div class="linkbox pager">
 <?
-$Pages=get_pages($Page,$Forums[$ForumID]['NumTopics'],TOPICS_PER_PAGE,9);
+$Pages=Format::get_pages($Page,$Forums[$ForumID]['NumTopics'],TOPICS_PER_PAGE,9);
 echo $Pages;
 ?>
 	</div>
@@ -222,7 +222,7 @@
 		unset($PageLinks);
 ?>
 				<strong>
-					<a href="forums.php?action=viewthread&amp;threadid=<?=$TopicID?>" title="<?=display_str($Title)?>"><?=display_str(cut_string($Title, $TopicLength)) ?></a>
+					<a href="forums.php?action=viewthread&amp;threadid=<?=$TopicID?>" title="<?=display_str($Title)?>"><?=display_str(Format::cut_string($Title, $TopicLength)) ?></a>
 				</strong>
 				<?=$PagesText?>
 			</span>
@@ -232,11 +232,11 @@
 			</span>
 <?		} ?>
 			<span style="float:right;" class="last_poster">
-				by <?=format_username($LastAuthorID, false, false, false)?> <?=time_diff($LastTime,1)?>
+				by <?=Users::format_username($LastAuthorID, false, false, false)?> <?=time_diff($LastTime,1)?>
 			</span>
 		</td>
 		<td><?=number_format($PostCount-1)?></td>
-		<td><?=format_username($AuthorID, false, false, false)?></td>
+		<td><?=Users::format_username($AuthorID, false, false, false)?></td>
 	</tr>
 <?	}
 } ?>
@@ -249,4 +249,4 @@
 	</div>
 	<div class="linkbox">[<a href="forums.php?action=catchup&amp;forumid=<?=$ForumID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">Catch up</a>]</div>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/forums/main.php b/sections/forums/main.php
index 94a18967..185aab2e 100644
--- a/sections/forums/main.php
+++ b/sections/forums/main.php
@@ -27,7 +27,7 @@
 	$LastRead = array();
 }
 
-show_header('Forums');
+View::show_header('Forums');
 ?>
 <div class="thin">
 	<h2>Forums</h2>
@@ -91,14 +91,14 @@
 <? } else { ?>
 		<td>
 			<span style="float:left;" class="last_topic">
-				<a href="forums.php?action=viewthread&amp;threadid=<?=$LastTopicID?>" title="<?=display_str($LastTopic)?>"><?=display_str(cut_string($LastTopic, 50, 1))?></a>
+				<a href="forums.php?action=viewthread&amp;threadid=<?=$LastTopicID?>" title="<?=display_str($LastTopic)?>"><?=display_str(Format::cut_string($LastTopic, 50, 1))?></a>
 			</span>
 <? if (!empty($LastRead[$LastTopicID])) { ?>
 			<span style="float: left;" class="last_read" title="Jump to last read">
 				<a href="forums.php?action=viewthread&amp;threadid=<?=$LastTopicID?>&amp;page=<?=$LastRead[$LastTopicID]['Page']?>#post<?=$LastRead[$LastTopicID]['PostID']?>"></a>
 			</span>
 <? } ?>
-			<span style="float:right;" class="last_poster">by <?=format_username($LastAuthorID, false, false, false)?> <?=time_diff($LastTime,1)?></span>
+			<span style="float:right;" class="last_poster">by <?=Users::format_username($LastAuthorID, false, false, false)?> <?=time_diff($LastTime,1)?></span>
 		</td>
 		<td><?=number_format($NumTopics)?></td>
 		<td><?=number_format($NumPosts)?></td>
@@ -108,4 +108,4 @@
 	</table>
 	<div class="linkbox"><a href="forums.php?action=catchup&amp;forumid=all&amp;auth=<?=$LoggedUser['AuthKey']?>">Catch up</a></div>
 </div>
-<? show_footer();
+<? View::show_footer();
diff --git a/sections/forums/mod_thread.php b/sections/forums/mod_thread.php
index f6807abd..4c736f49 100644
--- a/sections/forums/mod_thread.php
+++ b/sections/forums/mod_thread.php
@@ -117,7 +117,7 @@
 	$UpdateArray = array(
 		'IsSticky'=>$Sticky,
 		'IsLocked'=>$Locked,
-		'Title'=>cut_string($RawTitle, 150, 1, 0),
+		'Title'=>Format::cut_string($RawTitle, 150, 1, 0),
 		'ForumID'=>$ForumID
 		);
 	$Cache->update_row(false, $UpdateArray);
diff --git a/sections/forums/newthread.php b/sections/forums/newthread.php
index 4d1cfa42..7e5e3454 100644
--- a/sections/forums/newthread.php
+++ b/sections/forums/newthread.php
@@ -20,7 +20,7 @@
 
 
 if(!check_forumperm($ForumID, 'Write') || !check_forumperm($ForumID, 'Create')) { error(403); }
-show_header('Forums > '.$Forum['Name'].' > New Topic','comments,bbcode');
+View::show_header('Forums > '.$Forum['Name'].' > New Topic','comments,bbcode');
 ?>
 <div class="thin">
 	<h2><a href="forums.php">Forums</a> &gt; <a href="forums.php?action=viewforum&amp;forumid=<?=$ForumID?>"><?=$Forum['Name']?></a> &gt; <span id="newthreadtitle">New Topic</span></h2>
@@ -46,7 +46,7 @@
 			<tr class="colhead_dark">
 				<td colspan="2">
 					<span style="float:left;"><a href='#newthreadpreview'>#XXXXXX</a>
-						by <strong><?=format_username($LoggedUser['ID'], true, true, true, true, true)?></strong>
+						by <strong><?=Users::format_username($LoggedUser['ID'], true, true, true, true, true)?></strong>
 					Just now
 					</span>
 					<span id="barpreview" style="float:right;">
@@ -149,4 +149,4 @@ function RemoveAnswerField() {
 		</form>
 	</div>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/forums/search.php b/sections/forums/search.php
index a8866610..2f1a554c 100644
--- a/sections/forums/search.php
+++ b/sections/forums/search.php
@@ -6,7 +6,7 @@
 include(SERVER_ROOT.'/classes/class_text.php');
 $Text = new TEXT;
 
-list($Page,$Limit) = page_limit(POSTS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(POSTS_PER_PAGE);
 
 if($LoggedUser['CustomForums']) {
 	unset($LoggedUser['CustomForums']['']);
@@ -74,7 +74,7 @@
 }
 
 // Let's hope we got some results - start printing out the content.
-show_header('Forums'.' > '.'Search', 'bbcode');
+View::show_header('Forums'.' > '.'Search', 'bbcode');
 ?>
 <div class="thin">
 	<h2><a href="forums.php">Forums</a> &gt; Search<?=$Title?></h2>
@@ -257,7 +257,7 @@
 list($Results) = $DB->next_record();
 $DB->set_query_id($Records);
 
-$Pages=get_pages($Page,$Results,POSTS_PER_PAGE,9);
+$Pages=Format::get_pages($Page,$Results,POSTS_PER_PAGE,9);
 echo $Pages;
 ?>
 	</div>
@@ -282,9 +282,9 @@
 			</td>
 			<td>
 <? if(empty($ThreadID)) { ?>
-				<a href="forums.php?action=viewthread&amp;threadid=<?=$ID?>"><?=cut_string($Title, 80); ?></a>
+				<a href="forums.php?action=viewthread&amp;threadid=<?=$ID?>"><?=Format::cut_string($Title, 80); ?></a>
 <? } else { ?>
-				<?=cut_string($Title, 80); ?>
+				<?=Format::cut_string($Title, 80); ?>
 <? }
    if ($Type == 'body') { ?>
 				<a href="#" onclick="$('#post_<?=$PostID?>_text').toggle(); return false;">(show)</a> <span style="float: right;" class="last_read" title="Jump to post"><a href="forums.php?action=viewthread&amp;threadid=<?=$ID?><? if(!empty($PostID)) { echo '&amp;postid='.$PostID.'#post'.$PostID; } ?>"></a></span>
@@ -308,4 +308,4 @@
 		<?=$Pages?>
 	</div>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/forums/take_new_thread.php b/sections/forums/take_new_thread.php
index a886a85b..897a414d 100644
--- a/sections/forums/take_new_thread.php
+++ b/sections/forums/take_new_thread.php
@@ -41,7 +41,7 @@
 	error('Your posting rights have been removed');
 }
 
-$Title = cut_string(trim($_POST['title']), 150, 1, 0);
+$Title = Format::cut_string(trim($_POST['title']), 150, 1, 0);
 
 
 $ForumID = $_POST['forum'];
diff --git a/sections/forums/take_warn.php b/sections/forums/take_warn.php
index 42bc1b1d..8ac1744a 100644
--- a/sections/forums/take_warn.php
+++ b/sections/forums/take_warn.php
@@ -1,7 +1,7 @@
 <?php
 if (!check_perms('users_warn')) { error(404);
 }
-isset_request($_POST, array('reason', 'privatemessage', 'body', 'length', 'postid', 'userid'));
+Misc::assert_isset_request($_POST, array('reason', 'privatemessage', 'body', 'length', 'postid', 'userid'));
 
 $Reason = db_string($_POST['reason']);
 $PrivateMessage = db_string($_POST['privatemessage']);
@@ -12,7 +12,7 @@
 $Key = (int)$_POST['key'];
 $SQLTime = sqltime();
 
-$UserInfo = user_info($UserID);
+$UserInfo = Users::user_info($UserID);
 if($UserInfo['Class'] > $LoggedUser['Class']) {
     error(403);
 }
@@ -20,7 +20,7 @@
 $URL = "https://".SSL_SITE_URL."/forums.php?action=viewthread&amp;postid=$PostID#post$PostID";
 if ($Length != 'verbal') {
     $Time = ((int)$Length) * (7 * 24 * 60 * 60);
-    warn_user($UserID, $Time, "$URL - " . $Reason);
+    Tools::warn_user($UserID, $Time, "$URL - " . $Reason);
     $Subject = "You have received a warning";
     $PrivateMessage = "You have received a $Length week warning for [url=$URL]this post.[/url]\n\n" . $PrivateMessage;
 	
@@ -35,7 +35,7 @@
 
 $DB -> query("INSERT INTO users_warnings_forums (UserID, Comment) VALUES('$UserID', '" . db_string($AdminComment) . "')
 		ON DUPLICATE KEY UPDATE Comment = CONCAT('" . db_string($AdminComment) . "', Comment)");
-send_pm($UserID, $LoggedUser['ID'], $Subject, $PrivateMessage);
+Misc::send_pm($UserID, $LoggedUser['ID'], $Subject, $PrivateMessage);
 
 //edit the post
 $DB -> query("SELECT
diff --git a/sections/forums/thread.php b/sections/forums/thread.php
index 55c0b582..10218b59 100644
--- a/sections/forums/thread.php
+++ b/sections/forums/thread.php
@@ -71,11 +71,11 @@
 } else {
 	$PostNum = 1;
 }
-list($Page,$Limit) = page_limit($PerPage, min($ThreadInfo['Posts'],$PostNum));
+list($Page,$Limit) = Format::page_limit($PerPage, min($ThreadInfo['Posts'],$PostNum));
 if(($Page-1)*$PerPage > $ThreadInfo['Posts']) {
 	$Page = ceil($ThreadInfo['Posts']/$PerPage);
 }
-list($CatalogueID,$CatalogueLimit) = catalogue_limit($Page,$PerPage,THREAD_CATALOGUE);
+list($CatalogueID,$CatalogueLimit) = Format::catalogue_limit($Page,$PerPage,THREAD_CATALOGUE);
 
 // Cache catalogue from which the page is selected, allows block caches and future ability to specify posts per page
 if(!$Catalogue = $Cache->get_value('thread_'.$ThreadID.'_catalogue_'.$CatalogueID)) {
@@ -96,7 +96,7 @@
 		$Cache->cache_value('thread_'.$ThreadID.'_catalogue_'.$CatalogueID, $Catalogue, 0);
 	}
 }
-$Thread = catalogue_select($Catalogue,$Page,$PerPage,THREAD_CATALOGUE);
+$Thread = Format::catalogue_select($Catalogue,$Page,$PerPage,THREAD_CATALOGUE);
 
 if($_GET['updatelastread'] != '0') {
 	$LastPost = end($Thread);
@@ -138,7 +138,7 @@
 }
 
 // Start printing
-show_header('Forums'.' > '.$Forums[$ForumID]['Name'].' > '.$ThreadInfo['Title'],'comments,subscriptions,bbcode');
+View::show_header('Forums'.' > '.$Forums[$ForumID]['Name'].' > '.$ThreadInfo['Title'],'comments,subscriptions,bbcode');
 ?>
 <div class="thin">
 	<h2>
@@ -176,7 +176,7 @@
 			</div>
 		</div>
 <?
-$Pages=get_pages($Page,$ThreadInfo['Posts'],$PerPage,9);
+$Pages=Format::get_pages($Page,$ThreadInfo['Posts'],$PerPage,9);
 echo $Pages;
 ?>
 	</div>
@@ -381,13 +381,13 @@
 
 foreach($Thread as $Key => $Post){
 	list($PostID, $AuthorID, $AddedTime, $Body, $EditedUserID, $EditedTime, $EditedUsername) = array_values($Post);
-	list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(user_info($AuthorID));
+	list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(Users::user_info($AuthorID));
 ?>
 <table class="forum_post box vertical_margin<? if (((!$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) && $PostID>$LastRead && strtotime($AddedTime)>$LoggedUser['CatchupTime']) || (isset($RequestKey) && $Key==$RequestKey)) { echo ' forum_unread'; } if($HeavyInfo['DisableAvatars']) { echo ' noavatar'; } ?>" id="post<?=$PostID?>">
 	<tr class="colhead_dark">
 		<td colspan="2">
-			<div style="float:left;"><a class="post_id" href='forums.php?action=viewthread&amp;threadid=<?=$ThreadID?>&amp;postid=<?=$PostID?>#post<?=$PostID?>'>#<?=$PostID?></a>
-				<?=format_username($AuthorID, true, true, true, true, true)?>
+			<div style="float:left;"><a class="post_id" href="forums.php?action=viewthread&amp;threadid=<?=$ThreadID?>&amp;postid=<?=$PostID?>#post<?=$PostID?>">#<?=$PostID?></a>
+				<?=Users::format_username($AuthorID, true, true, true, true, true)?>
 				<?=time_diff($AddedTime,2)?> 
 <? if(!$ThreadInfo['IsLocked'] || check_perms('site_moderate_forums')){ ?> 
 				- <a href="#quickpost" onclick="Quote('<?=$PostID?>','<?=$Username?>', true);">[Quote]</a> 
@@ -414,7 +414,7 @@
 				<a href="reports.php?action=report&amp;type=post&amp;id=<?=$PostID?>">[Report]</a>
 <?
                 if(check_perms('users_warn') && $AuthorID != $LoggedUser['ID']) { 
-                    $AuthorInfo = user_info($AuthorID);
+                    $AuthorInfo = Users::user_info($AuthorID);
                     if($LoggedUser['Class'] >= $AuthorInfo['Class']) { ?>
                         <form class="manage_form hidden" name="user" id="warn<?=$PostID?>" action="" method="post">
 	                        <input type="hidden" name="action" value="warn" />
@@ -451,7 +451,7 @@
 				<a href="#content<?=$PostID?>" onclick="LoadEdit('forums', <?=$PostID?>, 1); return false;">&laquo;</a> 
 <? 	} ?>
 				Last edited by
-				<?=format_username($EditedUserID, false, false, false) ?> <?=time_diff($EditedTime,2,true,true)?>
+				<?=Users::format_username($EditedUserID, false, false, false) ?> <?=time_diff($EditedTime,2,true,true)?>
 <? } ?>
 			</div>
 		</td>
@@ -478,7 +478,7 @@
 					<tr class="colhead_dark">
 						<td colspan="2">
 							<span style="float:left;"><a href='#quickreplypreview'>#XXXXXX</a>
-								by <?=format_username($LoggedUser['ID'], true, true, true, true, true)?> Just now
+								by <?=Users::format_username($LoggedUser['ID'], true, true, true, true, true)?> Just now
 							</span>
 							<span id="barpreview" style="float:right;">
 								<a href="#quickreplypreview">[Report Post]</a>
@@ -606,4 +606,4 @@
 } // If user is moderator
 ?>
 </div>
-<? show_footer();
+<? View::show_footer();
diff --git a/sections/forums/warn.php b/sections/forums/warn.php
index 5ab35d2d..cbadc803 100644
--- a/sections/forums/warn.php
+++ b/sections/forums/warn.php
@@ -1,16 +1,16 @@
 <?php
 if (!check_perms('users_warn')) { error(404);}
-isset_request($_POST, array('postid', 'userid', 'key'));
+Misc::assert_isset_request($_POST, array('postid', 'userid', 'key'));
 $PostID = (int) $_POST['postid'];
 $UserID = (int)$_POST['userid'];
 $Key = (int)$_POST['key'];
-$UserInfo = user_info($UserID);
+$UserInfo = Users::user_info($UserID);
 $DB -> query("SELECT
     p.Body, t.ForumID
     FROM forums_posts as p JOIN forums_topics as t on p.TopicID = t.ID
     WHERE p.ID='$PostID'");
 list($PostBody, $ForumID) = $DB -> next_record();
-show_header('Warn User');
+View::show_header('Warn User');
 ?>
 
 <div class="thin">
@@ -61,4 +61,4 @@
 		</form>
 	</div>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/friends/friends.php b/sections/friends/friends.php
index 9c5f0897..61625b6b 100644
--- a/sections/friends/friends.php
+++ b/sections/friends/friends.php
@@ -13,13 +13,13 @@
 
 
 
-show_header('Friends');
+View::show_header('Friends');
  
 
 $UserID = $LoggedUser['ID'];
 
 
-list($Page,$Limit) = page_limit(FRIENDS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(FRIENDS_PER_PAGE);
 
 // Main query
 $DB->query("SELECT 
@@ -53,7 +53,7 @@
 	<div class="linkbox">
 <?
 // Pagination
-$Pages=get_pages($Page,$Results,FRIENDS_PER_PAGE,9);
+$Pages=Format::get_pages($Page,$Results,FRIENDS_PER_PAGE,9);
 echo $Pages;
 ?>
 	</div>
@@ -71,15 +71,15 @@
 	<table class="friends_table vertical_margin">
 		<tr class="colhead">
 			<td colspan="3">
-				<span style="float:left;"><?=format_username($FriendID, true, true, true, true)?>
+				<span style="float:left;"><?=Users::format_username($FriendID, true, true, true, true)?>
 <?	if(check_paranoia('ratio', $Paranoia, $Class, $FriendID)) { ?>
-				&nbsp;Ratio: <strong><?=ratio($Uploaded, $Downloaded)?></strong>
+				&nbsp;Ratio: <strong><?=Format::get_ratio_html($Uploaded, $Downloaded)?></strong>
 <?	} ?>
 <?	if(check_paranoia('uploaded', $Paranoia, $Class, $FriendID)) { ?>
-				&nbsp;Up: <strong><?=get_size($Uploaded)?></strong>
+				&nbsp;Up: <strong><?=Format::get_size($Uploaded)?></strong>
 <?	} ?>
 <?	if(check_paranoia('downloaded', $Paranoia, $Class, $FriendID)) { ?>
-				&nbsp;Down: <strong><?=get_size($Downloaded)?></strong>
+				&nbsp;Down: <strong><?=Format::get_size($Downloaded)?></strong>
 <?	} ?>
 				</span>
 <?	if(check_paranoia('lastseen', $Paranoia, $Class, $FriendID)) { ?>
@@ -128,5 +128,5 @@
 <? // close <div class="thin">  ?>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/image/index.php b/sections/image/index.php
index a2be933e..14ecaa4a 100644
--- a/sections/image/index.php
+++ b/sections/image/index.php
@@ -67,7 +67,7 @@
 
 			// Send PM
 
-			send_pm($UserID,0,"Your avatar has been automatically reset","The following avatar rules have been in effect for months now:
+			Misc::send_pm($UserID,0,"Your avatar has been automatically reset","The following avatar rules have been in effect for months now:
 
 [b]Avatars must not exceed 256kB or be vertically longer than 400px. [/b]
 
diff --git a/sections/inbox/compose.php b/sections/inbox/compose.php
index 09584562..e7f95ce5 100644
--- a/sections/inbox/compose.php
+++ b/sections/inbox/compose.php
@@ -17,7 +17,7 @@
 $DB->query("SELECT Username FROM users_main WHERE ID='$ToID'");
 list($Username) = $DB->next_record();
 if(!$Username) { error(404); }
-show_header('Compose', 'inbox,bbcode');
+View::show_header('Compose', 'inbox,bbcode');
 ?>
 <div class="thin">
 	<div class="header">
@@ -44,5 +44,5 @@
 </div>
 
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/inbox/conversation.php b/sections/inbox/conversation.php
index e446380e..ec112c17 100644
--- a/sections/inbox/conversation.php
+++ b/sections/inbox/conversation.php
@@ -40,7 +40,7 @@
 
 while(list($PMUserID, $Username) = $DB->next_record()) {
 	$PMUserID = (int)$PMUserID;
-	$Users[$PMUserID]['UserStr'] = format_username($PMUserID, true, true, true, true);
+	$Users[$PMUserID]['UserStr'] = Users::format_username($PMUserID, true, true, true, true);
 	$Users[$PMUserID]['Username'] = $Username;
 }
 $Users[0]['UserStr'] = 'System'; // in case it's a message from the system
@@ -55,7 +55,7 @@
 	$Cache->decrement('inbox_new_'.$UserID);
 }
 
-show_header('View conversation '.$Subject, 'comments,inbox,bbcode');
+View::show_header('View conversation '.$Subject, 'comments,inbox,bbcode');
 
 // Get messages
 $DB->query("SELECT SentDate, SenderID, Body, ID FROM pm_messages AS m WHERE ConvID='$ConvID' ORDER BY ID");
@@ -165,5 +165,5 @@
 ?>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/inbox/forward.php b/sections/inbox/forward.php
index abc96525..a93e0bce 100644
--- a/sections/inbox/forward.php
+++ b/sections/inbox/forward.php
@@ -22,5 +22,5 @@
 	error("$StaffIDs[$ReceiverID] already has this conversation in their inbox.");
 	header('Location: inbox.php?action=viewconv&id='.$ConvID);
 }
-//show_footer();
+//View::show_footer();
 ?>
diff --git a/sections/inbox/inbox.php b/sections/inbox/inbox.php
index 5b82b885..027184ba 100644
--- a/sections/inbox/inbox.php
+++ b/sections/inbox/inbox.php
@@ -10,9 +10,9 @@
 }
 if(!in_array($Section, array('inbox', 'sentbox'))) { error(404); }
 
-list($Page,$Limit) = page_limit(MESSAGES_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(MESSAGES_PER_PAGE);
 
-show_header('Inbox');
+View::show_header('Inbox');
 ?>
 <div class="thin">
 	<h2><?= ($Section == 'sentbox') ? 'Sentbox' : 'Inbox' ?></h2>
@@ -72,14 +72,14 @@
 list($NumResults) = $DB->next_record();
 $DB->set_query_id($Results);
 
-$CurURL = get_url(array('sort'));
+$CurURL = Format::get_url(array('sort'));
 if(empty($CurURL)) {
 	$CurURL = "inbox.php?";
 } else {
 	$CurURL = "inbox.php?".$CurURL."&";
 }
 
-$Pages=get_pages($Page,$NumResults,MESSAGES_PER_PAGE,9);
+$Pages=Format::get_pages($Page,$NumResults,MESSAGES_PER_PAGE,9);
 echo $Pages;
 ?>
 	</div>
@@ -145,10 +145,10 @@
 <?
 		if($Unread) { echo '</strong>';} ?>
 					</td>
-					<td><?=format_username($SenderID, true, true, true, true)?></td>
+					<td><?=Users::format_username($SenderID, true, true, true, true)?></td>
 					<td><?=time_diff($Date)?></td>
 <?		if(check_perms('users_mod')) { ?>
-					<td><?=($ForwardedID && $ForwardedID != $LoggedUser['ID'] ? format_username($ForwardedID, false, false, false):'')?></td>
+					<td><?=($ForwardedID && $ForwardedID != $LoggedUser['ID'] ? Users::format_username($ForwardedID, false, false, false):'')?></td>
 <?		} ?>
 				</tr>
 <?	} ?>
@@ -162,5 +162,5 @@
 	<div class="linkbox"><?=$Pages?></div>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/inbox/takecompose.php b/sections/inbox/takecompose.php
index 87cd9c71..eb92c2c6 100644
--- a/sections/inbox/takecompose.php
+++ b/sections/inbox/takecompose.php
@@ -48,7 +48,7 @@
 	die();
 }
 
-$ConvID = send_pm($ToID,$LoggedUser['ID'],db_string($Subject),db_string($Body),$ConvID);
+$ConvID = Misc::send_pm($ToID,$LoggedUser['ID'],db_string($Subject),db_string($Body),$ConvID);
 
 header('Location: inbox.php');
 ?>
diff --git a/sections/index/feat_album.php b/sections/index/feat_album.php
index 3148bafb..76caef18 100644
--- a/sections/index/feat_album.php
+++ b/sections/index/feat_album.php
@@ -6,12 +6,12 @@
 	$Cache->cache_value('featured_album', $FeaturedAlbum, 0);
 }
 if(is_number($FeaturedAlbum['GroupID'])) {
-	$Artists = get_artist($FeaturedAlbum['GroupID']);
+	$Artists = Artists::get_artist($FeaturedAlbum['GroupID']);
 ?>
 		<div class="box">
 			<div class="head colhead_dark"><strong>Featured Album</strong></div>
-			<div class="center pad"><?=display_artists($Artists, true, true)?><a href="torrents.php?id=<?=$FeaturedAlbum['GroupID']?>"><?=$FeaturedAlbum['Name']?></a></div>
-			<div class="center"><a href="torrents.php?id=<?=$FeaturedAlbum['GroupID']?>" title="<?=display_artists($Artists, false, false)?> - <?=$FeaturedAlbum['Name']?>"><img src="<?=to_thumbnail($FeaturedAlbum['WikiImage'])?>" alt="<?=display_artists($Artists, false, false)?> - <?=$FeaturedAlbum['Name']?>" width="100%" /></a></div>
+			<div class="center pad"><?=Artists::display_artists($Artists, true, true)?><a href="torrents.php?id=<?=$FeaturedAlbum['GroupID']?>"><?=$FeaturedAlbum['Name']?></a></div>
+			<div class="center"><a href="torrents.php?id=<?=$FeaturedAlbum['GroupID']?>" title="<?=Artists::display_artists($Artists, false, false)?> - <?=$FeaturedAlbum['Name']?>"><img src="<?=to_thumbnail($FeaturedAlbum['WikiImage'])?>" alt="<?=Artists::display_artists($Artists, false, false)?> - <?=$FeaturedAlbum['Name']?>" width="100%" /></a></div>
 			<div class="center pad"><a href="forums.php?action=viewthread&amp;threadid=<?=$FeaturedAlbum['ThreadID']?>"><em>Read the interview with the artist, discuss here</em></a></div>
 		</div>
 <?
diff --git a/sections/index/private.php b/sections/index/private.php
index 3bad0ee4..3b830467 100644
--- a/sections/index/private.php
+++ b/sections/index/private.php
@@ -25,7 +25,7 @@
 	$LoggedUser['LastReadNews'] = $News[0][0];
 }
 
-show_header('News','bbcode');
+View::show_header('News','bbcode');
 ?>
 <div class="thin">
 	<div class="sidebar">
@@ -223,7 +223,7 @@
 }
 
 if(!$PeerStatsLocked) {
-	$Ratio = ratio($SeederCount, $LeecherCount);
+	$Ratio = Format::get_ratio_html($SeederCount, $LeecherCount);
 	$PeerCount = number_format($SeederCount + $LeecherCount);
 	$SeederCount = number_format($SeederCount);
 	$LeecherCount = number_format($LeecherCount);
@@ -350,7 +350,7 @@
 	$Recommend = $DB->to_array();
 	$Cache->cache_value('recommend',$Recommend,1209600);
 	
-	$Recommend_artists = get_artists($DB->collect('GroupID'));
+	$Recommend_artists = Artists::get_artists($DB->collect('GroupID'));
 	$Cache->cache_value('recommend_artists',$Recommend_artists,1209600);
 }
 
@@ -383,8 +383,8 @@
 ?>
 			<tr>
 				<td>
-					<?=display_artists($Recommend_artists[$GroupID]) ?>
-					<a href="torrents.php?id=<?=$GroupID?>"><?=$GroupName?></a> (by <?=format_username($UserID, false, false, false)?>)
+					<?=Artists::display_artists($Recommend_artists[$GroupID]) ?>
+					<a href="torrents.php?id=<?=$GroupID?>"><?=$GroupName?></a> (by <?=Users::format_username($UserID, false, false, false)?>)
 					<?=$TagStr?>
 				</td>
 			</tr>
@@ -424,7 +424,7 @@
 	</div>
 </div>
 <?
-show_footer(array('disclaimer'=>true));
+View::show_footer(array('disclaimer'=>true));
 
 function contest() {
 	global $DB, $Cache, $LoggedUser;
@@ -458,7 +458,7 @@ function contest() {
 	foreach ($Contest as $User) {
 		list($UserID, $Points, $Username) = $User;
 ?>
-					<li><?=format_username($UserID, false, false, false)?> (<?=number_format($Points)?>)</li>
+					<li><?=Users::format_username($UserID, false, false, false)?> (<?=number_format($Points)?>)</li>
 <?
 	}
 ?>
diff --git a/sections/index/public.php b/sections/index/public.php
index 94451d12..00eb1311 100644
--- a/sections/index/public.php
+++ b/sections/index/public.php
@@ -1,4 +1,4 @@
-<? show_header(); ?>
+<? View::show_header(); ?>
 <div class="poetry">You've stumbled upon a door where your mind is the key. There are none who will lend you guidance; these trials are yours to conquer alone. Entering here will take more than mere logic and strategy, but the criteria are just as hidden as what they reveal. Find yourself, and you will find the very thing hidden behind this page. Beyond here is something like a utopia - beyond here is What.CD.</div>
 <span class="center">This is a mirage.</span>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/log/index.php b/sections/log/index.php
index bbfc5cfa..012b3f9c 100644
--- a/sections/log/index.php
+++ b/sections/log/index.php
@@ -3,7 +3,7 @@
 if (!defined('LOG_ENTRIES_PER_PAGE')) {
 	define('LOG_ENTRIES_PER_PAGE', 100);
 }
-show_header("Site log");
+View::show_header("Site log");
 
 include(SERVER_ROOT.'/sections/log/sphinx.php');
 ?>
@@ -22,14 +22,14 @@
 						<input type="submit" value="Search log" />
 					</td>
 				</tr>
-			</table>	
+			</table>
 		</form>
 	</div>
 
 <? if($TotalMatches > LOG_ENTRIES_PER_PAGE) { ?>
 	<div class="linkbox">
 <?
-	$Pages = get_pages($Page,$TotalMatches,LOG_ENTRIES_PER_PAGE,9);
+	$Pages = Format::get_pages($Page,$TotalMatches,LOG_ENTRIES_PER_PAGE,9);
 	echo $Pages;?>
 	</div>
 <? } ?>
@@ -195,4 +195,4 @@
 	</div>
 </div>
 <?
-show_footer(); ?>
+View::show_footer(); ?>
diff --git a/sections/log/sphinx.php b/sections/log/sphinx.php
index caccda35..049f147d 100644
--- a/sections/log/sphinx.php
+++ b/sections/log/sphinx.php
@@ -1,6 +1,4 @@
 <?
-require(SERVER_ROOT.'/classes/class_sphinxql.php');
-
 if(!empty($_GET['page']) && is_number($_GET['page'])) {
 	$Page = min(SPHINX_MAX_MATCHES/LOG_ENTRIES_PER_PAGE, $_GET['page']);
 	$Offset = ($Page-1)*LOG_ENTRIES_PER_PAGE;
@@ -15,7 +13,7 @@
 		$TotalMatches = 0;
 	} elseif($NumResults == LOG_ENTRIES_PER_PAGE) {
 		// This is a lot faster than SQL_CALC_FOUND_ROWS
-		$SphQL = new SPHINXQL_QUERY();
+		$SphQL = new SphinxQL_Query();
 		$Result = $SphQL->select('id')->from('log, log_delta')->limit(0, 1, 1)->query();
 		$Debug->log_var($Result, '$Result');
 		$TotalMatches = min(SPHINX_MAX_MATCHES, $Result->get_meta('total_found'));
@@ -25,7 +23,7 @@
 	$QueryStatus = 0;
 } else {
 	$Page = min(SPHINX_MAX_MATCHES/TORRENTS_PER_PAGE, $Page);
-	$SphQL = new SPHINXQL_QUERY();
+	$SphQL = new SphinxQL_Query();
 	$SphQL->select('id')
 		->from('log, log_delta')
 		->where_match($_GET['search'], 'message')
diff --git a/sections/log/sql.php b/sections/log/sql.php
index e81f48b0..f52cf0a6 100644
--- a/sections/log/sql.php
+++ b/sections/log/sql.php
@@ -1,5 +1,5 @@
 <?
-list($Page,$Limit) = page_limit(LOG_ENTRIES_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(LOG_ENTRIES_PER_PAGE);
 
 if(!empty($_GET['search'])) {
 	$Search = db_string($_GET['search']);
diff --git a/sections/login/disabled.php b/sections/login/disabled.php
index 3080d387..5ce4c133 100644
--- a/sections/login/disabled.php
+++ b/sections/login/disabled.php
@@ -1,5 +1,5 @@
 <?
-show_header('Disabled');
+View::show_header('Disabled');
 if(empty($_POST['submit']) || empty($_POST['username'])) {
 ?>
 <p class="warning">
@@ -90,5 +90,5 @@ function toggle_visibility(id) {
 </div>
 <?
 }
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/login/index.php b/sections/login/index.php
index a9bcf8c1..b635e41d 100644
--- a/sections/login/index.php
+++ b/sections/login/index.php
@@ -14,7 +14,7 @@
 }
 
 // Check if IP is banned
-if(site_ban_ip($_SERVER['REMOTE_ADDR'])) {
+if(Tools::site_ban_ip($_SERVER['REMOTE_ADDR'])) {
 	error('Your IP has been banned.');
 }
 
@@ -56,7 +56,7 @@
 					$DB->query("UPDATE 
 						users_main AS m,
 						users_info AS i 
-						SET m.PassHash='".db_string(make_crypt_hash($_REQUEST['password']))."',
+						SET m.PassHash='".db_string(Users::make_crypt_hash($_REQUEST['password']))."',
 						i.ResetKey='',
 						i.ResetExpires='0000-00-00 00:00:00' 
 						WHERE m.ID='".db_string($UserID)."' 
@@ -111,7 +111,7 @@
 				if ($UserID) {
 					// Email exists in the database
 					// Set ResetKey, send out email, and set $Sent to 1 to show success page
-					$ResetKey=make_secret();
+					$ResetKey=Users::make_secret();
 					$DB->query("UPDATE users_info SET 
 						ResetKey='".db_string($ResetKey)."',
 						ResetExpires='".time_plus(60*60)."' 
@@ -127,7 +127,7 @@
 					$TPL->set('SITE_NAME',SITE_NAME);
 					$TPL->set('SITE_URL',NONSSL_SITE_URL);
 
-					send_email($Email,'Password reset information for '.SITE_NAME,$TPL->get(),'noreply');
+					Misc::send_email($Email,'Password reset information for '.SITE_NAME,$TPL->get(),'noreply');
 					$Sent=1; // If $Sent is 1, recover_step1.php displays a success message
 					
 					//Log out all of the users current sessions
@@ -185,7 +185,7 @@ function log_attempt($UserID) {
 					WHERE ID='".db_string($AttemptID)."'");
 				
 				if ($Bans>9) { // Automated bruteforce prevention
-					$IP = ip2unsigned($_SERVER['REMOTE_ADDR']);
+					$IP = Tools::ip_to_unsigned($_SERVER['REMOTE_ADDR']);
 					$DB->query("SELECT Reason FROM ip_bans WHERE ".$IP." BETWEEN FromIP AND ToIP");
 					if($DB->record_count() > 0) {
 						//Ban exists already, only add new entry if not for same reason
@@ -236,13 +236,13 @@ function log_attempt($UserID) {
 				AND Username<>''");
 			list($UserID,$PermissionID,$CustomPermissions,$PassHash,$Secret,$Enabled)=$DB->next_record(MYSQLI_NUM, array(2));
 			if (strtotime($BannedUntil)<time()) {
-				if ($UserID && check_password($_POST['password'], $PassHash, $Secret)) {
-					if (!is_crypt_hash($PassHash)) {
-						$CryptHash = make_crypt_hash($_POST['password']);
+				if ($UserID && Users::check_password($_POST['password'], $PassHash, $Secret)) {
+					if (!Users::is_crypt_hash($PassHash)) {
+						$CryptHash = Users::make_crypt_hash($_POST['password']);
 						$DB->query("UPDATE users_main SET passhash = '".db_string($CryptHash)."' WHERE ID = $UserID");
 					}
 					if ($Enabled == 1) {
-						$SessionID = make_secret();
+						$SessionID = Users::make_secret();
 						$Cookie = $Enc->encrypt($Enc->encrypt($SessionID.'|~|'.$UserID));
 
 						if(isset($_POST['keeplogged']) && $_POST['keeplogged']) {
@@ -255,7 +255,7 @@ function log_attempt($UserID) {
 						
 						//TODO: another tracker might enable this for donors, I think it's too stupid to bother adding that
 						// Because we <3 our staff
-						$Permissions = get_permissions($PermissionID);
+						$Permissions = Permissions::get_permissions($PermissionID);
 						$CustomPermissions = unserialize($CustomPermissions);
 						if (
 							isset($Permissions['Permissions']['site_disable_ip_history']) || 
diff --git a/sections/login/login.php b/sections/login/login.php
index a1d645f4..bfe3c74b 100644
--- a/sections/login/login.php
+++ b/sections/login/login.php
@@ -1,4 +1,4 @@
-<? show_header('Login'); ?>
+<? View::show_header('Login'); ?>
 	<span id="no-cookies" class="hidden warning">You appear to have cookies disabled.<br /><br /></span>
 	<noscript><span class="warning">You appear to have javascript disabled.</span><br /><br /></noscript> 
 <?
@@ -63,4 +63,4 @@
 	$('#no-cookies').show();
 }
 </script>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/login/recover_step1.php b/sections/login/recover_step1.php
index 864cb0fb..aa84eda8 100644
--- a/sections/login/recover_step1.php
+++ b/sections/login/recover_step1.php
@@ -1,5 +1,5 @@
 <?
-show_header('Recover Password','validate');
+View::show_header('Recover Password','validate');
 echo $Validate->GenerateJS('recoverform');
 ?>
 <form class="auth_form" name="recovery" id="recoverform" method="post" action="" onsubmit="return formVal();">
@@ -27,5 +27,5 @@
 	</div>
 </form>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/login/recover_step2.php b/sections/login/recover_step2.php
index 6f035787..e764e047 100644
--- a/sections/login/recover_step2.php
+++ b/sections/login/recover_step2.php
@@ -1,5 +1,5 @@
 <?
-show_header('Recover Password','validate');
+View::show_header('Recover Password','validate');
 echo $Validate->GenerateJS('recoverform');
 ?>
 <script src="<?=STATIC_SERVER?>functions/jquery.js" type="text/javascript"></script>
@@ -34,5 +34,5 @@
 	</div>
 </form>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/peerupdate/index.php b/sections/peerupdate/index.php
index e7662a31..db21eee7 100644
--- a/sections/peerupdate/index.php
+++ b/sections/peerupdate/index.php
@@ -6,7 +6,7 @@
 }
 
 if (check_perms('admin_schedule')) {
-	show_header();
+	View::show_header();
 	echo '<pre>';
 }
 
@@ -76,6 +76,6 @@
 
 if (check_perms('admin_schedule')) {	
 	echo '<pre>';
-	show_footer();
+	View::show_footer();
 }
 ?>
diff --git a/sections/register/closed.php b/sections/register/closed.php
index aca9bc7c..c9ba8322 100644
--- a/sections/register/closed.php
+++ b/sections/register/closed.php
@@ -1,9 +1,9 @@
 <?
-show_header('Registration Closed');
+View::show_header('Registration Closed');
 ?>
 <div style="width:500px;">
 	<strong>Sorry, the site is currently invite only.</strong>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/register/code.php b/sections/register/code.php
index c59833ca..1f2abf00 100644
--- a/sections/register/code.php
+++ b/sections/register/code.php
@@ -1,5 +1,5 @@
 <?
-show_header('Register');
+View::show_header('Register');
 ?>
 <div style="width:500px;">
 	<form class="auth_form" name="invite" method="get" action="register.php">
@@ -16,5 +16,5 @@
 	</form>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/register/index.php b/sections/register/index.php
index 4e654e42..6d2307d7 100644
--- a/sections/register/index.php
+++ b/sections/register/index.php
@@ -66,7 +66,7 @@
 		}
 		
 		if(!$Err) {
-			$torrent_pass=make_secret();
+			$torrent_pass=Users::make_secret();
 			
 			//Previously SELECT COUNT(ID) FROM users_main, which is a lot slower.
 			$DB->query("SELECT ID FROM users_main LIMIT 1");
@@ -81,12 +81,12 @@
 				$Enabled = '0';
 			}
 
-			$ipcc = geoip($_SERVER['REMOTE_ADDR']);
+			$ipcc = Tools::geoip($_SERVER['REMOTE_ADDR']);
 			
 			
 			$DB->query("INSERT INTO users_main 
 				(Username,Email,PassHash,torrent_pass,IP,PermissionID,Enabled,Invites,Uploaded,ipcc) VALUES
-				('".db_string(trim($_POST['username']))."','".db_string($_POST['email'])."','".db_string(make_crypt_hash($_POST['password']))."','".db_string($torrent_pass)."','".db_string($_SERVER['REMOTE_ADDR'])."','".$Class."','".$Enabled."','".STARTING_INVITES."', '524288000', '$ipcc')");
+				('".db_string(trim($_POST['username']))."','".db_string($_POST['email'])."','".db_string(Users::make_crypt_hash($_POST['password']))."','".db_string($torrent_pass)."','".db_string($_SERVER['REMOTE_ADDR'])."','".$Class."','".$Enabled."','".STARTING_INVITES."', '524288000', '$ipcc')");
 
 			$UserID = $DB->inserted_id();
 			
@@ -96,7 +96,7 @@
 
 			$DB->query("SELECT ID FROM stylesheets WHERE `Default`='1'");
 			list($StyleID) = $DB->next_record();
-			$AuthKey = make_secret();
+			$AuthKey = Users::make_secret();
 			
 			$DB->query("INSERT INTO users_info (UserID,StyleID,AuthKey, Inviter, JoinDate) VALUES ('$UserID','$StyleID','".db_string($AuthKey)."', '$InviterID', '".sqltime()."')");
 			
@@ -187,8 +187,8 @@
 			$TPL->set('SITE_NAME',SITE_NAME);
 			$TPL->set('SITE_URL',SITE_URL);
 
-			send_email($_REQUEST['email'],'New account confirmation at '.SITE_NAME,$TPL->get(),'noreply');
-			update_tracker('add_user', array('id' => $UserID, 'passkey' => $torrent_pass));
+			Misc::send_email($_REQUEST['email'],'New account confirmation at '.SITE_NAME,$TPL->get(),'noreply');
+			Tracker::update_tracker('add_user', array('id' => $UserID, 'passkey' => $torrent_pass));
 			$Sent=1;
 			
 			
diff --git a/sections/register/step1.php b/sections/register/step1.php
index 06c4c2f9..4ba7513b 100644
--- a/sections/register/step1.php
+++ b/sections/register/step1.php
@@ -1,5 +1,5 @@
 <?
-show_header('Register','validate');
+View::show_header('Register','validate');
 echo $Val->GenerateJS('registerform');
 ?>
 <script src="<?=STATIC_SERVER?>functions/jquery.js" type="text/javascript"></script>
@@ -66,4 +66,4 @@
 </div>
 </form>
 <?
-show_footer();
+View::show_footer();
diff --git a/sections/register/step2.php b/sections/register/step2.php
index c79cb304..4af732a0 100644
--- a/sections/register/step2.php
+++ b/sections/register/step2.php
@@ -1,10 +1,10 @@
 <?
-show_header('Registration Complete');
+View::show_header('Registration Complete');
 ?>
 <div style="width:500px;">
 	<strong>Congratulations! Your account has been created.</strong><br />
 	You can now log into your account using the <a href="login.php">login</a> page.
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/reports/compose.php b/sections/reports/compose.php
index 43f007e6..6767e2f5 100644
--- a/sections/reports/compose.php
+++ b/sections/reports/compose.php
@@ -32,7 +32,7 @@
 if(!$ComposeToUsername) {
 	error(404);
 }
-show_header('Compose', 'inbox,bbcode');
+View::show_header('Compose', 'inbox,bbcode');
 
 switch($Type) {
 	case "user" :
@@ -52,7 +52,7 @@
 			$Error = "No request with the reported ID found";
 		} else {
 			list($Name) = $DB->next_record();
-			$TypeLink = "[url=https://".SSL_SITE_URL."requests.php?action=view&amp;id=".$ThingID."]".display_str($Name)."[/url]";
+			$TypeLink = "[url=https://".SSL_SITE_URL."/requests.php?action=view&amp;id=".$ThingID."]".display_str($Name)."[/url]";
 			$Subject = "Request Report: ". display_str($Name);
 
 		}
@@ -63,7 +63,7 @@
 			$Error = "No collage with the reported ID found";
 		} else {
 			list($Name) = $DB->next_record();
-			$TypeLink = "[url=https://".SSL_SITE_URL."collage.php?id=".$ThingID."]".display_str($Name)."[/url]";
+			$TypeLink = "[url=https://".SSL_SITE_URL."/collage.php?id=".$ThingID."]".display_str($Name)."[/url]";
 			$Subject = "Collage Report: ". display_str($Name);
 
 		}
@@ -74,7 +74,7 @@
 			$Error = "No forum thread with the reported ID found";
 		} else {
 			list($Title) = $DB->next_record();
-			$TypeLink = "[url=https://".SSL_SITE_URL."forums.php?action=viewthread&amp;threadid=".$ThingID."]".display_str($Title)."[/url]";
+			$TypeLink = "[url=https://".SSL_SITE_URL."/forums.php?action=viewthread&amp;threadid=".$ThingID."]".display_str($Title)."[/url]";
 			$Subject = "Thread Report: ". display_str($Title);
 
 		}
@@ -90,7 +90,7 @@
 			$Error =  "No forum post with the reported ID found";
 		} else {
 			list($PostID,$Body,$TopicID,$PostNum) = $DB->next_record();
-			$TypeLink = "[url=https://".SSL_SITE_URL."forums.php?action=viewthread&amp;threadid=".$TopicID."&amp;post=".$PostNum."#post".$PostID."]FORUM POST[/url]";
+			$TypeLink = "[url=https://".SSL_SITE_URL."/forums.php?action=viewthread&amp;threadid=".$TopicID."&amp;post=".$PostNum."#post".$PostID."]FORUM POST[/url]";
 			$Subject = "Post Report";
 
 		}
@@ -102,7 +102,7 @@
 		} else {
 			list($RequestID, $Body, $PostNum) = $DB->next_record();
 			$PageNum = ceil($PostNum / TORRENT_COMMENTS_PER_PAGE);
-			$TypeLink = "[url=https://".SSL_SITE_URL."requests.php?action=view&amp;id=".$RequestID."&amp;page=".$PageNum."#post".$ThingID."]REQUEST COMMENT[/url]";
+			$TypeLink = "[url=https://".SSL_SITE_URL."/requests.php?action=view&amp;id=".$RequestID."&amp;page=".$PageNum."#post".$ThingID."]REQUEST COMMENT[/url]";
 			$Subject = "Request Comment Report";
 
 		}
@@ -114,7 +114,7 @@
 		} else {
 			list($GroupID, $Body, $PostNum) = $DB->next_record();
 			$PageNum = ceil($PostNum / TORRENT_COMMENTS_PER_PAGE);
-			$TypeLink = "[url=https://".SSL_SITE_URL."torrents.php?id=".$GroupID."&amp;page=".$PageNum."#post".$ThingID."]TORRENT COMMENT[/url]";
+			$TypeLink = "[url=https://".SSL_SITE_URL."/torrents.php?id=".$GroupID."&amp;page=".$PageNum."#post".$ThingID."]TORRENT COMMENT[/url]";
 			$Subject = "Torrent Comment Report";
 
 		}
@@ -127,7 +127,7 @@
 			list($CollageID, $Body, $PostNum) = $DB->next_record();
 			$PerPage = POSTS_PER_PAGE;
 			$PageNum = ceil($PostNum / $PerPage);
-			$TypeLink = "[url=https://".SSL_SITE_URL."collage.php?action=comments&amp;collageid=".$CollageID."&amp;page=".$PageNum."#post".$ThingID."]COLLAGE COMMENT[/url]";
+			$TypeLink = "[url=https://".SSL_SITE_URL."/collage.php?action=comments&amp;collageid=".$CollageID."&amp;page=".$PageNum."#post".$ThingID."]COLLAGE COMMENT[/url]";
 			$Subject = "Collage Comment Report";
 		}
 		break;
@@ -173,5 +173,5 @@
 </div>
 
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/reports/report.php b/sections/reports/report.php
index 5789b856..f12719f5 100644
--- a/sections/reports/report.php
+++ b/sections/reports/report.php
@@ -100,7 +100,7 @@
 		break;
 }
 
-show_header('Report a '.$Type['title'],'bbcode');
+View::show_header('Report a '.$Type['title'],'bbcode');
 ?>
 <div class="thin">
 	<div class="header">
@@ -287,5 +287,5 @@
 // close <div class="thin"> ?>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
\ No newline at end of file
diff --git a/sections/reports/reports.php b/sections/reports/reports.php
index 9d136eee..aee59172 100644
--- a/sections/reports/reports.php
+++ b/sections/reports/reports.php
@@ -11,12 +11,12 @@
 include(SERVER_ROOT.'/classes/class_text.php');
 $Text = NEW TEXT;
 
-list($Page,$Limit) = page_limit(REPORTS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(REPORTS_PER_PAGE);
 
 include(SERVER_ROOT.'/sections/reports/array.php');
 
 // Header
-show_header('Reports','bbcode');
+View::show_header('Reports','bbcode');
 
 if($_GET['id'] && is_number($_GET['id'])) {
 	$View = "Single report";
@@ -82,7 +82,7 @@
 	<div class="linkbox">
 <?
 // pagination
-$Pages = get_pages($Page,$Results,REPORTS_PER_PAGE,11);
+$Pages = Format::get_pages($Page,$Results,REPORTS_PER_PAGE,11);
 echo $Pages;
 ?>
 	</div>
@@ -221,5 +221,5 @@
 	</div>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/reports/stats.php b/sections/reports/stats.php
index 1da56f41..0347eb3c 100644
--- a/sections/reports/stats.php
+++ b/sections/reports/stats.php
@@ -4,7 +4,7 @@
 	error(403);
 }
 
-show_header('Other reports stats');
+View::show_header('Other reports stats');
 
 ?>
 <div class="header">
@@ -112,5 +112,5 @@
 		</table>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/reports/takecompose.php b/sections/reports/takecompose.php
index 35ec6a1e..4532e9b8 100644
--- a/sections/reports/takecompose.php
+++ b/sections/reports/takecompose.php
@@ -48,7 +48,7 @@
 	die();
 }
 
-$ConvID = send_pm($ToID,$LoggedUser['ID'],db_string($Subject),db_string($Body),$ConvID);
+$ConvID = Misc::send_pm($ToID,$LoggedUser['ID'],db_string($Subject),db_string($Body),$ConvID);
 
 header('Location: reports.php');
 ?>
diff --git a/sections/reportsv2/ajax_new_report.php b/sections/reportsv2/ajax_new_report.php
index b98ea5bd..393497a3 100644
--- a/sections/reportsv2/ajax_new_report.php
+++ b/sections/reportsv2/ajax_new_report.php
@@ -289,7 +289,7 @@
 									GROUP BY tg.ID");
 						
 						list($ExtraGroupName, $ExtraGroupID, $ExtraArtistID, $ExtraArtistName, $ExtraYear, $ExtraTime, $ExtraRemastered, $ExtraRemasterTitle, 
-							$ExtraRemasterYear, $ExtraMedia, $ExtraFormat, $ExtraEncoding, $ExtraSize, $ExtraHasCue, $ExtraHasLog, $ExtraLogScore, $ExtraUploaderID, $ExtraUploaderName) = display_array($DB->next_record());
+							$ExtraRemasterYear, $ExtraMedia, $ExtraFormat, $ExtraEncoding, $ExtraSize, $ExtraHasCue, $ExtraHasLog, $ExtraLogScore, $ExtraUploaderID, $ExtraUploaderName) = Misc::display_array($DB->next_record());
 						
 					
 					if($ExtraGroupName) {
diff --git a/sections/reportsv2/ajax_take_pm.php b/sections/reportsv2/ajax_take_pm.php
index 5ef52061..1f607667 100644
--- a/sections/reportsv2/ajax_take_pm.php
+++ b/sections/reportsv2/ajax_take_pm.php
@@ -70,5 +70,5 @@
 if(isset($Err)) {
 	echo $Err;
 } else {
-	send_pm($ToID, $LoggedUser['ID'], db_string($Subject), db_string($Message));
+	Misc::send_pm($ToID, $LoggedUser['ID'], db_string($Subject), db_string($Message));
 }
diff --git a/sections/reportsv2/report.php b/sections/reportsv2/report.php
index f3bb9c2c..44799e78 100644
--- a/sections/reportsv2/report.php
+++ b/sections/reportsv2/report.php
@@ -15,7 +15,7 @@
 	list($CategoryID) = $DB->next_record();
 }
 
-show_header('Report', 'reportsv2');
+View::show_header('Report', 'reportsv2');
 ?>
 
 <div class="thin">
@@ -83,5 +83,5 @@
 	</form>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
\ No newline at end of file
diff --git a/sections/reportsv2/reports.php b/sections/reportsv2/reports.php
index 258250cc..efbfe984 100644
--- a/sections/reportsv2/reports.php
+++ b/sections/reportsv2/reports.php
@@ -8,7 +8,7 @@
 	error(403);
 }
 
-show_header('Reports V2!', 'reportsv2');
+View::show_header('Reports V2!', 'reportsv2');
 ?>
 <script type="text/javascript">
 function Taste(torrent_id, report_id, taste) {
@@ -37,5 +37,5 @@ function Taste(torrent_id, report_id, taste) {
 <div id="all_reports" style="width: 80%; margin-left: auto; margin-right: auto">
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/reportsv2/search.php b/sections/reportsv2/search.php
index a4639364..58a7df40 100644
--- a/sections/reportsv2/search.php
+++ b/sections/reportsv2/search.php
@@ -6,7 +6,7 @@
 	error(403);
 }
 
-show_header('Reports V2!', 'reportsv2');
+View::show_header('Reports V2!', 'reportsv2');
 
 ?>
 <div class="header">
@@ -16,5 +16,5 @@
 <br />
 On hold until FZeroX fixes the main torrents search; then I will steal all his work and claim it as my own.
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/reportsv2/static.php b/sections/reportsv2/static.php
index dbdd5278..844c4a3a 100644
--- a/sections/reportsv2/static.php
+++ b/sections/reportsv2/static.php
@@ -17,7 +17,7 @@
 $Text = NEW TEXT;
 
 define('REPORTS_PER_PAGE', '10');
-list($Page,$Limit) = page_limit(REPORTS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(REPORTS_PER_PAGE);
 
 
 if(isset($_GET['view'])){
@@ -184,9 +184,9 @@
 
 $DB->query('SELECT FOUND_ROWS()');
 list($Results) = $DB->next_record();
-$PageLinks=get_pages($Page,$Results,REPORTS_PER_PAGE,11);
+$PageLinks=Format::get_pages($Page,$Results,REPORTS_PER_PAGE,11);
 
-show_header('Reports V2!', 'reportsv2,bbcode');
+View::show_header('Reports V2!', 'reportsv2,bbcode');
 
 ?>
 <div class="header">
@@ -225,7 +225,7 @@
 		
 		list($ReportID, $ReporterID, $ReporterName, $TorrentID, $Type, $UserComment, $ResolverID, $ResolverName, $Status, $ReportedTime, $LastChangeTime, 
 			$ModComment, $Tracks, $Images, $ExtraIDs, $Links, $LogMessage, $GroupName, $GroupID, $ArtistID, $ArtistName, $Year, $CategoryID, $Time, $Remastered, $RemasterTitle, 
-			$RemasterYear, $Media, $Format, $Encoding, $Size, $HasCue, $HasLog, $LogScore, $UploaderID, $UploaderName) = display_array($Report, array("ModComment"));
+			$RemasterYear, $Media, $Format, $Encoding, $Size, $HasCue, $HasLog, $LogScore, $UploaderID, $UploaderName) = Misc::display_array($Report, array("ModComment"));
 		
 		if(!$GroupID && $Status != "Resolved") {
 			//Torrent already deleted
@@ -438,7 +438,7 @@
 									GROUP BY tg.ID");
 						
 						list($ExtraGroupName, $ExtraGroupID, $ExtraArtistID, $ExtraArtistName, $ExtraYear, $ExtraTime, $ExtraRemastered, $ExtraRemasterTitle, 
-							$ExtraRemasterYear, $ExtraMedia, $ExtraFormat, $ExtraEncoding, $ExtraSize, $ExtraHasCue, $ExtraHasLog, $ExtraLogScore, $ExtraUploaderID, $ExtraUploaderName) = display_array($DB->next_record());
+							$ExtraRemasterYear, $ExtraMedia, $ExtraFormat, $ExtraEncoding, $ExtraSize, $ExtraHasCue, $ExtraHasLog, $ExtraLogScore, $ExtraUploaderID, $ExtraUploaderName) = Misc::display_array($DB->next_record());
 						
 						if($ExtraGroupName) {
 			if ($ArtistID == 0 && empty($ArtistName)) {
@@ -650,5 +650,5 @@
 	<?=$PageLinks?>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/reportsv2/takeresolve.php b/sections/reportsv2/takeresolve.php
index 9b923061..4c0eb007 100644
--- a/sections/reportsv2/takeresolve.php
+++ b/sections/reportsv2/takeresolve.php
@@ -180,13 +180,13 @@
 		}
 		$DB->query("SELECT GroupID, hex(info_hash) FROM torrents WHERE ID = ".$TorrentID);
 		list($GroupID, $InfoHash) = $DB->next_record();
-		delete_torrent($TorrentID, 0, $ResolveType['reason']);
+		Torrents::delete_torrent($TorrentID, 0, $ResolveType['reason']);
 		
 		//$InfoHash = unpack("H*", $InfoHash);
 		$Log .= " (".strtoupper($InfoHash).")";
-		write_log($Log);
+		Misc::write_log($Log);
 		$Log = "deleted torrent for the reason: ".$ResolveType['title'].". ( ".$Escaped['log_message']." )";
-		write_group_log($GroupID, $TorrentID, $LoggedUser['ID'], $Log, 0);
+		Torrents::write_group_log($GroupID, $TorrentID, $LoggedUser['ID'], $Log, 0);
 	} else {
 		$Log = "No log message (Torrent wasn't deleted)";
 	}
@@ -212,7 +212,7 @@
 			$Reason .= " (Upload privileges Removed).";
 		}
 
-		warn_user($UploaderID, $WarnLength, $Reason);
+		Tools::warn_user($UploaderID, $WarnLength, $Reason);
 	} else {
 		//This is a bitch for people that don't warn but do other things, it makes me sad.
 		$AdminComment = "";
@@ -266,7 +266,7 @@
 		
 		$PM .= "\n\nReport was handled by [user]".$LoggedUser['Username']."[/user].";
 		
-		send_pm($UploaderID, 0, db_string($Escaped['raw_name']), db_string($PM));
+		Misc::send_pm($UploaderID, 0, db_string($Escaped['raw_name']), db_string($PM));
 	}
 
 	$Cache->delete_value('reports_torrent_'.$TorrentID);
diff --git a/sections/reportsv2/views.php b/sections/reportsv2/views.php
index 6dfde92a..3c520a69 100644
--- a/sections/reportsv2/views.php
+++ b/sections/reportsv2/views.php
@@ -9,7 +9,7 @@
 	error(403);
 }
 
-show_header('Reports V2!', 'reportsv2');
+View::show_header('Reports V2!', 'reportsv2');
 
 
 //Grab owners ID, just for examples
@@ -247,5 +247,5 @@
 	</td></tr></table>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/requests/interim.php b/sections/requests/interim.php
index 56b3d9fb..7f408b1b 100644
--- a/sections/requests/interim.php
+++ b/sections/requests/interim.php
@@ -19,7 +19,7 @@
 	}
 }
 
-show_header(ucwords($Action)." Request");
+View::show_header(ucwords($Action)." Request");
 ?>
 <div class="thin center">
 	<div class="box" style="width:600px; margin:0px auto;">
@@ -42,5 +42,5 @@
 	</div>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
\ No newline at end of file
diff --git a/sections/requests/new_edit.php b/sections/requests/new_edit.php
index 6a80d840..96399967 100644
--- a/sections/requests/new_edit.php
+++ b/sections/requests/new_edit.php
@@ -24,7 +24,7 @@
 if(!$NewRequest) {
 	if(empty($ReturnEdit)) {
 		
-		$Request = get_requests(array($RequestID));
+		$Request = Requests::get_requests(array($RequestID));
 		$Request = $Request['matches'][$RequestID];
 		if(empty($Request)) {
 			error(404);
@@ -102,7 +102,7 @@
 		3 => array()
 	);
 } elseif($NewRequest && !empty($_GET['groupid']) && is_number($_GET['groupid'])) {
-	$ArtistForm = get_artist($_GET['groupid']);
+	$ArtistForm = Artists::get_artist($_GET['groupid']);
 	$DB->query("SELECT tg.Name, 
 					tg.Year, 
 					tg.ReleaseType, 
@@ -118,7 +118,7 @@
 	}
 }
 
-show_header(($NewRequest ? "Create a request" : "Edit a request"), 'requests');
+View::show_header(($NewRequest ? "Create a request" : "Edit a request"), 'requests');
 ?>
 <div class="thin">
 	<div class="header">
@@ -146,7 +146,7 @@
 					</td>
 					<td>
 						<select id="categories" name="type" onchange="Categories()">
-<?		foreach(display_array($Categories) as $Cat){ ?>
+<?		foreach(Misc::display_array($Categories) as $Cat){ ?>
 							<option value='<?=$Cat?>' <?=(!empty($CategoryName) && ($CategoryName ==  $Cat) ? 'selected="selected"' : '')?>><?=$Cat?></option>
 <?		} ?>
 						</select>
@@ -246,7 +246,7 @@
 ?>
 						<select id="genre_tags" name="genre_tags" onchange="add_tag();return false;" >
 							<option>---</option>
-<?	foreach(display_array($GenreTags) as $Genre){ ?>
+<?	foreach(Misc::display_array($GenreTags) as $Genre){ ?>
 							<option value="<?=$Genre ?>"><?=$Genre ?></option>
 <?	} ?>
 						</select>
@@ -368,8 +368,8 @@
 						<input type="hidden" id="current_uploaded" value="<?=$LoggedUser['BytesUploaded']?>" />
 						<input type="hidden" id="current_downloaded" value="<?=$LoggedUser['BytesDownloaded']?>" />
 						If you add the entered <strong><span id="new_bounty">100.00 MB</span></strong> of bounty, your new stats will be: <br/>
-						Uploaded: <span id="new_uploaded"><?=get_size($LoggedUser['BytesUploaded'])?></span>
-						Ratio: <span id="new_ratio"><?=ratio($LoggedUser['BytesUploaded'],$LoggedUser['BytesDownloaded'])?></span>
+						Uploaded: <span id="new_uploaded"><?=Format::get_size($LoggedUser['BytesUploaded'])?></span>
+						Ratio: <span id="new_ratio"><?=Format::get_ratio_html($LoggedUser['BytesUploaded'],$LoggedUser['BytesDownloaded'])?></span>
 					</td>
 				</tr>
 				<tr>
@@ -391,5 +391,5 @@
 	</div>
 </div>
 <?
-show_footer(); 
+View::show_footer(); 
 ?>
diff --git a/sections/requests/request.php b/sections/requests/request.php
index 77e57672..84d16056 100644
--- a/sections/requests/request.php
+++ b/sections/requests/request.php
@@ -18,7 +18,7 @@
 
 //First things first, lets get the data for the request.
 
-$Request = get_requests(array($RequestID));	
+$Request = Requests::get_requests(array($RequestID));	
 $Request = $Request['matches'][$RequestID];
 if(empty($Request)) {
 	error(404);
@@ -40,8 +40,8 @@
 //Do we need to get artists?
 if($CategoryName == "Music") {
 	$ArtistForm = get_request_artists($RequestID);
-	$ArtistName = display_artists($ArtistForm, false, true);
-	$ArtistLink = display_artists($ArtistForm, true, true);
+	$ArtistName = Artists::display_artists($ArtistForm, false, true);
+	$ArtistLink = Artists::display_artists($ArtistForm, true, true);
 	
 	if($IsFilled) {
 		$DisplayLink = $ArtistLink."<a href='torrents.php?torrentid=".$TorrentID."'>".$Title."</a> [".$Year."]";
@@ -81,7 +81,7 @@
 $UserCanEdit = (!$IsFilled && $LoggedUser['ID'] == $RequestorID && $VoteCount < 2);
 $CanEdit = ($UserCanEdit || $ProjectCanEdit || check_perms('site_moderate_requests'));
 
-show_header('View request: '.$FullName, 'comments,requests,bbcode');
+View::show_header('View request: '.$FullName, 'comments,requests,bbcode');
 
 ?>
 <div class="thin">
@@ -150,7 +150,7 @@
 <?			foreach($ArtistForm[4] as $Artist) {
 ?>
 				<li class="artists_composer">
-					<?=display_artist($Artist)?>
+					<?=Artists::display_artist($Artist)?>
 				</li>
 <?			}
 		}
@@ -160,7 +160,7 @@
 <?			foreach($ArtistForm[6] as $Artist) {
 ?>
 				<li class="artists_dj">
-					<?=display_artist($Artist)?>
+					<?=Artists::display_artist($Artist)?>
 				</li>
 <?
 			}
@@ -173,7 +173,7 @@
 		foreach($ArtistForm[1] as $Artist) {
 ?>
 				<li class="artists_main">
-					<?=display_artist($Artist)?>
+					<?=Artists::display_artist($Artist)?>
 				</li>
 <?		}
 		if(!empty($ArtistForm[2]) && count($ArtistForm[2]) > 0) { 
@@ -182,7 +182,7 @@
 <?			foreach($ArtistForm[2] as $Artist) {
 ?>
 				<li class="artists_with">
-					<?=display_artist($Artist)?>
+					<?=Artists::display_artist($Artist)?>
 				</li>
 <?			}
 		}
@@ -192,7 +192,7 @@
 <?			foreach($ArtistForm[5] as $Artist) {
 ?>
 				<li class="artist_guest">
-					<?=display_artist($Artist)?>
+					<?=Artists::display_artist($Artist)?>
 				</li>
 <?			}
 		}
@@ -202,7 +202,7 @@
 <?			foreach($ArtistForm[3] as $Artist) {
 ?>
 				<li class="artists_remix">
-					<?=display_artist($Artist)?>
+					<?=Artists::display_artist($Artist)?>
 				</li>
 <?
 			}
@@ -213,7 +213,7 @@
 <?			foreach($ArtistForm[7] as $Artist) {
 ?>
 				<li class="artists_remix">
-					<?=display_artist($Artist)?>
+					<?=Artists::display_artist($Artist)?>
 				</li>
 <?
 			}
@@ -251,7 +251,7 @@
 						<a href="user.php?id=<?=$User['UserID']?>"><?=$Boldify?'<strong>':''?><?=display_str($User['Username'])?><?=$Boldify?'</strong>':''?></a>
 					</td>
 					<td>
-						<?=$Boldify?'<strong>':''?><?=get_size($User['Bounty'])?><?=$Boldify?'</strong>':''?>
+						<?=$Boldify?'<strong>':''?><?=Format::get_size($User['Bounty'])?><?=$Boldify?'</strong>':''?>
 					</td>
 				</tr>
 <?	} 
@@ -264,7 +264,7 @@
 						<a href="user.php?id=<?=$User['UserID']?>"><strong><?=display_str($User['Username'])?></strong></a>
 					</td>
 					<td>
-						<strong><?=get_size($User['Bounty'])?></strong>
+						<strong><?=Format::get_size($User['Bounty'])?></strong>
 					</td>
 				</tr>
 <?			}
@@ -279,7 +279,7 @@
 			<tr>
 				<td class="label">Created</td>
 				<td>
-					<?=time_diff($TimeAdded)?>	by  <strong><?=format_username($RequestorID, false, false, false)?></strong>
+					<?=time_diff($TimeAdded)?>	by  <strong><?=Users::format_username($RequestorID, false, false, false)?></strong>
 				</td>
 			</tr>			
 <?	if($CategoryName == "Music") {
@@ -353,9 +353,9 @@
 		</tr>
 <? 	}
 	if ($GroupID) {
-		/*$Groups = get_groups(array($GroupID), true, true, false);
+		/*$Groups = Torrents::get_groups(array($GroupID), true, true, false);
 		$Group = $Groups['matches'][$GroupID];
-		$GroupLink = display_artists($Group['ExtendedArtists']).'<a href="torrents.php?id='.$GroupID.'">'.$Group['Name'].'</a>';*/
+		$GroupLink = Artists::display_artists($Group['ExtendedArtists']).'<a href="torrents.php?id='.$GroupID.'">'.$Group['Name'].'</a>';*/
 ?>
 			<tr>
 				<td class="label">Torrent Group</td>
@@ -368,7 +368,7 @@
 					<span id="votecount"><?=$VoteCount?></span> 
 <?	if($CanVote) { ?>
 					&nbsp;<a href="javascript:Vote(0)"><strong>(+)</strong></a>
-					<strong>Costs <?=get_size($MinimumVote, 0)?></strong>
+					<strong>Costs <?=Format::get_size($MinimumVote, 0)?></strong>
 <?	} ?> 
 				</td>
 			</tr>
@@ -408,8 +408,8 @@
 						<input type="hidden" id="current_rr" value="<?=(float)$LoggedUser['RequiredRatio']?>" />
 						<input id="total_bounty" type="hidden" value="<?=$RequestVotes['TotalBounty']?>" />
 						If you add the entered <strong><span id="new_bounty">0.00 MB</span></strong> of bounty, your new stats will be: <br/>
-						Uploaded: <span id="new_uploaded"><?=get_size($LoggedUser['BytesUploaded'])?></span>
-						Ratio: <span id="new_ratio"><?=ratio($LoggedUser['BytesUploaded'],$LoggedUser['BytesDownloaded'])?></span>
+						Uploaded: <span id="new_uploaded"><?=Format::get_size($LoggedUser['BytesUploaded'])?></span>
+						Ratio: <span id="new_ratio"><?=Format::get_ratio_html($LoggedUser['BytesUploaded'],$LoggedUser['BytesDownloaded'])?></span>
 						<input type="button" id="button" value="Vote!" disabled="disabled" onclick="Vote();" />
 					</form>
 				</td>
@@ -417,7 +417,7 @@
 <? }?> 
 			<tr id="bounty">
 				<td class="label">Bounty</td>
-				<td id="formatted_bounty"><?=get_size($RequestVotes['TotalBounty'])?></td>
+				<td id="formatted_bounty"><?=Format::get_size($RequestVotes['TotalBounty'])?></td>
 			</tr>
 <?
 	if($IsFilled) {
@@ -427,7 +427,7 @@
 				<td class="label">Filled</td>
 				<td>
 					<strong><a href="torrents.php?<?=(strtotime($TimeFilled)<$TimeCompare?'id=':'torrentid=').$TorrentID?>">Yes</a></strong>, 
-					by user <?=format_username($FillerID, false, false, false)?>
+					by user <?=Users::format_username($FillerID, false, false, false)?>
 <?		if($LoggedUser['ID'] == $RequestorID || $LoggedUser['ID'] == $FillerID || check_perms('site_moderate_requests')) { ?>
 						<strong><a href="requests.php?action=unfill&amp;id=<?=$RequestID?>">(Unfill)</a></strong> Unfilling a request without a valid, nontrivial reason will result in a warning. 
 <?		} ?>
@@ -475,7 +475,7 @@
 	$Cache->cache_value('request_comments_'.$RequestID, $Results, 0);
 }
 
-list($Page,$Limit) = page_limit(TORRENT_COMMENTS_PER_PAGE,$Results);
+list($Page,$Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE,$Results);
 
 //Get the cache catalogue
 $CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE*$Page-TORRENT_COMMENTS_PER_PAGE)/THREAD_CATALOGUE);
@@ -508,7 +508,7 @@
 ?>
 	<div class="linkbox"><a name="comments"></a>
 <?
-$Pages=get_pages($Page,$Results,TORRENT_COMMENTS_PER_PAGE,9,'#comments');
+$Pages=Format::get_pages($Page,$Results,TORRENT_COMMENTS_PER_PAGE,9,'#comments');
 echo $Pages;
 ?>
 	</div>
@@ -517,13 +517,13 @@
 //---------- Begin printing
 foreach($Thread as $Key => $Post){
 	list($PostID, $AuthorID, $AddedTime, $Body, $EditedUserID, $EditedTime, $EditedUsername) = array_values($Post);
-	list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(user_info($AuthorID));
+	list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(Users::user_info($AuthorID));
 ?>
 <table class="forum_post box vertical_margin<?=$HeavyInfo['DisableAvatars'] ? ' noavatar' : ''?>" id="post<?=$PostID?>">
 	<tr class="colhead_dark">
 		<td colspan="2">
 			<span style="float:left;"><a href='#post<?=$PostID?>'>#<?=$PostID?></a>
-				by <strong><?=format_username($AuthorID, true, true, true, true)?></strong> <?=time_diff($AddedTime)?> <a href="reports.php?action=report&amp;type=requests_comment&amp;id=<?=$PostID?>">[Report Comment]</a>
+				by <strong><?=Users::format_username($AuthorID, true, true, true, true)?></strong> <?=time_diff($AddedTime)?> <a href="reports.php?action=report&amp;type=requests_comment&amp;id=<?=$PostID?>">[Report Comment]</a>
 				- <a href="#quickpost" onclick="Quote('<?=$PostID?>','<?=$Username?>');">[Quote]</a>
 <?if ($AuthorID == $LoggedUser['ID'] || check_perms('site_moderate_forums')){ ?>				- <a href="#post<?=$PostID?>" onclick="Edit_Form('<?=$PostID?>','<?=$Key?>');">[Edit]</a><? }
 if (check_perms('site_moderate_forums')){ ?>				- <a href="#post<?=$PostID?>" onclick="Delete('<?=$PostID?>');">[Delete]</a> <? } ?>
@@ -557,7 +557,7 @@
 				<a href="#content<?=$PostID?>" onclick="LoadEdit('requests', <?=$PostID?>, 1); return false;">&laquo;</a> 
 <? 	} ?>
 				Last edited by
-				<?=format_username($EditedUserID, false, false, false) ?> <?=time_diff($EditedTime,2,true,true)?>
+				<?=Users::format_username($EditedUserID, false, false, false) ?> <?=time_diff($EditedTime,2,true,true)?>
 <? } ?>
 			</div>
 		</td>
@@ -576,7 +576,7 @@
 					<tr class="colhead_dark">
 						<td colspan="2">
 							<span style="float:left;"><a href='#quickreplypreview'>#XXXXXX</a>
-								by <strong><?=format_username($LoggedUser['ID'], true, true, true, true)?> Just now
+								by <strong><?=Users::format_username($LoggedUser['ID'], true, true, true, true)?> Just now
 								<a href="#quickreplypreview">[Report Comment]</a>
 							</span>
 							<span style="float:right;">
@@ -611,4 +611,4 @@
 <? } ?>
 	</div>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/requests/requests.php b/sections/requests/requests.php
index cd8b2799..0f128022 100644
--- a/sections/requests/requests.php
+++ b/sections/requests/requests.php
@@ -3,12 +3,12 @@
 $Queries = array();
 
 $OrderWays = array('year', 'votes', 'bounty', 'created', 'lastvote', 'filled');
-list($Page,$Limit) = page_limit(REQUESTS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(REQUESTS_PER_PAGE);
 $Submitted = !empty($_GET['submit']);
 					
 //Paranoia					
-$UserInfo = user_info((int)$_GET['userid']);
-$Perms = get_permissions($UserInfo['PermissionID']);
+$UserInfo = Users::user_info((int)$_GET['userid']);
+$Perms = Permissions::get_permissions($UserInfo['PermissionID']);
 $UserClass = $Perms['Class'];
 
 $BookmarkView = false;
@@ -176,14 +176,14 @@
 	foreach($Tags as $Tag) {
 		$Tag = ltrim($Tag);
 		$Exclude = ($Tag[0] == '!');
-		$Tag = sanitize_tag($Tag);
+		$Tag = Misc::sanitize_tag($Tag);
 		if(!empty($Tag)) {
 			$TagNames[] = $Tag;
 			$TagsExclude[$Tag] = $Exclude;
 		}
 	}
 	$AllNegative = !in_array(false, $TagsExclude);
-	$Tags = get_tags($TagNames);
+	$Tags = Misc::get_tags($TagNames);
 
 	// Replace the ! characters that sanitize_tag removed
 	if($TagType == 1 || $AllNegative) {
@@ -318,13 +318,13 @@
 $SphinxResults = $SS->search($Query, '', 0, array(), '', '');
 $NumResults = $SS->TotalResults;
 if($NumResults && $NumResults < ($Page - 1) * REQUESTS_PER_PAGE + 1) {
-	$PageLinks = get_pages(0, $NumResults, REQUESTS_PER_PAGE);
+	$PageLinks = Format::get_pages(0, $NumResults, REQUESTS_PER_PAGE);
 } else {
-	$PageLinks = get_pages($Page, $NumResults, REQUESTS_PER_PAGE);
+	$PageLinks = Format::get_pages($Page, $NumResults, REQUESTS_PER_PAGE);
 }
 
-$CurrentURL = get_url(array('order', 'sort'));
-show_header($Title, 'requests');
+$CurrentURL = Format::get_url(array('order', 'sort'));
+View::show_header($Title, 'requests');
 
 ?>
 <div class="thin">
@@ -370,8 +370,8 @@
 				<td class="label">Tags (comma-separated):</td>
 				<td>
 					<input type="text" name="tags" size="60" value="<?= (!empty($TagNames) ? display_str(implode(', ', $TagNames)) : '') ?>" />&nbsp;
-					<input type="radio" name="tags_type" id="tags_type0" value="0" <?selected('tags_type',0,'checked')?> /><label for="tags_type0"> Any</label>&nbsp;&nbsp;
-					<input type="radio" name="tags_type" id="tags_type1" value="1"  <?selected('tags_type',1,'checked')?> /><label for="tags_type1"> All</label>
+					<input type="radio" name="tags_type" id="tags_type0" value="0" <?Format::selected('tags_type',0,'checked')?> /><label for="tags_type0"> Any</label>&nbsp;&nbsp;
+					<input type="radio" name="tags_type" id="tags_type1" value="1"  <?Format::selected('tags_type',1,'checked')?> /><label for="tags_type1"> All</label>
 				</td>
 			</tr>
 			<tr>
@@ -535,7 +535,7 @@
 
 	//We don't use sphinxapi's default cache searcher, we use our own functions
 	if(!empty($SphinxResults['notfound'])) {
-		$SQLResults = get_requests($SphinxResults['notfound']);
+		$SQLResults = Requests::get_requests($SphinxResults['notfound']);
 		if(is_array($SQLResults['notfound'])) {
 			//Something wasn't found in the db, remove it from results
 			reset($SQLResults['notfound']);
@@ -582,7 +582,7 @@
 			
 			if($CategoryName == "Music") {
 				$ArtistForm = get_request_artists($RequestID);
-				$ArtistLink = display_artists($ArtistForm, true, true);
+				$ArtistLink = Artists::display_artists($ArtistForm, true, true);
 				$FullName = $ArtistLink."<a href='requests.php?action=view&amp;id=".$RequestID."'>".$Title." [".$Year."]</a>";
 			} else if($CategoryName == "Audiobooks" || $CategoryName == "Comedy") {
 				$FullName = "<a href='requests.php?action=view&amp;id=".$RequestID."'>".$Title." [".$Year."]</a>";
@@ -621,7 +621,7 @@
 <?			} ?>
 			</td>
 			<td class="nobr">
-				<?=get_size($RequestVotes['TotalBounty'])?>
+				<?=Format::get_size($RequestVotes['TotalBounty'])?>
 			</td>
 			<td>
 <?   		if($IsFilled){ ?>
@@ -657,5 +657,5 @@
 	</div>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/requests/requests.php.presphinx b/sections/requests/requests.php.presphinx
index 68ea713c..8815b4aa 100644
--- a/sections/requests/requests.php.presphinx
+++ b/sections/requests/requests.php.presphinx
@@ -21,7 +21,7 @@ if(!empty($_GET['tags'])){
 	$Tags = explode(',', $_GET['tags']);
 	$TagNames = array();
 	foreach ($Tags as $Tag){
-		$Tag = sanitize_tag($Tag);
+		$Tag = Misc::sanitize_tag($Tag);
 		if(!empty($Tag)) {
 			$TagNames[] = $Tag;
 		}
diff --git a/sections/requests/takedelete.php b/sections/requests/takedelete.php
index 2609ca46..f7dbd924 100644
--- a/sections/requests/takedelete.php
+++ b/sections/requests/takedelete.php
@@ -26,7 +26,7 @@
 //Do we need to get artists?
 if($CategoryName == "Music") {
 	$ArtistForm = get_request_artists($RequestID);
-	$ArtistName = display_artists($ArtistForm, false, true);
+	$ArtistName = Artists::display_artists($ArtistForm, false, true);
 	$FullName = $ArtistName.$Title;	
 } else {
 	$FullName = $Title;
@@ -46,17 +46,17 @@
 $DB->query("DELETE FROM requests_artists WHERE RequestID='$RequestID'");
 
 if($UserID != $LoggedUser['ID']) {
-	send_pm($UserID, 0, db_string("A request you created has been deleted"), db_string("The request '".$FullName."' was deleted by [url=http://".NONSSL_SITE_URL."/user.php?id=".$LoggedUser['ID']."]".$LoggedUser['Username']."[/url] for the reason: ".$_POST['reason']));
+	Misc::send_pm($UserID, 0, db_string("A request you created has been deleted"), db_string("The request '".$FullName."' was deleted by [url=http://".NONSSL_SITE_URL."/user.php?id=".$LoggedUser['ID']."]".$LoggedUser['Username']."[/url] for the reason: ".$_POST['reason']));
 }
 
-write_log("Request $RequestID ($FullName) was deleted by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].") for the reason: ".$_POST['reason']);
+Misc::write_log("Request $RequestID ($FullName) was deleted by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].") for the reason: ".$_POST['reason']);
 
 $Cache->delete_value('request_'.$RequestID);
 $Cache->delete_value('request_votes_'.$RequestID);
 if ($GroupID) {
 	$Cache->delete_value('requests_group_'.$GroupID);
 }
-update_sphinx_requests($RequestID);
+Requests::update_sphinx_requests($RequestID);
 
 header('Location: requests.php');
 ?>
diff --git a/sections/requests/takefill.php b/sections/requests/takefill.php
index 1060be7f..4a94cc9d 100644
--- a/sections/requests/takefill.php
+++ b/sections/requests/takefill.php
@@ -171,7 +171,7 @@
 
 if($CategoryName == "Music") {
 	$ArtistForm = get_request_artists($RequestID);
-	$ArtistName = display_artists($ArtistForm, false, true);
+	$ArtistName = Artists::display_artists($ArtistForm, false, true);
 	$FullName = $ArtistName.$Title;
 } else {
 	$FullName = $Title;
@@ -181,11 +181,11 @@
 $UserIDs = $DB->to_array();
 foreach ($UserIDs as $User) {
 	list($VoterID) = $User;
-	send_pm($VoterID, 0, db_string("The request '".$FullName."' has been filled"), db_string("One of your requests - [url=http://".NONSSL_SITE_URL."/requests.php?action=view&amp;id=".$RequestID."]".$FullName."[/url] - has been filled. You can view it at [url]http://".NONSSL_SITE_URL."/torrents.php?torrentid=".$TorrentID."[/url]"), '');
+	Misc::send_pm($VoterID, 0, db_string("The request '".$FullName."' has been filled"), db_string("One of your requests - [url=http://".NONSSL_SITE_URL."/requests.php?action=view&amp;id=".$RequestID."]".$FullName."[/url] - has been filled. You can view it at [url]http://".NONSSL_SITE_URL."/torrents.php?torrentid=".$TorrentID."[/url]"), '');
 }
 
 $RequestVotes = get_votes_array($RequestID);
-write_log("Request ".$RequestID." (".$FullName.") was filled by user ".$FillerID." (".$FillerUsername.") with the torrent ".$TorrentID.", for a ".get_size($RequestVotes['TotalBounty'])." bounty.");
+Misc::write_log("Request ".$RequestID." (".$FullName.") was filled by user ".$FillerID." (".$FillerUsername.") with the torrent ".$TorrentID.", for a ".Format::get_size($RequestVotes['TotalBounty'])." bounty.");
 
 // Give bounty
 $DB->query("UPDATE users_main
@@ -209,7 +209,7 @@
 }
 
 $SS->UpdateAttributes('requests', array('torrentid','fillerid'), array($RequestID => array((int)$TorrentID,(int)$FillerID)));
-update_sphinx_requests($RequestID);
+Requests::update_sphinx_requests($RequestID);
 
 header('Location: requests.php?action=view&id='.$RequestID);
 ?>
diff --git a/sections/requests/takenew_edit.php b/sections/requests/takenew_edit.php
index b3e18032..34d97816 100644
--- a/sections/requests/takenew_edit.php
+++ b/sections/requests/takenew_edit.php
@@ -26,7 +26,7 @@
 		error(0);
 	}
 	
-	$Request = get_requests(array($RequestID));
+	$Request = Requests::get_requests(array($RequestID));
 	$Request = $Request['matches'][$RequestID];
 	if(empty($Request)) {
 		error(404);
@@ -452,7 +452,7 @@
 			list($GroupCount) = $DB->next_record();
 			if(($ReqCount + $GroupCount) == 0) {
 				//The only group to use this artist
-				delete_artist($ArtistID);
+				Artists::delete_artist($ArtistID);
 			} else {
 				//Not the only group, still need to clear cache
 				$Cache->delete_value('artist_'.$ArtistID);
@@ -508,7 +508,7 @@
 
 $Tags = array_unique(explode(',', $Tags));
 foreach($Tags as $Index => $Tag) {
-	$Tag = sanitize_tag($Tag);
+	$Tag = Misc::sanitize_tag($Tag);
 	$Tags[$Index] = $Tag; //For announce
 	
 	$DB->query("INSERT INTO tags 
@@ -538,7 +538,7 @@
 	
 	
 	if($CategoryName == "Music") {
-		$Announce = "'".$Title."' - ".display_artists($ArtistForm, false, false)." http://".NONSSL_SITE_URL."/requests.php?action=view&id=".$RequestID." - ".implode(" ", $Tags);
+		$Announce = "'".$Title."' - ".Artists::display_artists($ArtistForm, false, false)." http://".NONSSL_SITE_URL."/requests.php?action=view&id=".$RequestID." - ".implode(" ", $Tags);
 	} else {
 		$Announce = "'".$Title."' - http://".NONSSL_SITE_URL."/requests.php?action=view&id=".$RequestID." - ".implode(" ", $Tags);
 	}
@@ -549,7 +549,7 @@
 	$Cache->delete_value('request_artists_'.$RequestID);
 }
 
-update_sphinx_requests($RequestID);
+Requests::update_sphinx_requests($RequestID);
 
 header('Location: requests.php?action=view&id='.$RequestID);
 ?>
diff --git a/sections/requests/takeunfill.php b/sections/requests/takeunfill.php
index 51ab2ba7..396796b6 100644
--- a/sections/requests/takeunfill.php
+++ b/sections/requests/takeunfill.php
@@ -37,7 +37,7 @@
 
 if($CategoryName == "Music") {
 	$ArtistForm = get_request_artists($RequestID);
-	$ArtistName = display_artists($ArtistForm, false, true);
+	$ArtistName = Artists::display_artists($ArtistForm, false, true);
 	$FullName = $ArtistName.$Title;
 } else {
 	$FullName = $Title;
@@ -52,15 +52,15 @@
 } else {
 	$DB->query("UPDATE users_main SET Uploaded = Uploaded - ".$RequestVotes['TotalBounty']." WHERE ID = ".$FillerID);
 }
-send_pm($FillerID, 0, db_string("A request you filled has been unfilled"), db_string("The request '[url=http://".NONSSL_SITE_URL."/requests.php?action=view&amp;id=".$RequestID."]".$FullName."[/url]' was unfilled by [url=http://".NONSSL_SITE_URL."/user.php?id=".$LoggedUser['ID']."]".$LoggedUser['Username']."[/url] for the reason: ".$_POST['reason']));
+Misc::send_pm($FillerID, 0, db_string("A request you filled has been unfilled"), db_string("The request '[url=http://".NONSSL_SITE_URL."/requests.php?action=view&amp;id=".$RequestID."]".$FullName."[/url]' was unfilled by [url=http://".NONSSL_SITE_URL."/user.php?id=".$LoggedUser['ID']."]".$LoggedUser['Username']."[/url] for the reason: ".$_POST['reason']));
 
 $Cache->delete_value('user_stats_'.$FillerID);
 
 if($UserID != $LoggedUser['ID']) {
-	send_pm($UserID, 0, db_string("A request you created has been unfilled"), db_string("The request '[url=http://".NONSSL_SITE_URL."/requests.php?action=view&amp;id=".$RequestID."]".$FullName."[/url]' was unfilled by [url=http://".NONSSL_SITE_URL."/user.php?id=".$LoggedUser['ID']."]".$LoggedUser['Username']."[/url] for the reason: ".$_POST['reason']));
+	Misc::send_pm($UserID, 0, db_string("A request you created has been unfilled"), db_string("The request '[url=http://".NONSSL_SITE_URL."/requests.php?action=view&amp;id=".$RequestID."]".$FullName."[/url]' was unfilled by [url=http://".NONSSL_SITE_URL."/user.php?id=".$LoggedUser['ID']."]".$LoggedUser['Username']."[/url] for the reason: ".$_POST['reason']));
 }
 
-write_log("Request $RequestID ($FullName), with a ".get_size($RequestVotes['TotalBounty'])." bounty, was unfilled by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].") for the reason: ".$_POST['reason']);
+Misc::write_log("Request $RequestID ($FullName), with a ".Format::get_size($RequestVotes['TotalBounty'])." bounty, was unfilled by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].") for the reason: ".$_POST['reason']);
 
 $Cache->delete_value('request_'.$RequestID);
 $Cache->delete_value('request_artists_'.$RequestID);
@@ -68,7 +68,7 @@
 	$Cache->delete_value('requests_group_'.$GroupID);
 }
 
-update_sphinx_requests($RequestID);
+Requests::update_sphinx_requests($RequestID);
 
 if(!empty($ArtistForm)) {
 	foreach($ArtistForm as $ArtistType) {
diff --git a/sections/requests/takevote.php b/sections/requests/takevote.php
index 253a88a4..81f5d2b0 100644
--- a/sections/requests/takevote.php
+++ b/sections/requests/takevote.php
@@ -62,7 +62,7 @@
 	$DB->query("UPDATE users_main SET Uploaded = (Uploaded - ".$Amount.") WHERE ID = ".$LoggedUser['ID']);
 	$Cache->delete_value('user_stats_'.$LoggedUser['ID']);
 
-	update_sphinx_requests($RequestID);
+	Requests::update_sphinx_requests($RequestID);
 	echo 'success';
 } elseif($LoggedUser['BytesUploaded'] < $Amount) {
 	echo 'bankrupt';
diff --git a/sections/rules/chat.php b/sections/rules/chat.php
index f0fead3f..96751baa 100644
--- a/sections/rules/chat.php
+++ b/sections/rules/chat.php
@@ -1,6 +1,6 @@
 <?
 //Include the header
-show_header('Chat Rules');
+View::show_header('Chat Rules');
 ?>
 <!-- Forum Rules -->
 <div class="thin">
@@ -134,5 +134,5 @@
 <? include('jump.php'); ?>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/rules/clients.php b/sections/rules/clients.php
index d4a9d0d5..25b10256 100644
--- a/sections/rules/clients.php
+++ b/sections/rules/clients.php
@@ -1,5 +1,5 @@
 <?
-show_header('Client Rules');
+View::show_header('Client Rules');
 
 if (!$WhitelistedClients = $Cache->get_value('whitelisted_clients')) {
 	$DB->query('SELECT vstring FROM xbt_client_whitelist WHERE vstring NOT LIKE \'//%\' ORDER BY vstring ASC');
@@ -55,4 +55,4 @@
 	</div>
 <? include('jump.php'); ?>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/rules/collages.php b/sections/rules/collages.php
index 5d9724b1..e8138a96 100644
--- a/sections/rules/collages.php
+++ b/sections/rules/collages.php
@@ -1,6 +1,6 @@
 <?
 //Include the header
-show_header('Collages Rules');
+View::show_header('Collages Rules');
 ?>
 <div class="thin">
 	<div class="header">
@@ -55,5 +55,5 @@
 <? include('jump.php'); ?>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/rules/ratio.php b/sections/rules/ratio.php
index f645ba63..28fd57c4 100644
--- a/sections/rules/ratio.php
+++ b/sections/rules/ratio.php
@@ -1,6 +1,6 @@
 <?
 //Include the header
-show_header('Ratio Requirements');
+View::show_header('Ratio Requirements');
 ?>
 <div class="thin">
 	<div class="header">
@@ -130,5 +130,5 @@
 <? include('jump.php'); ?>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/rules/requests.php b/sections/rules/requests.php
index 683b1e1c..654760e6 100644
--- a/sections/rules/requests.php
+++ b/sections/rules/requests.php
@@ -1,6 +1,6 @@
 <?
 //Include the header
-show_header('Request Rules');
+View::show_header('Request Rules');
 ?>
 <div class="thin">
 	<div class="header">
@@ -28,5 +28,5 @@
 <? include('jump.php'); ?>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/rules/rules.php b/sections/rules/rules.php
index 94a5a45e..0e8e3549 100644
--- a/sections/rules/rules.php
+++ b/sections/rules/rules.php
@@ -1,6 +1,6 @@
 <?
 //Include the header
-show_header('Rule Index');
+View::show_header('Rule Index');
 ?>
 <!-- General Rules -->
 <div class="thin">
@@ -31,5 +31,5 @@
 <? include('jump.php'); ?>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/rules/tag.php b/sections/rules/tag.php
index 432c4526..076ca39f 100644
--- a/sections/rules/tag.php
+++ b/sections/rules/tag.php
@@ -1,6 +1,6 @@
 <?
 //Include the header
-show_header('Tagging rules');
+View::show_header('Tagging rules');
 ?>
 <!-- General Rules -->
 <div class="thin">
@@ -27,5 +27,5 @@
 <? include('jump.php'); ?>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
\ No newline at end of file
diff --git a/sections/rules/upload.php b/sections/rules/upload.php
index dc163398..dbf336c1 100644
--- a/sections/rules/upload.php
+++ b/sections/rules/upload.php
@@ -1,6 +1,6 @@
 <?
 //Include the header
-show_header('Uploading Rules');
+View::show_header('Uploading Rules');
 ?>
 <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js"></script>
 <script type="text/javascript">//<![CDATA[
@@ -705,5 +705,5 @@
 <? include('jump.php'); ?>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/schedule/index.php b/sections/schedule/index.php
index 45c85467..c0fef73b 100644
--- a/sections/schedule/index.php
+++ b/sections/schedule/index.php
@@ -37,7 +37,7 @@ function next_hour() {
 
 if (check_perms('admin_schedule')) {
 	authorize();
-	show_header();
+	View::show_header();
 	echo '<pre>';
 }
 
@@ -91,7 +91,7 @@ function next_hour() {
             JOIN torrents AS t ON uf.TorrentID = t.ID
 			WHERE uf.Expired = FALSE AND uf.Time < '$sqltime' - INTERVAL 4 DAY");
 while (list($UserID,$InfoHash) = $DB->next_record(MYSQLI_NUM, false)) {
-	update_tracker('remove_token', array('info_hash' => rawurlencode($InfoHash), 'userid' => $UserID));
+	Tracker::update_tracker('remove_token', array('info_hash' => rawurlencode($InfoHash), 'userid' => $UserID));
 }
 $DB->query("UPDATE users_freeleeches SET Expired = True WHERE Time < '$sqltime' - INTERVAL 4 DAY");
 
@@ -197,7 +197,7 @@ function next_hour() {
 				$Cache->delete_value('user_info_heavy_'.$UserID);
 				$Cache->delete_value('user_stats_'.$UserID);
 				$Cache->delete_value('enabled_'.$UserID);
-				$DB->query("UPDATE users_info SET AdminComment = CONCAT('".sqltime()." - Class changed to ".make_class_string($L['To'])." by System\n\n', AdminComment) WHERE UserID = ".$UserID);
+				$DB->query("UPDATE users_info SET AdminComment = CONCAT('".sqltime()." - Class changed to ".Users::make_class_string($L['To'])." by System\n\n', AdminComment) WHERE UserID = ".$UserID);
 			}		
 			$DB->query("UPDATE users_main SET PermissionID=".$L['To']." WHERE ID IN(".implode(',',$UserIDs).")");
 		}
@@ -227,7 +227,7 @@ function next_hour() {
 				$Cache->delete_value('user_info_heavy_'.$UserID);
 				$Cache->delete_value('user_stats_'.$UserID);
 				$Cache->delete_value('enabled_'.$UserID);
-				$DB->query("UPDATE users_info SET AdminComment = CONCAT('".sqltime()." - Class changed to ".make_class_string($L['From'])." by System\n\n', AdminComment) WHERE UserID = ".$UserID);
+				$DB->query("UPDATE users_info SET AdminComment = CONCAT('".sqltime()." - Class changed to ".Users::make_class_string($L['From'])." by System\n\n', AdminComment) WHERE UserID = ".$UserID);
 			}
 			$DB->query("UPDATE users_main SET PermissionID=".$L['From']." WHERE ID IN(".implode(',',$UserIDs).")");
 		}
@@ -306,7 +306,7 @@ function next_hour() {
         $Subject = 'Leeching Disabled';
         $Message = 'You have downloaded more then 10 GiB while on Ratio Watch. Your leeching privileges have been disabled. Please reread the rules and refer to this guide on how to improve your ratio https://what.cd/wiki.php?action=article&amp;id=110';            
         foreach($UserIDs as $UserID) {
-			send_pm($UserID,0,db_string($Subject),db_string($Message));
+			Misc::send_pm($UserID,0,db_string($Subject),db_string($Message));
 			send_irc("PRIVMSG #reports : !leechdisabled Downloaded 10 GB+ on Ratio Watch. https://what.cd/user.php?id=$UserID");
         }
  
@@ -425,13 +425,13 @@ function next_hour() {
 		$Cache->begin_transaction('user_info_heavy_'.$UserID);
 		$Cache->update_row(false, array('RatioWatchEnds'=>'0000-00-00 00:00:00','RatioWatchDownload'=>'0','CanLeech'=>1));
 		$Cache->commit_transaction(0);
-		send_pm($UserID, 0, db_string("You have been taken off Ratio Watch"), db_string("Congratulations! Feel free to begin downloading again.\n To ensure that you do not get put on ratio watch again, please read the rules located [url=http://".NONSSL_SITE_URL."/rules.php?p=ratio]here[/url].\n"), '');
+		Misc::send_pm($UserID, 0, db_string("You have been taken off Ratio Watch"), db_string("Congratulations! Feel free to begin downloading again.\n To ensure that you do not get put on ratio watch again, please read the rules located [url=http://".NONSSL_SITE_URL."/rules.php?p=ratio]here[/url].\n"), '');
 		echo "Ratio watch off: $UserID\n";
 	}
 	$DB->set_query_id($UserQuery);
 	$Passkeys = $DB->collect('torrent_pass');
 	foreach($Passkeys as $Passkey) {
-		update_tracker('update_user', array('passkey' => $Passkey, 'can_leech' => '1'));
+		Tracker::update_tracker('update_user', array('passkey' => $Passkey, 'can_leech' => '1'));
 	}
 
         // Take users off ratio watch 
@@ -453,13 +453,13 @@ function next_hour() {
                 $Cache->begin_transaction('user_info_heavy_'.$UserID);
                 $Cache->update_row(false, array('RatioWatchEnds'=>'0000-00-00 00:00:00','RatioWatchDownload'=>'0','CanLeech'=>1));
                 $Cache->commit_transaction(0);
-                send_pm($UserID, 0, db_string("You have been taken off Ratio Watch"), db_string("Congratulations! Feel free to begin downloading again.\n To ensure that you do not get put on ratio watch again, please read the rules located [url=http://".NONSSL_SITE_URL."/rules.php?p=ratio]here[/url].\n"), '');
+                Misc::send_pm($UserID, 0, db_string("You have been taken off Ratio Watch"), db_string("Congratulations! Feel free to begin downloading again.\n To ensure that you do not get put on ratio watch again, please read the rules located [url=http://".NONSSL_SITE_URL."/rules.php?p=ratio]here[/url].\n"), '');
                 echo "Ratio watch off: $UserID\n";
         }
         $DB->set_query_id($UserQuery);
         $Passkeys = $DB->collect('torrent_pass');
         foreach($Passkeys as $Passkey) {
-                update_tracker('update_user', array('passkey' => $Passkey, 'can_leech' => '1'));
+                Tracker::update_tracker('update_user', array('passkey' => $Passkey, 'can_leech' => '1'));
         }
 
 	
@@ -484,7 +484,7 @@ function next_hour() {
 		$Cache->begin_transaction('user_info_heavy_'.$UserID);
 		$Cache->update_row(false, array('RatioWatchEnds'=>time_plus(60*60*24*14),'RatioWatchDownload'=>0));
 		$Cache->commit_transaction(0);
-		send_pm($UserID, 0, db_string("You have been put on Ratio Watch"), db_string("This happens when your ratio falls below the requirements we have outlined in the rules located [url=http://".NONSSL_SITE_URL."/rules.php?p=ratio]here[/url].\n For information about ratio watch, click the link above."), '');
+		Misc::send_pm($UserID, 0, db_string("You have been put on Ratio Watch"), db_string("This happens when your ratio falls below the requirements we have outlined in the rules located [url=http://".NONSSL_SITE_URL."/rules.php?p=ratio]here[/url].\n For information about ratio watch, click the link above."), '');
 		echo "Ratio watch on: $UserID\n";
 	}
 
@@ -527,14 +527,14 @@ function next_hour() {
 		$Cache->begin_transaction('user_info_heavy_'.$UserID);
 		$Cache->update_row(false, array('RatioWatchDownload'=>0, 'CanLeech'=>0));
 		$Cache->commit_transaction(0);
-		send_pm($UserID, 0, db_string("Your downloading rights have been disabled"), db_string("As you did not raise your ratio in time, your downloading rights have been revoked. You will not be able to download any torrents until your ratio is above your new required ratio."), '');
+		Misc::send_pm($UserID, 0, db_string("Your downloading rights have been disabled"), db_string("As you did not raise your ratio in time, your downloading rights have been revoked. You will not be able to download any torrents until your ratio is above your new required ratio."), '');
 		echo "Ratio watch disabled: $UserID\n";
 	}
 
 	$DB->set_query_id($UserQuery);
 	$Passkeys = $DB->collect('torrent_pass');
 	foreach($Passkeys as $Passkey) {
-		update_tracker('update_user', array('passkey' => $Passkey, 'can_leech' => '0'));
+		Tracker::update_tracker('update_user', array('passkey' => $Passkey, 'can_leech' => '0'));
 	}
 	
 	//------------- Disable inactive user accounts --------------------------//
@@ -552,7 +552,7 @@ function next_hour() {
 		GROUP BY um.ID");
 	while(list($Username, $Email) = $DB->next_record()) {
 		$Body = "Hi $Username, \n\nIt has been almost 4 months since you used your account at http://".NONSSL_SITE_URL.". This is an automated email to inform you that your account will be disabled in 10 days if you do not sign in. ";
-		send_email($Email, 'Your '.SITE_NAME.' account is about to be disabled', $Body);
+		Misc::send_email($Email, 'Your '.SITE_NAME.' account is about to be disabled', $Body);
 	}
 	$DB->query("SELECT um.ID FROM  users_info AS ui JOIN users_main AS um ON um.ID=ui.UserID
 		LEFT JOIN users_levels AS ul ON ul.UserID = um.ID AND ul.PermissionID = '".CELEB."'
@@ -565,7 +565,7 @@ function next_hour() {
 		GROUP BY um.ID");
 
 	if($DB->record_count() > 0) {
-		disable_users($DB->collect('ID'), "Disabled for inactivity.", 3);
+		Tools::disable_users($DB->collect('ID'), "Disabled for inactivity.", 3);
 	}
 
 	//------------- Disable unconfirmed users ------------------------------//
@@ -683,7 +683,7 @@ function next_hour() {
 		if($Format && $Encoding) {
 			$Name.=' ['.(empty($Media)?'':"$Media / ").$Format.' / '.$Encoding.']';
 		}
-		delete_torrent($ID, $GroupID);
+		Torrents::delete_torrent($ID, $GroupID);
 		$LogEntries[] = "Torrent ".$ID." (".$Name.") was deleted for inactivity (unseeded)";
 		
 		if (!array_key_exists($UserID, $DeleteNotes))
@@ -701,7 +701,7 @@ function next_hour() {
 	
 	foreach($DeleteNotes as $UserID => $MessageInfo){
 		$Singular = ($MessageInfo['Count'] == 1) ? true : false;
-		send_pm($UserID,0,db_string($MessageInfo['Count'].' of your torrents '.($Singular?'has':'have').' been deleted for inactivity'), db_string(($Singular?'One':'Some').' of your uploads '.($Singular?'has':'have').' been deleted for being unseeded.  Since '.($Singular?'it':'they').' didn\'t break any rules (we hope), please feel free to re-upload '.($Singular?'it':'them').".\n\nThe following torrent".($Singular?' was':'s were').' deleted:'.$MessageInfo['Msg']));
+		Misc::send_pm($UserID,0,db_string($MessageInfo['Count'].' of your torrents '.($Singular?'has':'have').' been deleted for inactivity'), db_string(($Singular?'One':'Some').' of your uploads '.($Singular?'has':'have').' been deleted for being unseeded.  Since '.($Singular?'it':'they').' didn\'t break any rules (we hope), please feel free to re-upload '.($Singular?'it':'them').".\n\nThe following torrent".($Singular?' was':'s were').' deleted:'.$MessageInfo['Msg']));
 	}	
 	unset($DeleteNotes);
 	
@@ -766,10 +766,10 @@ function next_hour() {
 
 		$DisplayName='';
 		
-		$Artists = get_artist($GroupID);
+		$Artists = Artists::get_artist($GroupID);
 		
 		if(!empty($Artists)) {
-			$DisplayName = display_artists($Artists, false, true);
+			$DisplayName = Artists::display_artists($Artists, false, true);
 		}
 		
 		$DisplayName.= $GroupName;
@@ -851,10 +851,10 @@ function next_hour() {
 
 			$DisplayName='';
 			
-			$Artists = get_artist($GroupID);
+			$Artists = Artists::get_artist($GroupID);
 			
 			if(!empty($Artists)) {
-				$DisplayName = display_artists($Artists, false, true);
+				$DisplayName = Artists::display_artists($Artists, false, true);
 			}
 			
 			$DisplayName.= $GroupName;
@@ -918,7 +918,7 @@ function next_hour() {
 			
 			if (!array_key_exists($UserID, $TorrentAlerts))
 				$TorrentAlerts[$UserID] = array('Count' => 0, 'Msg' => '');
-			$ArtistName = display_artists(get_artist($GroupID), false, false, false);
+			$ArtistName = Artists::display_artists(Artists::get_artist($GroupID), false, false, false);
 			if($ArtistName) {
 				$Name = $ArtistName.' - '.$Name;
 			}
@@ -929,7 +929,7 @@ function next_hour() {
 			$TorrentAlerts[$UserID]['Count']++;
 		}
 		foreach($TorrentAlerts as $UserID => $MessageInfo){
-			send_pm($UserID, 0, db_string('Unseeded torrent notification'), db_string($MessageInfo['Count']." of your uploads will be deleted for inactivity soon.  Unseeded torrents are deleted after 4 weeks. If you still have the files, you can seed your uploads by ensuring the torrents are in your client and that they aren't stopped. You can view the time that a torrent has been unseeded by clicking on the torrent description line and looking for the \"Last active\" time. For more information, please go [url=https://what.cd/wiki.php?action=article&amp;id=663]here[/url].\n\nThe following torrent".($MessageInfo['Count']>1?'s':'')." will be removed for inactivity:".$MessageInfo['Msg']."\n\nIf you no longer wish to receive these notifications, please disable them in your profile settings."));
+			Misc::send_pm($UserID, 0, db_string('Unseeded torrent notification'), db_string($MessageInfo['Count']." of your uploads will be deleted for inactivity soon.  Unseeded torrents are deleted after 4 weeks. If you still have the files, you can seed your uploads by ensuring the torrents are in your client and that they aren't stopped. You can view the time that a torrent has been unseeded by clicking on the torrent description line and looking for the \"Last active\" time. For more information, please go [url=https://what.cd/wiki.php?action=article&amp;id=663]here[/url].\n\nThe following torrent".($MessageInfo['Count']>1?'s':'')." will be removed for inactivity:".$MessageInfo['Msg']."\n\nIf you no longer wish to receive these notifications, please disable them in your profile settings."));
 		}
 	}
 }
@@ -949,10 +949,10 @@ function next_hour() {
 	SET AuthKey =
 		MD5(
 			CONCAT(
-				AuthKey, RAND(), '".db_string(make_secret())."',
+				AuthKey, RAND(), '".db_string(Users::make_secret())."',
 				SHA1(
 					CONCAT(
-						RAND(), RAND(), '".db_string(make_secret())."'
+						RAND(), RAND(), '".db_string(Users::make_secret())."'
 					)
 				)
 			)
@@ -1036,6 +1036,6 @@ function next_hour() {
 echo "-------------------------\n\n";
 if (check_perms('admin_schedule')) {	
 	echo '<pre>';
-	show_footer();
+	View::show_footer();
 }
 ?>
diff --git a/sections/staff/index.php b/sections/staff/index.php
index cd522595..1b4622c3 100644
--- a/sections/staff/index.php
+++ b/sections/staff/index.php
@@ -1,6 +1,6 @@
 <?
 enforce_login();
-show_header('Staff');
+View::show_header('Staff');
 
 include(SERVER_ROOT.'/sections/staff/functions.php');
 include(SERVER_ROOT.'/sections/staffpm/functions.php');
@@ -38,7 +38,7 @@
 ?>
 			<tr class="row<?=$Row?>">
 				<td class="nobr">
-					<?=format_username($ID, false, false, false)?>
+					<?=Users::format_username($ID, false, false, false)?>
 				</td>
 				<td class="nobr">
 					<? if (check_paranoia('lastseen', $Paranoia, $Class)) { echo time_diff($LastAccess); } else { echo 'Hidden by user'; }?>
@@ -68,7 +68,7 @@
 ?>
 			<tr class="row<?=$Row?>">
 				<td class="nobr">
-					<?=format_username($ID, false, false, false)?>
+					<?=Users::format_username($ID, false, false, false)?>
 				</td>
 				<td class="nobr">
 					<? if (check_paranoia('lastseen', $Paranoia, $Class)) { echo time_diff($LastAccess); } else { echo 'Hidden by user'; }?>
@@ -111,7 +111,7 @@
 ?>
 			<tr class="row<?=$Row?>">
 				<td class="nobr">
-					<?=format_username($ID, false, false, false)?>
+					<?=Users::format_username($ID, false, false, false)?>
 				</td>
 				<td class="nobr">
 					<? if (check_paranoia('lastseen', $Paranoia, $Class)) { echo time_diff($LastAccess); } else { echo 'Hidden by staff member'; }?>
@@ -126,5 +126,5 @@
 	</div>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/staffblog/index.php b/sections/staffblog/index.php
index e3cc8ade..379bda97 100644
--- a/sections/staffblog/index.php
+++ b/sections/staffblog/index.php
@@ -6,7 +6,7 @@
 }
 
 define('ANNOUNCEMENT_FORUM_ID', 19);
-show_header('Staff Blog','bbcode');
+View::show_header('Staff Blog','bbcode');
 require(SERVER_ROOT.'/classes/class_text.php');
 $Text = new TEXT;
 
@@ -130,5 +130,5 @@
 ?>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/staffpm/assign.php b/sections/staffpm/assign.php
index 1e022e5b..b04d1c29 100644
--- a/sections/staffpm/assign.php
+++ b/sections/staffpm/assign.php
@@ -48,7 +48,7 @@
 			// Assign to class
 			$DB->query("UPDATE staff_pm_conversations SET Status='Unanswered', Level=$NewLevel, AssignedToUser=NULL WHERE ID=$ConvID");
 		} else {
-			$UserInfo = user_info($NewLevel);
+			$UserInfo = Users::user_info($NewLevel);
 			$Level    = $Classes[$UserInfo['PermissionID']]['Level'];
 			if (!$Level) {
 				error("Assign to user not found.");
diff --git a/sections/staffpm/common_responses.php b/sections/staffpm/common_responses.php
index be1223e5..67d1fdd1 100644
--- a/sections/staffpm/common_responses.php
+++ b/sections/staffpm/common_responses.php
@@ -4,7 +4,7 @@
 	error(403);
 }
 
-show_header('Staff PMs', 'staffpm');
+View::show_header('Staff PMs', 'staffpm');
 
 include(SERVER_ROOT.'/classes/class_text.php'); // Text formatting class
 $Text = new TEXT;
@@ -94,4 +94,4 @@
 ?>
 	</div>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/staffpm/staff_inbox.php b/sections/staffpm/staff_inbox.php
index bcdcbc0a..47e17937 100644
--- a/sections/staffpm/staff_inbox.php
+++ b/sections/staffpm/staff_inbox.php
@@ -1,6 +1,6 @@
 <?
 
-show_header('Staff Inbox');
+View::show_header('Staff Inbox');
 
 $View = display_str($_GET['view']);
 $UserLevel = $LoggedUser['EffectiveClass'];
@@ -42,7 +42,7 @@
 		break;
 }
 
-list($Page,$Limit) = page_limit(MESSAGES_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(MESSAGES_PER_PAGE);
 // Get messages
 $StaffPMs = $DB->query("
 	SELECT
@@ -66,13 +66,13 @@
 list($NumResults) = $DB->next_record();
 $DB->set_query_id($StaffPMs);
 
-$CurURL = get_url();
+$CurURL = Format::get_url();
 if(empty($CurURL)) {
 	$CurURL = "staffpm.php?";
 } else {
 	$CurURL = "staffpm.php?".$CurURL."&";
 }
-$Pages=get_pages($Page,$NumResults,MESSAGES_PER_PAGE,9);
+$Pages=Format::get_pages($Page,$NumResults,MESSAGES_PER_PAGE,9);
 
 $Row = 'a';
 
@@ -137,8 +137,8 @@
 		$Row = ($Row === 'a') ? 'b' : 'a';
 		$RowClass = 'row'.$Row;
 
-		//$UserInfo = user_info($UserID);
-		$UserStr = format_username($UserID, true, true, true, true);
+		//$UserInfo = Users::user_info($UserID);
+		$UserStr = Users::format_username($UserID, true, true, true, true);
 
 		// Get assigned
 		if ($AssignedToUser == '') {
@@ -149,15 +149,15 @@
 
 		} else {
 			// Assigned to user
-			// $UserInfo = user_info($AssignedToUser);
-			$Assigned = format_username($AssignedToUser, true, true, true, true);
+			// $UserInfo = Users::user_info($AssignedToUser);
+			$Assigned = Users::format_username($AssignedToUser, true, true, true, true);
 
 		}
 
 		// Get resolver
 		if ($ViewString == 'Resolved') {
-			//$UserInfo = user_info($ResolverID);
-			$ResolverStr = format_username($ResolverID, true, true, true, true);
+			//$UserInfo = Users::user_info($ResolverID);
+			$ResolverStr = Users::format_username($ResolverID, true, true, true, true);
 		}
 
 		// Table row
@@ -196,6 +196,6 @@
 </div>
 <?
 
-show_footer();
+View::show_footer();
 
 ?>
diff --git a/sections/staffpm/user_inbox.php b/sections/staffpm/user_inbox.php
index 9d44a58a..eba401ef 100644
--- a/sections/staffpm/user_inbox.php
+++ b/sections/staffpm/user_inbox.php
@@ -2,7 +2,7 @@
 
 include(SERVER_ROOT.'/sections/staffpm/functions.php');
 
-show_header('Staff PMs', 'staffpm');
+View::show_header('Staff PMs', 'staffpm');
 
 // Get messages
 $StaffPMs = $DB->query("
@@ -113,4 +113,4 @@
 ?>
 	</div>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/staffpm/viewconv.php b/sections/staffpm/viewconv.php
index 70dcabde..a6f3cdde 100644
--- a/sections/staffpm/viewconv.php
+++ b/sections/staffpm/viewconv.php
@@ -20,10 +20,10 @@
 		$Cache->delete_value('staff_pm_new_'.$LoggedUser['ID']);
 	}
 
-	show_header('Staff PM', 'staffpm,bbcode');
+	View::show_header('Staff PM', 'staffpm,bbcode');
 
-	$UserInfo = user_info($UserID);
-	$UserStr = format_username($UserID, true, true, true, true);
+	$UserInfo = Users::user_info($UserID);
+	$UserStr = Users::format_username($UserID, true, true, true, true);
 
 	$OwnerID   = $UserID;
 	$OwnerName = $UserInfo['Username'];
@@ -72,8 +72,8 @@
 			$Username   = $OwnerName;
 		} else {
 			// Staff/FLS
-			$UserInfo = user_info($UserID);
-			$UserString = format_username($UserID, true, true, true, true);
+			$UserInfo = Users::user_info($UserID);
+			$UserString = Users::format_username($UserID, true, true, true, true);
 			$Username = $UserInfo['Username'];
 		}
 ?>
@@ -225,7 +225,7 @@
 </div>
 <?
 
-	show_footer();
+	View::show_footer();
 } else {
 	// No id
 	header('Location: staffpm.php');
diff --git a/sections/stats/torrents.php b/sections/stats/torrents.php
index 81417db0..29dc4883 100644
--- a/sections/stats/torrents.php
+++ b/sections/stats/torrents.php
@@ -55,7 +55,7 @@
 $Pie->generate();
 $Categories = $Pie->url();
 
-show_header();
+View::show_header();
 ?>
 
 <div class="box pad center">
@@ -67,4 +67,4 @@
 	<img src="<?=$Categories?>" alt="" />
 </div>
 <?
-show_footer();
+View::show_footer();
diff --git a/sections/stats/users.php b/sections/stats/users.php
index 459d50f5..f79ef50f 100644
--- a/sections/stats/users.php
+++ b/sections/stats/users.php
@@ -31,7 +31,7 @@
 	reset($Rank);
 	
 	for ($i=$CountryMin;$i<=$CountryMax;$i++) {
-		$LogIncrements[] = human_format(pow(2,$i));
+		$LogIncrements[] = Format::human_format(pow(2,$i));
 	}
 	$Cache->cache_value('geodistribution',array($Countries,$Rank,$CountryUsers,$CountryMax,$CountryMin,$LogIncrements),0);
 }
@@ -123,7 +123,7 @@
 }
 //End timeline generation
 
-show_header('Detailed User Statistics');
+View::show_header('Detailed User Statistics');
 ?>
 <h3>User Flow</h3>
 <div class="box pad center">
@@ -159,4 +159,4 @@
 	<img src="http://chart.apis.google.com/chart?chxt=y,x&amp;chg=0,-1,1,1&amp;chxs=0,h&amp;cht=bvs&amp;chco=76A4FB&amp;chs=880x300&amp;chd=t:<?=implode(',',array_slice($CountryUsers,0,31))?>&amp;chxl=1:|<?=implode('|',array_slice($Countries,0,31))?>|0:|<?=implode('|',$LogIncrements)?>&amp;chf=bg,s,FFFFFF00" alt="Number of users by country" />
 </div>
 <?
-show_footer();
+View::show_footer();
diff --git a/sections/tools/data/bitcoin_balance.php b/sections/tools/data/bitcoin_balance.php
index f74c7f0d..788c0bde 100644
--- a/sections/tools/data/bitcoin_balance.php
+++ b/sections/tools/data/bitcoin_balance.php
@@ -3,7 +3,7 @@
 
 include(SERVER_ROOT.'/sections/donate/config.php');
 
-show_header('Bitcoin donation balance');
+View::show_header('Bitcoin donation balance');
 
 $Balance = btc_balance() . " BTC";
 $Receiveds = btc_received();
@@ -31,7 +31,7 @@
 	if ($amount === false) { continue; }
 	?>
 	<tr>
-		<td><?=format_username($row['UserID'], true, false, false, false)?></td>
+		<td><?=Users::format_username($row['UserID'], true, false, false, false)?></td>
 		<td><tt><?=$row['BitcoinAddress']?></tt></td>
 		<td><?=$amount?></td>
 	</tr>
@@ -40,4 +40,4 @@
 ?>
 	</table>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/tools/data/common_snatches.php b/sections/tools/data/common_snatches.php
index 286cc6a3..2706f923 100644
--- a/sections/tools/data/common_snatches.php
+++ b/sections/tools/data/common_snatches.php
@@ -2,7 +2,7 @@
 if (!check_perms('users_mod')) { error(403);
 }
 
-show_header('Common Snatches');
+View::show_header('Common Snatches');
 
 
 ?>
@@ -66,5 +66,5 @@
 	}
 }
 
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/tools/data/database_specifics.php b/sections/tools/data/database_specifics.php
index 1a054049..7b1def9f 100644
--- a/sections/tools/data/database_specifics.php
+++ b/sections/tools/data/database_specifics.php
@@ -81,7 +81,7 @@
 array_multisort($Sort, $SortWay, $Tables);
 //End sorting
 
-show_header('Database Specifics');
+View::show_header('Database Specifics');
 ?>
 <h3>Breakdown</h3>
 <div class="box pad center">
@@ -116,10 +116,10 @@
 		<td><?=display_str($Name)?></td>
 		<td><?=display_str($Engine)?></td>
 		<td><?=number_format($Rows)?></td>
-		<td><?=get_size($RowSize)?></td>
-		<td><?=get_size($DataSize)?></td>
-		<td><?=get_size($IndexSize)?></td>
-		<td><?=get_size($DataSize + $IndexSize)?></td>
+		<td><?=Format::get_size($RowSize)?></td>
+		<td><?=Format::get_size($DataSize)?></td>
+		<td><?=Format::get_size($IndexSize)?></td>
+		<td><?=Format::get_size($DataSize + $IndexSize)?></td>
 		<td>[<a href="tools.php?action=database_specifics&amp;table=<?=display_str($Name)?>">Schema</a>]</td>
 	</tr>
 <?
@@ -130,11 +130,11 @@
 		<td></td>
 		<td><?=number_format($TotalRows)?></td>
 		<td></td>
-		<td><?=get_size($TotalDataSize)?></td>
-		<td><?=get_size($TotalIndexSize)?></td>
-		<td><?=get_size($TotalDataSize + $TotalIndexSize)?></td>
+		<td><?=Format::get_size($TotalDataSize)?></td>
+		<td><?=Format::get_size($TotalIndexSize)?></td>
+		<td><?=Format::get_size($TotalDataSize + $TotalIndexSize)?></td>
 		<td></td>
 	</tr>
 </table>
 <?
-show_footer();
+View::show_footer();
diff --git a/sections/tools/data/donation_log.php b/sections/tools/data/donation_log.php
index 16cd5fa0..02e3aa05 100644
--- a/sections/tools/data/donation_log.php
+++ b/sections/tools/data/donation_log.php
@@ -4,7 +4,7 @@
 include(SERVER_ROOT.'/sections/donate/config.php');
 
 define('DONATIONS_PER_PAGE', 50);
-list($Page,$Limit) = page_limit(DONATIONS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(DONATIONS_PER_PAGE);
 
 
 $sql = "SELECT 
@@ -43,7 +43,7 @@
 	$Cache->cache_value('donation_timeline',$DonationTimeline,mktime(0,0,0,date('n')+1,2));
 }
 
-show_header('Donation log');
+View::show_header('Donation log');
 if (empty($_GET['search']) && !isset($_GET['page'])) {
 ?>
 <div class="box pad">
@@ -69,7 +69,7 @@
 <br />
 <div class="linkbox">
 <?
-	$Pages=get_pages($Page,$Results,DONATIONS_PER_PAGE,11) ;
+	$Pages=Format::get_pages($Page,$Results,DONATIONS_PER_PAGE,11) ;
 	echo $Pages;
 ?>
 </div>
@@ -85,7 +85,7 @@
 		list($UserID, $Amount, $Currency, $Email, $DonationTime) = $Donation;
 ?>
 	<tr>
-		<td><?=format_username($UserID, true, true, true, true)?></td>
+		<td><?=Users::format_username($UserID, true, true, true, true)?></td>
 		<td><?=display_str($Amount)?> <?=$Currency?></td>
 		<td><?=display_str($Email)?></td>
 		<td><?=time_diff($DonationTime)?></td>
@@ -95,4 +95,4 @@
 <div class="linkbox">
 	<?=$Pages?>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/tools/data/economic_stats.php b/sections/tools/data/economic_stats.php
index eb41579a..1077ae95 100644
--- a/sections/tools/data/economic_stats.php
+++ b/sections/tools/data/economic_stats.php
@@ -27,7 +27,7 @@
 	b. project effects with intelligent mathematical analysis of a 24, 48 or 72 hour freeleech
 */
 if(!check_perms('site_view_flow')) { error(403); }
-show_header('Economy');
+View::show_header('Economy');
 
 if (!$EconomicStats = $Cache->get_value('new_economic_stats')) {
 	$DB->query("SELECT SUM(Uploaded), SUM(Downloaded), COUNT(ID) FROM users_main WHERE Enabled='1'");
@@ -73,17 +73,17 @@
 		<div class="head">Overall stats</div>
 		<div class="pad">
 			<ul class="stats nobullet">
-				<li><strong>Total upload: </strong><?=get_size($TotalUpload)?></li>
-				<li><strong>Total download: </strong><?=get_size($TotalDownload)?></li>
-				<li><strong>Total buffer: </strong><?=get_size($TotalUpload-$TotalDownload)?></li>
+				<li><strong>Total upload: </strong><?=Format::get_size($TotalUpload)?></li>
+				<li><strong>Total download: </strong><?=Format::get_size($TotalDownload)?></li>
+				<li><strong>Total buffer: </strong><?=Format::get_size($TotalUpload-$TotalDownload)?></li>
 				<br />
-				<li><strong>Mean ratio: </strong><?=ratio($TotalUpload,$TotalDownload)?></li>
-				<li><strong>Mean upload: </strong><?=get_size($TotalUpload/$NumUsers)?></li>
-				<li><strong>Mean download: </strong><?=get_size($TotalDownload/$NumUsers)?></li>
-				<li><strong>Mean buffer: </strong><?=get_size(($TotalUpload-$TotalDownload)/$NumUsers)?></li>
+				<li><strong>Mean ratio: </strong><?=Format::get_ratio_html($TotalUpload,$TotalDownload)?></li>
+				<li><strong>Mean upload: </strong><?=Format::get_size($TotalUpload/$NumUsers)?></li>
+				<li><strong>Mean download: </strong><?=Format::get_size($TotalDownload/$NumUsers)?></li>
+				<li><strong>Mean buffer: </strong><?=Format::get_size(($TotalUpload-$TotalDownload)/$NumUsers)?></li>
 				<br />
-				<li><strong>Total request bounty: </strong><?=get_size($TotalBounty)?></li>
-				<li><strong>Available request bounty: </strong><?=get_size($AvailableBounty)?></li>
+				<li><strong>Total request bounty: </strong><?=Format::get_size($TotalBounty)?></li>
+				<li><strong>Available request bounty: </strong><?=Format::get_size($AvailableBounty)?></li>
 			</ul>
 		</div>
 	</div>
@@ -96,8 +96,8 @@
 				<li><strong>Total leechers: </strong><?=number_format($TotalLeechers)?></li>
 				<li><strong>Total peers: </strong><?=number_format($TotalSeeders+$TotalLeechers)?></li>
 				<li><strong>Total snatches: </strong><?=number_format($TotalOverallSnatches)?></li>
-				<li><strong>Seeder/leecher ratio: </strong><?=ratio($TotalSeeders,$TotalLeechers)?></li>
-				<li><strong>Seeder/snatch ratio: </strong><?=ratio($TotalSeeders,$TotalOverallSnatches)?></li>
+				<li><strong>Seeder/leecher ratio: </strong><?=Format::get_ratio_html($TotalSeeders,$TotalLeechers)?></li>
+				<li><strong>Seeder/snatch ratio: </strong><?=Format::get_ratio_html($TotalSeeders,$TotalOverallSnatches)?></li>
 				<br />
 				<li><strong>Mean seeders per torrent: </strong><?=number_format($TotalSeeders/$TotalTorrents, 2)?></li>
 				<li><strong>Mean leechers per torrent: </strong><?=number_format($TotalLeechers/$TotalTorrents, 2)?></li>
@@ -116,5 +116,5 @@
 	</div>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/tools/data/invite_pool.php b/sections/tools/data/invite_pool.php
index ea0fdea1..38c1f06d 100644
--- a/sections/tools/data/invite_pool.php
+++ b/sections/tools/data/invite_pool.php
@@ -1,8 +1,8 @@
 <?
 if(!check_perms('users_view_invites')) { error(403); }
-show_header('Invite Pool');
+View::show_header('Invite Pool');
 define('INVITES_PER_PAGE', 50);
-list($Page,$Limit) = page_limit(INVITES_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(INVITES_PER_PAGE);
 
 if(!empty($_POST['invitekey']) && check_perms('users_edit_invites')) {
 	authorize();
@@ -56,7 +56,7 @@
 	</div>
 	<div class="linkbox">
 <?
-	$Pages=get_pages($Page,$Results,INVITES_PER_PAGE,11) ;
+	$Pages=Format::get_pages($Page,$Results,INVITES_PER_PAGE,11) ;
 	echo $Pages;
 ?>
 	</div>
@@ -76,7 +76,7 @@
 	$Row = ($Row == 'b') ? 'a' : 'b';
 ?>
 		<tr class="row<?=$Row?>">
-			<td><?=format_username($UserID, true, true, true, true)?></td>
+			<td><?=Users::format_username($UserID, true, true, true, true)?></td>
 			<td><?=display_str($Email)?></td>
 			<td><?=display_str($InviteKey)?></td>
 			<td><?=time_diff($Expires)?></td>
@@ -96,4 +96,4 @@
 	<div class="linkbox">
 <? echo $Pages; ?>
 	</div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/tools/data/opcode_stats.php b/sections/tools/data/opcode_stats.php
index 45bbba2b..6ceb4a33 100644
--- a/sections/tools/data/opcode_stats.php
+++ b/sections/tools/data/opcode_stats.php
@@ -48,7 +48,7 @@
 
 
 
-show_header("Opcode Stats");
+View::show_header("Opcode Stats");
 ?>
 <div class="thin">
 	<div>
@@ -95,11 +95,11 @@
 		</tr>
 		<tr>
 			<td>Total Storage:</td>
-			<td><?=get_size($Opcode['memorySize'])?></td>
+			<td><?=Format::get_size($Opcode['memorySize'])?></td>
 			<td>Used Storage:</td>
-			<td><?=get_size($Opcode['memoryAllocated'])?> (<?=number_format(($Opcode['memoryAllocated']/$Opcode['memorySize'])*100, 3);?>%)</td>
+			<td><?=Format::get_size($Opcode['memoryAllocated'])?> (<?=number_format(($Opcode['memoryAllocated']/$Opcode['memorySize'])*100, 3);?>%)</td>
 			<td>Free Storage:</td>
-			<td><?=get_size($Opcode['memoryAvailable'])?> (<?=number_format(($Opcode['memoryAvailable']/$Opcode['memorySize'])*100, 3);?>%)</td>
+			<td><?=Format::get_size($Opcode['memoryAvailable'])?> (<?=number_format(($Opcode['memoryAvailable']/$Opcode['memorySize'])*100, 3);?>%)</td>
 		</tr>
 		<tr>
 			<td>Cached Scripts:</td>
@@ -134,7 +134,7 @@
 		<tr class="row<?=$Row?>">
 			<td><?=$FilePath?></td>
 			<td><?=time_diff($Modified)?></td>
-			<td><?=get_size($Size)?></td>
+			<td><?=Format::get_size($Size)?></td>
 			<td><?=number_format($Hits)?></td>
 		</tr>
 <?
@@ -142,4 +142,4 @@
 ?>
 	</table>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/tools/data/registration_log.php b/sections/tools/data/registration_log.php
index 288f4a6a..55482b71 100644
--- a/sections/tools/data/registration_log.php
+++ b/sections/tools/data/registration_log.php
@@ -1,8 +1,8 @@
 <?
 if(!check_perms('users_view_ips') || !check_perms('users_view_email')) { error(403); }
-show_header('Registration log');
+View::show_header('Registration log');
 define('USERS_PER_PAGE', 50);
-list($Page,$Limit) = page_limit(USERS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(USERS_PER_PAGE);
 
 
 $RS = $DB->query("SELECT 
@@ -47,7 +47,7 @@
 ?>
 	<div class="linkbox">
 <?
-	$Pages=get_pages($Page,$Results,USERS_PER_PAGE,11) ;
+	$Pages=Format::get_pages($Page,$Results,USERS_PER_PAGE,11) ;
 	echo $Pages;
 ?>
 	</div>
@@ -66,8 +66,8 @@
 	$Row = ($IP == $InviterIP) ? 'a' : 'b';
 ?>
 		<tr class="row<?=$Row?>">
-			<td><?=format_username($UserID, true, true, true, true)?><br /><?=format_username($InviterID, true, true, true, true)?></td>
-			<td><?=ratio($Uploaded,$Downloaded)?><br /><?=ratio($InviterUploaded,$InviterDownloaded)?></td>
+			<td><?=Users::format_username($UserID, true, true, true, true)?><br /><?=Users::format_username($InviterID, true, true, true, true)?></td>
+			<td><?=Format::get_ratio_html($Uploaded,$Downloaded)?><br /><?=Format::get_ratio_html($InviterUploaded,$InviterDownloaded)?></td>
 			<td>
 				<span style="float:left;"><?=display_str($Email)?></span>
 				<span style="float:right;">[<a href="userhistory.php?action=email&amp;userid=<?=$UserID?>" title="History">H</a>|<a href="/user.php?action=search&email_history=on&email=<?=display_str($Email)?>" title="Search">S</a>]</span><br />
@@ -85,8 +85,8 @@
 				<?=$InviterIPCC?>
 			</td>
 			<td>
-				<?=get_host($IP)?><br />
-				<?=get_host($InviterIP)?>
+				<?=Tools::get_host_by_ajax($IP)?><br />
+				<?=Tools::get_host_by_ajax($InviterIP)?>
 			</td>
 			<td><?=time_diff($Joined)?><br /><?=time_diff($InviterJoined)?></td>
 		</tr>
@@ -98,5 +98,5 @@
 <? } else { ?>
 	<h2 align="center">There have been no new registrations in the past 72 hours.</h2>
 <? }
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/tools/data/service_stats.php b/sections/tools/data/service_stats.php
index bf352254..3ad8f045 100644
--- a/sections/tools/data/service_stats.php
+++ b/sections/tools/data/service_stats.php
@@ -8,7 +8,7 @@
 $DBStats =$DB->to_array('Variable_name');
 $MemStats = $Cache->getStats();
 
-show_header("Service Stats");
+View::show_header("Service Stats");
 ?>
 <div class="linkbox">
 	[<a href="tools.php?action=database_specifics">Database Specifics</a>]
@@ -50,7 +50,7 @@
 			</tr>
 			<tr>
 				<td<? if($MemStats['bytes']/$MemStats['limit_maxbytes'] > 0.85) { echo ' class="invalid" title="Evictions begin when storage exceeds 85%" '; } ?>>Cache Storage:</td>
-				<td><?=get_size($MemStats['bytes'])?> <span style="float:right;">(<?=number_format(($MemStats['bytes']/$MemStats['limit_maxbytes'])*100, 3);?>%)</span></td>
+				<td><?=Format::get_size($MemStats['bytes'])?> <span style="float:right;">(<?=number_format(($MemStats['bytes']/$MemStats['limit_maxbytes'])*100, 3);?>%)</span></td>
 			</tr>
 			<tr><td colspan="2"></td></tr>
 			<tr><td colspan="2"><strong>Utilities</strong></td></tr>
@@ -154,20 +154,20 @@
 			<tr><td colspan="2"><strong>Data Read</strong></td></tr>
 			<tr>
 				<td>Cache:</td>
-				<td><?=get_size($MemStats['bytes_read'])?></td>
+				<td><?=Format::get_size($MemStats['bytes_read'])?></td>
 			</tr>
 			<tr>
 				<td>Database:</td>
-				<td><?=get_size($DBStats['Bytes_received']['Value'])?></td>
+				<td><?=Format::get_size($DBStats['Bytes_received']['Value'])?></td>
 			</tr>
 			<tr><td colspan="2"><strong>Data Write</strong></td></tr>
 			<tr>
 				<td>Cache:</td>
-				<td><?=get_size($MemStats['bytes_written'])?></td>
+				<td><?=Format::get_size($MemStats['bytes_written'])?></td>
 			</tr>
 			<tr>
 				<td>Database:</td>
-				<td><?=get_size($DBStats['Bytes_sent']['Value'])?></td>
+				<td><?=Format::get_size($DBStats['Bytes_sent']['Value'])?></td>
 			</tr>
 		</table>
 	</div>
@@ -258,22 +258,22 @@
 			<tr><td colspan="2"><strong>Data Read</strong></td></tr>
 			<tr>
 				<td>Cache:</td>
-				<td><?=get_size($MemStats['bytes_read']/$MemStats['uptime'])?>/s</td>
+				<td><?=Format::get_size($MemStats['bytes_read']/$MemStats['uptime'])?>/s</td>
 			</tr>
 			<tr>
 				<td>Database:</td>
-				<td><?=get_size($DBStats['Bytes_received']['Value']/$DBStats['Uptime']['Value'])?>/s</td>
+				<td><?=Format::get_size($DBStats['Bytes_received']['Value']/$DBStats['Uptime']['Value'])?>/s</td>
 			</tr>
 			<tr><td colspan="2"><strong>Data Write</strong></td></tr>
 			<tr>
 				<td>Cache:</td>
-				<td><?=get_size($MemStats['bytes_written']/$MemStats['uptime'])?>/s</td>
+				<td><?=Format::get_size($MemStats['bytes_written']/$MemStats['uptime'])?>/s</td>
 			</tr>
 			<tr>
 				<td>Database:</td>
-				<td><?=get_size($DBStats['Bytes_sent']['Value']/$DBStats['Uptime']['Value'])?>/s</td>
+				<td><?=Format::get_size($DBStats['Bytes_sent']['Value']/$DBStats['Uptime']['Value'])?>/s</td>
 			</tr>
 		</table>
 	</div>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/tools/data/special_users.php b/sections/tools/data/special_users.php
index d6d1e9ff..d9fc329e 100644
--- a/sections/tools/data/special_users.php
+++ b/sections/tools/data/special_users.php
@@ -1,6 +1,6 @@
 <?
 if(!check_perms('admin_manage_permissions')) { error(403); }
-show_header('Special Users List');
+View::show_header('Special Users List');
 ?>
 <div class="thin">
 <?
@@ -18,7 +18,7 @@
 	while(list($UserID)=$DB->next_record()) {
 ?>
 		<tr>
-			<td><?=format_username($UserID, true, true, true, true)?></td>
+			<td><?=Users::format_username($UserID, true, true, true, true)?></td>
 			<td><a href="user.php?action=permissions&amp;userid=<?=$UserID?>">Manage</a></td>
 		</tr>
 <?	} ?>
@@ -27,4 +27,4 @@
 	<h2 align="center">There are no special users.</h2>
 <? } ?>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/tools/data/torrent_stats.php b/sections/tools/data/torrent_stats.php
index dc3933dc..361e822f 100644
--- a/sections/tools/data/torrent_stats.php
+++ b/sections/tools/data/torrent_stats.php
@@ -1,6 +1,6 @@
 <?
 if(!check_perms('site_view_flow')) { error(403); }
-show_header('Torrents');
+View::show_header('Torrents');
 
 if (!$TorrentStats = $Cache->get_value('new_torrent_stats')) {	
 	$DB->query("SELECT COUNT(ID), SUM(Size), SUM(FileCount) FROM torrents");
@@ -29,13 +29,13 @@
 		<div class="pad">
 			<ul class="stats nobullet">
 				<li><strong>Total torrents: </strong><?=number_format($TorrentCount)?></li>
-				<li><strong>Total size: </strong><?=get_size($TotalSize)?></li>
+				<li><strong>Total size: </strong><?=Format::get_size($TotalSize)?></li>
 				<li><strong>Total files: </strong><?=number_format($TotalFiles)?></li>
 				<br />
 				<li><strong>Mean torrents per user: </strong><?=number_format($TorrentCount/$NumUsers)?></li>
-				<li><strong>Mean torrent size: </strong><?=get_size($TotalSize/$TorrentCount)?></li>
+				<li><strong>Mean torrent size: </strong><?=Format::get_size($TotalSize/$TorrentCount)?></li>
 				<li><strong>Mean files per torrent: </strong><?=number_format($TotalFiles/$TorrentCount)?></li>
-				<li><strong>Mean filesize: </strong><?=get_size($TotalSize/$TotalFiles)?></li>
+				<li><strong>Mean filesize: </strong><?=Format::get_size($TotalSize/$TotalFiles)?></li>
 			</ul>
 		</div>
 	</div>
@@ -45,28 +45,28 @@
 		<div class="pad">
 			<ul class="stats nobullet">
 				<li><strong>Torrents today: </strong><?=number_format($DayNum)?></li>
-				<li><strong>Size today: </strong><?=get_size($DaySize)?></li>
+				<li><strong>Size today: </strong><?=Format::get_size($DaySize)?></li>
 				<li><strong>Files today: </strong><?=number_format($DayFiles)?></li>
 				<br />
 				<li><strong>Torrents this week: </strong><?=number_format($WeekNum)?></li>
-				<li><strong>Size this week: </strong><?=get_size($WeekSize)?></li>
+				<li><strong>Size this week: </strong><?=Format::get_size($WeekSize)?></li>
 				<li><strong>Files this week: </strong><?=number_format($WeekFiles)?></li>
 				<br />
 				<li><strong>Torrents per day this week: </strong><?=number_format($WeekNum/7)?></li>
-				<li><strong>Size per day this week: </strong><?=get_size($WeekSize/7)?></li>
+				<li><strong>Size per day this week: </strong><?=Format::get_size($WeekSize/7)?></li>
 				<li><strong>Files per day this week: </strong><?=number_format($WeekFiles/7)?></li>
 				<br />
 				<li><strong>Torrents this month: </strong><?=number_format($MonthNum)?></li>
-				<li><strong>Size this month: </strong><?=get_size($MonthSize)?></li>
+				<li><strong>Size this month: </strong><?=Format::get_size($MonthSize)?></li>
 				<li><strong>Files this month: </strong><?=number_format($MonthFiles)?></li>
 				<br />
 				<li><strong>Torrents per day this month: </strong><?=number_format($MonthNum/30)?></li>
-				<li><strong>Size per day this month: </strong><?=get_size($MonthSize/30)?></li>
+				<li><strong>Size per day this month: </strong><?=Format::get_size($MonthSize/30)?></li>
 				<li><strong>Files per day this month: </strong><?=number_format($MonthFiles/30)?></li>
 			</ul>
 		</div>
 	</div>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/tools/data/upscale_pool.php b/sections/tools/data/upscale_pool.php
index eca477fc..49141024 100644
--- a/sections/tools/data/upscale_pool.php
+++ b/sections/tools/data/upscale_pool.php
@@ -1,8 +1,8 @@
 <?
 if(!check_perms('site_view_flow')) { error(403); }
-show_header('Upscale Pool');
+View::show_header('Upscale Pool');
 define('USERS_PER_PAGE', 50);
-list($Page,$Limit) = page_limit(USERS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(USERS_PER_PAGE);
 
 $RS = $DB->query("SELECT 
 	SQL_CALC_FOUND_ROWS
@@ -36,7 +36,7 @@
 	</div>
 	<div class="linkbox">
 <?
-	$Pages=get_pages($Page,$Results,USERS_PER_PAGE,11) ;
+	$Pages=Format::get_pages($Page,$Results,USERS_PER_PAGE,11) ;
 	echo $Pages;
 ?>
 	</div>
@@ -59,13 +59,13 @@
 
 ?>
 		<tr class="row<?=$Row?>">
-			<td><?=format_username($UserID, true, true, true, true)?></td>
-			<td><?=get_size($Uploaded)?></td>
-			<td><?=get_size($Downloaded)?></td>
-			<td><?=ratio($Uploaded, $Downloaded)?></td>
+			<td><?=Users::format_username($UserID, true, true, true, true)?></td>
+			<td><?=Format::get_size($Uploaded)?></td>
+			<td><?=Format::get_size($Downloaded)?></td>
+			<td><?=Format::get_ratio_html($Uploaded, $Downloaded)?></td>
 			<td><?=number_format($RequiredRatio, 2)?></td>
-			<td><? if(($Downloaded*$RequiredRatio)>$Uploaded) { echo get_size(($Downloaded*$RequiredRatio)-$Uploaded);}?></td>
-			<td><?=get_size($Downloaded-$RatioWatchDownload)?></td>
+			<td><? if(($Downloaded*$RequiredRatio)>$Uploaded) { echo Format::get_size(($Downloaded*$RequiredRatio)-$Uploaded);}?></td>
+			<td><?=Format::get_size($Downloaded-$RatioWatchDownload)?></td>
 			<td><?=time_diff($Joined,2)?></td>
 			<td><?=time_diff($RatioWatchEnds)?></td>
 			<td><?//time_diff(strtotime($Joined), strtotime($RatioWatchEnds))?></td>
@@ -78,5 +78,5 @@
 <? } else { ?>
 	<h2 align="center">There are currently no users on ratio watch.</h2>
 <? }
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/tools/data/user_flow.php b/sections/tools/data/user_flow.php
index 5f36c6f9..d4837407 100644
--- a/sections/tools/data/user_flow.php
+++ b/sections/tools/data/user_flow.php
@@ -36,7 +36,7 @@
 
 
 define('DAYS_PER_PAGE', 100);
-list($Page,$Limit) = page_limit(DAYS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(DAYS_PER_PAGE);
 
 $RS = $DB->query("SELECT
 		SQL_CALC_FOUND_ROWS
@@ -98,7 +98,7 @@
 $DB->query("SELECT FOUND_ROWS()");
 list($Results) = $DB->next_record();
 
-show_header('User Flow');
+View::show_header('User Flow');
 $DB->set_query_id($RS);
 ?>
 <div class="thin">
@@ -109,7 +109,7 @@
 <? } ?>
 	<div class="linkbox">
 <?
-$Pages=get_pages($Page,$Results,DAYS_PER_PAGE,11) ;
+$Pages=Format::get_pages($Page,$Results,DAYS_PER_PAGE,11) ;
 echo $Pages;
 ?>
 	</div>
@@ -143,4 +143,4 @@
 		<?=$Pages?>
 	</div>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/tools/managers/bans.php b/sections/tools/managers/bans.php
index 84356983..20a6831e 100644
--- a/sections/tools/managers/bans.php
+++ b/sections/tools/managers/bans.php
@@ -16,8 +16,8 @@
 		if($Err){ error($Err); }
 	
 		$Notes = db_string($_POST['notes']);
-		$Start = ip2unsigned($_POST['start']); //Sanitized by Validation regex
-		$End = ip2unsigned($_POST['end']); //See above
+		$Start = Tools::ip_to_unsigned($_POST['start']); //Sanitized by Validation regex
+		$End = Tools::ip_to_unsigned($_POST['end']); //See above
 
 		if($_POST['submit'] == 'Edit'){ //Edit
 			if(empty($_POST['id']) || !is_number($_POST['id'])) {
@@ -45,7 +45,7 @@
 }
 
 define('BANS_PER_PAGE', '20');
-list($Page,$Limit) = page_limit(BANS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(BANS_PER_PAGE);
 
 $sql = "SELECT SQL_CALC_FOUND_ROWS ID, FromIP, ToIP, Reason FROM ip_bans AS i ";
 
@@ -55,9 +55,9 @@
 
 if(!empty($_REQUEST['ip']) && preg_match('/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/', $_REQUEST['ip'])) {
 	if (!empty($_REQUEST['notes'])) {
-		$sql .= "AND '".ip2unsigned($_REQUEST['ip'])."' BETWEEN FromIP AND ToIP ";
+		$sql .= "AND '".Tools::ip_to_unsigned($_REQUEST['ip'])."' BETWEEN FromIP AND ToIP ";
 	} else {
-		$sql .= "WHERE '".ip2unsigned($_REQUEST['ip'])."' BETWEEN FromIP AND ToIP ";
+		$sql .= "WHERE '".Tools::ip_to_unsigned($_REQUEST['ip'])."' BETWEEN FromIP AND ToIP ";
 	}
 }
 
@@ -68,9 +68,9 @@
 $DB->query('SELECT FOUND_ROWS()');
 list($Results) = $DB->next_record();
 
-$PageLinks=get_pages($Page,$Results,BANS_PER_PAGE,11);
+$PageLinks=Format::get_pages($Page,$Results,BANS_PER_PAGE,11);
 
-show_header('IP Bans');
+View::show_header('IP Bans');
 $DB->set_query_id($Bans);
 ?>
 
@@ -156,4 +156,4 @@
 ?>
 </table>
 <?=$PageLinks?>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/tools/managers/dnu_list.php b/sections/tools/managers/dnu_list.php
index eb8baee9..f837e47a 100644
--- a/sections/tools/managers/dnu_list.php
+++ b/sections/tools/managers/dnu_list.php
@@ -1,7 +1,7 @@
 <?
 if(!check_perms('admin_dnu')) { error(403); }
 
-show_header('Manage do not upload list');
+View::show_header('Manage do not upload list');
 $DB->query("SELECT 
 	d.ID,
 	d.Name, 
@@ -35,7 +35,7 @@
 				<input type="text" name="comment" value="<?=display_str($Comment)?>" size="60" />
 			</td>
 			<td>
-				<?=format_username($UserID, false, false, false)?><br />
+				<?=Users::format_username($UserID, false, false, false)?><br />
 				<?=time_diff($DNUTime, 1)?></td>
 			<td>
 				<input type="submit" name="submit" value="Edit" />
@@ -63,4 +63,4 @@
 	</form>
 </tr>
 </table>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/tools/managers/eb.php b/sections/tools/managers/eb.php
index 23b62bb5..d3da8997 100644
--- a/sections/tools/managers/eb.php
+++ b/sections/tools/managers/eb.php
@@ -2,7 +2,7 @@
 if (!check_perms('users_view_email')) { error(403);
 }
 
-show_header('Manage email blacklist');
+View::show_header('Manage email blacklist');
 $DB -> query("SELECT 
 	eb.ID,
 	eb.UserID,
@@ -53,7 +53,7 @@
 			<td>
 				<input type="text" name="comment" value="<?=display_str($Comment)?>" size="60" />
 			</td>
-			<td><?=format_username($UserID, false, false, false)
+			<td><?=Users::format_username($UserID, false, false, false)
 			?><br /><?=time_diff($Time, 1)
 			?></td>
 			<td>
@@ -64,4 +64,4 @@
 	</tr>
 	<?  }?>
 </table>
-<? show_footer();?>
+<? View::show_footer();?>
diff --git a/sections/tools/managers/forum_list.php b/sections/tools/managers/forum_list.php
index 2ef9bd91..2a26b667 100644
--- a/sections/tools/managers/forum_list.php
+++ b/sections/tools/managers/forum_list.php
@@ -11,7 +11,7 @@ function class_list($Selected=0){
 		if($Selected == $Level){
 			$Return.=' selected="selected"';
 		}
-		$Return.='>'.cut_string($Name, 20, 1).'</option>'."\n";
+		$Return.='>'.Format::cut_string($Name, 20, 1).'</option>'."\n";
 	}
 	reset($Classes);
 	return $Return;
@@ -19,7 +19,7 @@ function class_list($Selected=0){
 
 if(!check_perms('admin_manage_forums')) { error(403); }
 
-show_header('Forum Management');
+View::show_header('Forum Management');
 $DB->query('SELECT ID, Name FROM forums ORDER BY Sort');
 $ForumArray = $DB->to_array(); // used for generating the 'parent' drop down list
 
@@ -168,4 +168,4 @@ function class_list($Selected=0){
 		</form>
 	</tr>
 </table>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/tools/managers/login_watch.php b/sections/tools/managers/login_watch.php
index fb6c2d08..1c9d6c7f 100644
--- a/sections/tools/managers/login_watch.php
+++ b/sections/tools/managers/login_watch.php
@@ -6,7 +6,7 @@
 	$DB->query('DELETE FROM login_attempts WHERE ID='.$_POST['id']);
 }
 
-show_header('Login Watch');
+View::show_header('Login Watch');
 
 $DB->query('SELECT 
 	l.ID,
@@ -43,7 +43,7 @@
 				<?=$IP?>
 			</td>
 			<td>
-				<? if ($UserID != 0) { echo format_username($UserID, true, true, true, true); } ?>
+				<? if ($UserID != 0) { echo Users::format_username($UserID, true, true, true, true); } ?>
 			</td>
 			<td>
 				<?=$Bans?>
@@ -78,4 +78,4 @@
 ?>
 	</table>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/tools/managers/news.php b/sections/tools/managers/news.php
index 65c197c3..ac5aa7af 100644
--- a/sections/tools/managers/news.php
+++ b/sections/tools/managers/news.php
@@ -4,7 +4,7 @@
 
 include(SERVER_ROOT.'/classes/class_text.php');
 $Text = new TEXT;
-show_header('Manage news','bbcode');
+View::show_header('Manage news','bbcode');
 
 switch($_GET['action']) {
 	case 'takeeditnews':
@@ -69,4 +69,4 @@
 	</div>
 <? } ?>
 </div>
-<? show_footer();?>
+<? View::show_footer();?>
diff --git a/sections/tools/managers/official_tags.php b/sections/tools/managers/official_tags.php
index 65927862..50834300 100644
--- a/sections/tools/managers/official_tags.php
+++ b/sections/tools/managers/official_tags.php
@@ -15,7 +15,7 @@
 	}
 
 	if ($_POST['newtag']) {
-		$TagName = sanitize_tag($_POST['newtag']);
+		$TagName = Misc::sanitize_tag($_POST['newtag']);
 
 		$DB->query("SELECT t.ID FROM tags AS t WHERE t.Name LIKE '".$TagName."'");
 		list($TagID) = $DB->next_record();
@@ -31,7 +31,7 @@
 	$Cache->delete_value('genre_tags');
 }
 
-show_header('Official Tags');
+View::show_header('Official Tags');
 ?>
 <div class="header">
 	<h2>Official Tags</h2>
@@ -101,4 +101,4 @@
 		</form>
 	</div>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/tools/managers/permissions_alter.php b/sections/tools/managers/permissions_alter.php
index 583ddb0c..f72d5a94 100644
--- a/sections/tools/managers/permissions_alter.php
+++ b/sections/tools/managers/permissions_alter.php
@@ -7,7 +7,7 @@ function display_perm($Key,$Title) {
 	echo $Perm;
 }
 
-show_header('Manage Permissions','validate');
+View::show_header('Manage Permissions','validate');
 
 echo $Val->GenerateJS('permissionsform');
 ?>
@@ -56,4 +56,4 @@ function display_perm($Key,$Title) {
 permissions_form();
 ?>
 </form>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/tools/managers/permissions_list.php b/sections/tools/managers/permissions_list.php
index 96c838bf..1d283118 100644
--- a/sections/tools/managers/permissions_list.php
+++ b/sections/tools/managers/permissions_list.php
@@ -1,5 +1,5 @@
 <?
-show_header('Manage Permissions');
+View::show_header('Manage Permissions');
 ?>
 <script type="text/javascript" language="javascript">
 //<![CDATA[
@@ -47,5 +47,5 @@ function confirmDelete(id) {
 <? } ?>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/tools/managers/recommend_add.php b/sections/tools/managers/recommend_add.php
index d19b9467..3a3ec067 100644
--- a/sections/tools/managers/recommend_add.php
+++ b/sections/tools/managers/recommend_add.php
@@ -31,7 +31,7 @@
 }
 
 $DB->query("INSERT INTO torrents_recommended (GroupID, UserID, Time) VALUES ('".db_string($GroupID)."', $LoggedUser[ID], '".sqltime()."')");
-freeleech_groups($GroupID, 2, 3);
+Torrents::freeleech_groups($GroupID, 2, 3);
 
 $Cache->delete_value('recommend');
 header('Location: '.$_SERVER['HTTP_REFERER']);
diff --git a/sections/tools/managers/recommend_list.php b/sections/tools/managers/recommend_list.php
index 9600c2f4..044b4817 100644
--- a/sections/tools/managers/recommend_list.php
+++ b/sections/tools/managers/recommend_list.php
@@ -2,7 +2,7 @@
 if(!check_perms('site_recommend_own') && !check_perms('site_manage_recommendations')){
 	error(403);
 }
-show_header('Recommendations');
+View::show_header('Recommendations');
 
 $DB->query("SELECT 
 	tr.GroupID,
@@ -43,7 +43,7 @@
 	while(list($GroupID, $UserID, $GroupName, $ArtistID, $ArtistName)=$DB->next_record()) {
 ?>
 			<li>
-				<strong><?=format_username($UserID, false, false, false)?></strong>
+				<strong><?=Users::format_username($UserID, false, false, false)?></strong>
 <?		if($ArtistID){ ?> 
 				- <a href="artist.php?id=<?=$ArtistID?>"><?=$ArtistName?></a>
 <?		} ?> 
@@ -56,4 +56,4 @@
 		</ul>
 	</div>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/tools/managers/tag_aliases.php b/sections/tools/managers/tag_aliases.php
index 38cfb4fc..32328185 100644
--- a/sections/tools/managers/tag_aliases.php
+++ b/sections/tools/managers/tag_aliases.php
@@ -2,7 +2,7 @@
 if (!check_perms('users_mod')) { error(403);
 }
 
-show_header('Tag Aliases');
+View::show_header('Tag Aliases');
 
 $orderby = ($_GET['order']) == "badtags" ? "BadTag" : "AliasTag";        
 
@@ -77,4 +77,4 @@
 	</tr>
 	<? }?>
 </table>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/tools/managers/tokens.php b/sections/tools/managers/tokens.php
index 5bced862..14a21206 100644
--- a/sections/tools/managers/tokens.php
+++ b/sections/tools/managers/tokens.php
@@ -46,7 +46,7 @@
 }
 
 
-	show_header('Add tokens sitewide');
+	View::show_header('Add tokens sitewide');
 
 ?>
 <div class="header">
@@ -79,5 +79,5 @@
 </div>
 <?
 
-show_footer()
+View::show_footer()
 ?>
diff --git a/sections/tools/managers/whitelist_alter.php b/sections/tools/managers/whitelist_alter.php
index 5ebd9ad1..b6dbbd3b 100644
--- a/sections/tools/managers/whitelist_alter.php
+++ b/sections/tools/managers/whitelist_alter.php
@@ -13,7 +13,7 @@
 	$DB->query("SELECT peer_id FROM xbt_client_whitelist WHERE id = ".$_POST['id']);
 	list($PeerID) = $DB->next_record();
 	$DB->query('DELETE FROM xbt_client_whitelist WHERE id='.$_POST['id']);
-	update_tracker('remove_whitelist', array('peer_id' => $PeerID));
+	Tracker::update_tracker('remove_whitelist', array('peer_id' => $PeerID));
 } else { //Edit & Create, Shared Validation
 	
 	if(empty($_POST['client']) || empty($_POST['peer_id'])) {
@@ -34,14 +34,14 @@
 				vstring='".$Client."',
 				peer_id='".$PeerID."'
 				WHERE ID=".$_POST['id']);
-			update_tracker('edit_whitelist', array('old_peer_id' => $OldPeerID, 'new_peer_id' => $PeerID));
+			Tracker::update_tracker('edit_whitelist', array('old_peer_id' => $OldPeerID, 'new_peer_id' => $PeerID));
 		}
 	} else { //Create
 		$DB->query("INSERT INTO xbt_client_whitelist
 			(vstring, peer_id) 
 		VALUES
 			('".$Client."','".$PeerID."')");
-		update_tracker('add_whitelist', array('peer_id' => $PeerID));
+		Tracker::update_tracker('add_whitelist', array('peer_id' => $PeerID));
 	}
 }
 
diff --git a/sections/tools/managers/whitelist_list.php b/sections/tools/managers/whitelist_list.php
index bc27029e..7f0bcb45 100644
--- a/sections/tools/managers/whitelist_list.php
+++ b/sections/tools/managers/whitelist_list.php
@@ -1,7 +1,7 @@
 <?
 if(!check_perms('admin_whitelist')) { error(403); }
 
-show_header('Whitelist Management');
+View::show_header('Whitelist Management');
 $DB->query('SELECT id, vstring, peer_id FROM xbt_client_whitelist ORDER BY peer_id ASC');
 ?>
 <div class="header">
@@ -60,4 +60,4 @@
 		</tr>
 	</table>
 </form>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/tools/misc/analysis.php b/sections/tools/misc/analysis.php
index 204c5d3d..351e2521 100644
--- a/sections/tools/misc/analysis.php
+++ b/sections/tools/misc/analysis.php
@@ -3,7 +3,7 @@
 
 if (!isset($_GET['case']) || !$Analysis = $Cache->get_value('analysis_'.$_GET['case'])) { error(404); }
 
-show_header('Case Analysis');
+View::show_header('Case Analysis');
 ?>
 <div class="header">
 	<h2>Case Analysis (<a href="<?=display_str($Analysis['url'])?>"><?=$_GET['case']?></a>)</h2>
@@ -19,5 +19,5 @@
 $Debug->extension_table();
 $Debug->constant_table();
 $Debug->vars_table($Analysis['vars']);
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/tools/misc/clear_cache.php b/sections/tools/misc/clear_cache.php
index eec7f3ee..6df01ac3 100644
--- a/sections/tools/misc/clear_cache.php
+++ b/sections/tools/misc/clear_cache.php
@@ -3,7 +3,7 @@
 	error(403);
 }
 
-show_header('Clear a cache key');
+View::show_header('Clear a cache key');
 
 //Make sure the form was sent
 if(!empty($_GET['key']) && $_GET['type'] == "clear") {
@@ -44,4 +44,4 @@
 <? } ?>
 		</table>
 	</form>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/tools/misc/countries.php b/sections/tools/misc/countries.php
index ff8627a6..008f9793 100644
--- a/sections/tools/misc/countries.php
+++ b/sections/tools/misc/countries.php
@@ -2,7 +2,7 @@
 if (!check_perms('users_view_invites')) { error(403);
 }
 
-show_header('Fishy Invites');
+View::show_header('Fishy Invites');
 
 
 if (isset($_POST['newcountry'])) {
@@ -62,4 +62,4 @@
 	</tr>
 	<? }?>
 </table>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/tools/misc/create_user.php b/sections/tools/misc/create_user.php
index c21e4225..caf002d8 100644
--- a/sections/tools/misc/create_user.php
+++ b/sections/tools/misc/create_user.php
@@ -3,7 +3,7 @@
 if(!check_perms('admin_create_users')) { error(403); }
 
 //Show our beautiful header
-show_header('Create a User');
+View::show_header('Create a User');
 
 //Make sure the form was sent
 if (isset($_POST['Username'])) {
@@ -18,11 +18,11 @@
 	if (!empty($Username) && !empty($Email) && !empty($Password)) {
 
 		//Create hashes...
-		$Secret=make_secret();
-		$torrent_pass=make_secret();
+		$Secret=Users::make_secret();
+		$torrent_pass=Users::make_secret();
 
 		//Create the account
-		$DB->query("INSERT INTO users_main (Username,Email,PassHash,torrent_pass,Enabled,PermissionID, Language) VALUES ('".db_string($Username)."','".db_string($Email)."','".db_string(make_crypt_hash($Password))."','".db_string($torrent_pass)."','1','".USER."', 'en')");
+		$DB->query("INSERT INTO users_main (Username,Email,PassHash,torrent_pass,Enabled,PermissionID, Language) VALUES ('".db_string($Username)."','".db_string($Email)."','".db_string(Users::make_crypt_hash($Password))."','".db_string($torrent_pass)."','1','".USER."', 'en')");
 		
 		//Increment site user count
 		$Cache->increment('stats_user_count');
@@ -30,14 +30,14 @@
 		//Grab the userid
 		$UserID=$DB->inserted_id();
 		
-		update_tracker('add_user', array('id' => $UserID, 'passkey' => $torrent_pass));
+		Tracker::update_tracker('add_user', array('id' => $UserID, 'passkey' => $torrent_pass));
 
 		//Default stylesheet
 		$DB->query("SELECT ID FROM stylesheets");
 		list($StyleID)=$DB->next_record();
 		
 		//Auth key
-		$AuthKey = make_secret();
+		$AuthKey = Users::make_secret();
 		
 		//Give them a row in users_info
 		$DB->query("INSERT INTO users_info 
@@ -102,4 +102,4 @@
 	<?
 }
 
-show_footer(); ?>
+View::show_footer(); ?>
diff --git a/sections/tools/misc/dupe_ip.php b/sections/tools/misc/dupe_ip.php
index 574fdcb8..6d3cc127 100644
--- a/sections/tools/misc/dupe_ip.php
+++ b/sections/tools/misc/dupe_ip.php
@@ -1,9 +1,9 @@
 <?
 if(!check_perms('users_view_ips')) { error(403); }
-show_header('Dupe IPs');
+View::show_header('Dupe IPs');
 define('USERS_PER_PAGE', 50);
 define('IP_OVERLAPS', 5);
-list($Page,$Limit) = page_limit(USERS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(USERS_PER_PAGE);
 
 
 $RS = $DB->query("SELECT 
@@ -31,7 +31,7 @@
 ?>
 	<div class="linkbox">
 <?
-	$Pages=get_pages($Page,$Results,USERS_PER_PAGE, 11) ;
+	$Pages=Format::get_pages($Page,$Results,USERS_PER_PAGE, 11) ;
 	echo $Pages;
 ?>
 	</div>
@@ -47,8 +47,8 @@
 	$Row = ($Row == 'b') ? 'a' : 'b';
 ?>
 		<tr class="row<?=$Row?>">
-			<td><?=format_username($UserID, true, true, true, true)?></td>
-			<td><span style="float:left;"><?=get_host($IP)." ($IP)"?></span><span style="float:right;">[<a href="userhistory.php?action=ips&amp;userid=<?=$UserID?>" title="History">H</a>|<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($IP)?>" title="Search">S</a>]</span></td>
+			<td><?=Users::format_username($UserID, true, true, true, true)?></td>
+			<td><span style="float:left;"><?=Tools::get_host_by_ajax($IP)." ($IP)"?></span><span style="float:right;">[<a href="userhistory.php?action=ips&amp;userid=<?=$UserID?>" title="History">H</a>|<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($IP)?>" title="Search">S</a>]</span></td>
 			<td><?=display_str($Uses)?></td>
 			<td><?=time_diff($Joined)?></td>
 		</tr>
@@ -60,5 +60,5 @@
 <? } else { ?>
 	<h2 align="center">There are currently no users with more than <?=IP_OVERLAPS?> IP overlaps.</h2>
 <? }
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/tools/misc/manipulate_tree.php b/sections/tools/misc/manipulate_tree.php
index 8aea8ede..92bf36e2 100644
--- a/sections/tools/misc/manipulate_tree.php
+++ b/sections/tools/misc/manipulate_tree.php
@@ -6,7 +6,7 @@
 	!check_perms('users_edit_invites') && 
 	!check_perms('users_disable_any')
 ) { error(404); }
-show_header("Manipulate Invite Tree");
+View::show_header("Manipulate Invite Tree");
 
 if($_POST['id']) {
 	authorize();
@@ -132,4 +132,4 @@
 	</form>
 </div>
 
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/tools/misc/quick_ban.php b/sections/tools/misc/quick_ban.php
index 5c190d2b..d59a7a55 100644
--- a/sections/tools/misc/quick_ban.php
+++ b/sections/tools/misc/quick_ban.php
@@ -9,7 +9,7 @@
 		}
 		elseif($_GET['perform'] == 'create') {
 			$Notes = db_string($_GET['notes']);
-        		$IP = ip2unsigned($_GET['ip']); //Sanitized by Validation regex
+        		$IP = Tools::ip_to_unsigned($_GET['ip']); //Sanitized by Validation regex
                         $DB->query("INSERT INTO ip_bans
                                 (FromIP, ToIP, Reason) VALUES
                                 ('$IP','$IP', '$Notes')");
diff --git a/sections/tools/misc/update_geoip.php b/sections/tools/misc/update_geoip.php
index 8ede0e93..c807516c 100644
--- a/sections/tools/misc/update_geoip.php
+++ b/sections/tools/misc/update_geoip.php
@@ -4,7 +4,7 @@
 
 //if (!check_perms('site_debug')) { error(403); }
 
-show_header();
+View::show_header();
 
 //requires wget, unzip commands to be installed
 shell_exec('wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCity_CSV/GeoLiteCity_'.date('Ym').'02.zip');
@@ -62,7 +62,7 @@
 }
 
 
-show_footer();
+View::show_footer();
 
 /*
 	The following way works perfectly fine, we just foung the APNIC data to be to outdated for us.
@@ -100,7 +100,7 @@
 	foreach ($CountryData as $Country) {
 		if (preg_match('/\|([A-Z]{2})\|ipv4\|(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\|(\d+)\|/', $Country, $Matches)) {
 
-			$Start = ip2unsigned($Matches[2]);
+			$Start = Tools::ip_to_unsigned($Matches[2]);
 			if($Start == 2147483647) { continue; }
 			
 			if (!isset($Current)) {
diff --git a/sections/tools/services/get_cc.php b/sections/tools/services/get_cc.php
index 61688fca..b4221f24 100644
--- a/sections/tools/services/get_cc.php
+++ b/sections/tools/services/get_cc.php
@@ -13,4 +13,4 @@
 	die("Invalid IP");
 }
 
-die(geoip($_GET['ip']));
+die(Tools::geoip($_GET['ip']));
diff --git a/sections/tools/services/get_host.php b/sections/tools/services/get_host.php
index efd04cb9..52ba7ee1 100644
--- a/sections/tools/services/get_host.php
+++ b/sections/tools/services/get_host.php
@@ -27,10 +27,10 @@
 	die('Invalid IP.');
 }
 
-$Host = lookup_ip($_GET['ip']);
+$Host = Tools::lookup_ip($_GET['ip']);
 
 if ($Host === '') {
-	trigger_error("get_host() command failed with no output, ensure that the host command exists on your system and accepts the argument -W");
+	trigger_error("Tools::get_host_by_ajax() command failed with no output, ensure that the host command exists on your system and accepts the argument -W");
 } elseif ($Host === false) {
 	print 'Could not retrieve host.';
 } else {
diff --git a/sections/tools/tools.php b/sections/tools/tools.php
index 74571b09..59e0edcf 100644
--- a/sections/tools/tools.php
+++ b/sections/tools/tools.php
@@ -2,7 +2,7 @@
 if (!check_perms('users_mod')) {
 	error(403);
 }
-show_header('Staff Tools');
+View::show_header('Staff Tools');
 ?>
 <div class="permissions">
 	<div class="permission_container">
@@ -100,4 +100,4 @@
 		</table>
 	</div>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/top10/history.php b/sections/top10/history.php
index 845111ee..8bf99b40 100644
--- a/sections/top10/history.php
+++ b/sections/top10/history.php
@@ -1,7 +1,7 @@
 <?
 if(!check_perms('users_mod')) { error(404); }
 //if(!check_perms('site_top10_history')) { error(403); }
-show_header('Top 10 Torrents history!');
+View::show_header('Top 10 Torrents history!');
 ?>
 <div class="thin">
 	<div class="header">
@@ -109,10 +109,10 @@
 			//Group still exists
 			$DisplayName='';
 			
-			$Artists = get_artist($GroupID);
+			$Artists = Artists::get_artist($GroupID);
 			
 			if(!empty($Artists)) {
-				$DisplayName = display_artists($Artists, true, true);
+				$DisplayName = Artists::display_artists($Artists, true, true);
 			}
 			
 			$DisplayName .= "<a href='torrents.php?id=$GroupID&amp;torrentid=$TorrentID'  title='View Torrent'>$GroupName</a>";
@@ -180,5 +180,5 @@
 </div>
 <?
 }
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/top10/index.php b/sections/top10/index.php
index 2a8ec4c8..587e3267 100644
--- a/sections/top10/index.php
+++ b/sections/top10/index.php
@@ -2,13 +2,13 @@
 enforce_login();
 
 if(!check_perms('site_top10')){
-	show_header();
+	View::show_header();
 ?>
 <div class="content_basiccontainer">
 	You do not have access to view this feature
 </div>
 <?
-	show_footer();
+	View::show_footer();
 	die();
 }
 
diff --git a/sections/top10/tags.php b/sections/top10/tags.php
index fa0382d8..09935174 100644
--- a/sections/top10/tags.php
+++ b/sections/top10/tags.php
@@ -10,7 +10,7 @@
 	$Details = 'all';
 }
 
-show_header('Top 10 Tags');
+View::show_header('Top 10 Tags');
 ?>
 <div class="thin">
 	<div class="header">
@@ -88,7 +88,7 @@
 }
 
 echo '</div>';
-show_footer();
+View::show_footer();
 exit;
 
 // generate a table based on data from most recent query to $DB
diff --git a/sections/top10/torrents.php b/sections/top10/torrents.php
index 553b12b9..783408f0 100644
--- a/sections/top10/torrents.php
+++ b/sections/top10/torrents.php
@@ -38,7 +38,7 @@
 	$Limit = in_array($Limit, array(10, 100, 250)) ? $Limit : 10;
 }
 $Filtered = !empty($Where);
-show_header('Top '.$Limit.' Torrents');
+View::show_header('Top '.$Limit.' Torrents');
 ?>
 <div class="thin">
 	<div class="header">
@@ -92,7 +92,7 @@
 	// Pref id different
 	if ($NewPref != $DisableFreeTorrentTop10) {
 		$DisableFreeTorrentTop10 = $NewPref;
-		update_site_options($LoggedUser['ID'], array('DisableFreeTorrentTop10' => $DisableFreeTorrentTop10));
+		Users::update_site_options($LoggedUser['ID'], array('DisableFreeTorrentTop10' => $DisableFreeTorrentTop10));
 	}
 }
 
@@ -103,7 +103,7 @@
 
 // The link should say the opposite of the current setting
 $FreeleechToggleName = ($DisableFreeTorrentTop10 ? 'show' : 'hide');
-$FreeleechToggleQuery = get_url(array('freeleech'));
+$FreeleechToggleQuery = Format::get_url(array('freeleech'));
 
 if (!empty($FreeleechToggleQuery))
 	$FreeleechToggleQuery .= '&amp;';
@@ -146,10 +146,7 @@
 if($Details=='all' || $Details=='day') {
 	$TopTorrentsActiveLastDay = $Cache->get_value('top10tor_day_'.$Limit.$WhereSum);
 	if ($TopTorrentsActiveLastDay === false) {
-		if (query_locked('top10')) {
-			$TopTorrentsActiveLastDay = false;
-		} else {
-			set_query_lock('top10');
+		if ($Cache->get_query_lock('top10')) {
 			$DayAgo = time_minus(86400);
 			$Query = $BaseQuery.' WHERE t.Seeders>0 AND ';
 			if (!empty($Where)) { $Query .= $Where.' AND '; }
@@ -160,7 +157,9 @@
 			$DB->query($Query);
 			$TopTorrentsActiveLastDay = $DB->to_array(false, MYSQLI_NUM);
 			$Cache->cache_value('top10tor_day_'.$Limit.$WhereSum,$TopTorrentsActiveLastDay,3600*2);
-			clear_query_lock('top10');
+			$Cache->clear_query_lock('top10');
+		} else {
+			$TopTorrentsActiveLastDay = false;
 		}
 	}
 	generate_torrent_table('Most Active Torrents Uploaded in the Past Day', 'day', $TopTorrentsActiveLastDay, $Limit);
@@ -168,10 +167,7 @@
 if($Details=='all' || $Details=='week') {
 	$TopTorrentsActiveLastWeek = $Cache->get_value('top10tor_week_'.$Limit.$WhereSum);
 	if ($TopTorrentsActiveLastWeek === false) {
-		if (query_locked('top10')) {
-			$TopTorrentsActiveLastWeek = false;
-		} else {
-			set_query_lock('top10');
+		if ($Cache->get_query_lock('top10')) {
 			$WeekAgo = time_minus(604800);
 			$Query = $BaseQuery.' WHERE ';
 			if (!empty($Where)) { $Query .= $Where.' AND '; }
@@ -182,7 +178,9 @@
 			$DB->query($Query);
 			$TopTorrentsActiveLastWeek = $DB->to_array(false, MYSQLI_NUM);
 			$Cache->cache_value('top10tor_week_'.$Limit.$WhereSum,$TopTorrentsActiveLastWeek,3600*6);
-			clear_query_lock('top10');
+			$Cache->clear_query_lock('top10');
+		} else {
+			$TopTorrentsActiveLastWeek = false;
 		}
 	}
 	generate_torrent_table('Most Active Torrents Uploaded in the Past Week', 'week', $TopTorrentsActiveLastWeek, $Limit);
@@ -191,10 +189,7 @@
 if($Details=='all' || $Details=='month') {
 	$TopTorrentsActiveLastMonth = $Cache->get_value('top10tor_month_'.$Limit.$WhereSum);
 	if ($TopTorrentsActiveLastMonth === false) {
-		if (query_locked('top10')) {
-			$TopTorrentsActiveLastMonth = false;
-		} else {
-			set_query_lock('top10');
+		if ($Cache->get_query_lock('top10')) {
 			$Query = $BaseQuery.' WHERE ';
 			if (!empty($Where)) { $Query .= $Where.' AND '; }
 			$Query .= "
@@ -204,7 +199,9 @@
 			$DB->query($Query);
 			$TopTorrentsActiveLastMonth = $DB->to_array(false, MYSQLI_NUM);
 			$Cache->cache_value('top10tor_month_'.$Limit.$WhereSum,$TopTorrentsActiveLastMonth,3600*6);
-			clear_query_lock('top10');
+			$Cache->clear_query_lock('top10');
+		} else {
+			$TopTorrentsActiveLastMonth = false;
 		}
 	}
 	generate_torrent_table('Most Active Torrents Uploaded in the Past Month', 'month', $TopTorrentsActiveLastMonth, $Limit);
@@ -213,10 +210,7 @@
 if($Details=='all' || $Details=='year') {
 	$TopTorrentsActiveLastYear = $Cache->get_value('top10tor_year_'.$Limit.$WhereSum);
 	if ($TopTorrentsActiveLastYear === false) {
-		if (query_locked('top10')) {
-			$TopTorrentsActiveLastYear = false;
-		} else {
-			set_query_lock('top10');
+		if ($Cache->get_query_lock('top10')) {
 			// IMPORTANT NOTE - we use WHERE t.Seeders>200 in order to speed up this query. You should remove it!
 			$Query = $BaseQuery.' WHERE ';
 			if ($Details=='all' && !$Filtered) {
@@ -231,7 +225,9 @@
 			$DB->query($Query);
 			$TopTorrentsActiveLastYear = $DB->to_array(false, MYSQLI_NUM);
 			$Cache->cache_value('top10tor_year_'.$Limit.$WhereSum,$TopTorrentsActiveLastYear,3600*6);
-			clear_query_lock('top10');
+			$Cache->clear_query_lock('top10');
+		} else {
+			$TopTorrentsActiveLastYear = false;
 		}
 	}
 	generate_torrent_table('Most Active Torrents Uploaded in the Past Year', 'year', $TopTorrentsActiveLastYear, $Limit);
@@ -240,10 +236,7 @@
 if($Details=='all' || $Details=='overall') {
 	$TopTorrentsActiveAllTime = $Cache->get_value('top10tor_overall_'.$Limit.$WhereSum);
 	if ($TopTorrentsActiveAllTime === false) {
-		if (query_locked('top10')) {
-			$TopTorrentsActiveAllTime = false;
-		} else {
-			set_query_lock('top10');
+		if ($Cache->get_query_lock('top10')) {
 			// IMPORTANT NOTE - we use WHERE t.Seeders>500 in order to speed up this query. You should remove it!
 			$Query = $BaseQuery;
 			if ($Details=='all' && !$Filtered) {
@@ -257,7 +250,9 @@
 			$DB->query($Query);
 			$TopTorrentsActiveAllTime = $DB->to_array(false, MYSQLI_NUM);
 			$Cache->cache_value('top10tor_overall_'.$Limit.$WhereSum,$TopTorrentsActiveAllTime,3600*6);
-			clear_query_lock('top10');
+			$Cache->clear_query_lock('top10');
+		} else {
+			$TopTorrentsActiveAllTime = false;
 		}
 	}
 	generate_torrent_table('Most Active Torrents of All Time', 'overall', $TopTorrentsActiveAllTime, $Limit);
@@ -266,10 +261,7 @@
 if(($Details=='all' || $Details=='snatched') && !$Filtered) {
 	$TopTorrentsSnatched = $Cache->get_value('top10tor_snatched_'.$Limit.$WhereSum);
 	if ($TopTorrentsSnatched === false) {
-		if (query_locked('top10')) {
-			$TopTorrentsSnatched = false;
-		} else {
-			set_query_lock('top10');
+		if ($Cache->get_query_lock('top10')) {
 			$Query = $BaseQuery;
 			if (!empty($Where)) { $Query .= ' WHERE '.$Where; }
 			$Query .= "
@@ -278,7 +270,9 @@
 			$DB->query($Query);
 			$TopTorrentsSnatched = $DB->to_array(false, MYSQLI_NUM);
 			$Cache->cache_value('top10tor_snatched_'.$Limit.$WhereSum,$TopTorrentsSnatched,3600*6);
-			clear_query_lock('top10');
+			$Cache->clear_query_lock('top10');
+		} else {
+			$TopTorrentsSnatched = false;
 		}
 	}
 	generate_torrent_table('Most Snatched Torrents', 'snatched', $TopTorrentsSnatched, $Limit);
@@ -287,10 +281,7 @@
 if(($Details=='all' || $Details=='data') && !$Filtered) {
 	$TopTorrentsTransferred = $Cache->get_value('top10tor_data_'.$Limit.$WhereSum);
 	if ($TopTorrentsTransferred === false) {
-		if (query_locked('top10')) {
-			$TopTorrentsTransferred = false;
-		} else {
-			set_query_lock('top10');
+		if ($Cache->get_query_lock('top10')) {
 			// IMPORTANT NOTE - we use WHERE t.Snatched>100 in order to speed up this query. You should remove it!
 			$Query = $BaseQuery;
 			if ($Details=='all') {
@@ -303,7 +294,9 @@
 			$DB->query($Query);
 			$TopTorrentsTransferred = $DB->to_array(false, MYSQLI_NUM);
 			$Cache->cache_value('top10tor_data_'.$Limit.$WhereSum,$TopTorrentsTransferred,3600*6);
-			clear_query_lock('top10');
+			$Cache->clear_query_lock('top10');
+		} else {
+			$TopTorrentsTransferred = false;
 		}
 	}
 	generate_torrent_table('Most Data Transferred Torrents', 'data', $TopTorrentsTransferred, $Limit);
@@ -312,10 +305,7 @@
 if(($Details=='all' || $Details=='seeded') && !$Filtered) {
 	$TopTorrentsSeeded = $Cache->get_value('top10tor_seeded_'.$Limit.$WhereSum);
 	if ($TopTorrentsSeeded === false) {
-		if (query_locked('top10')) {
-			$TopTorrentsSeeded = false;
-		} else {
-			set_query_lock('top10');
+		if ($Cache->get_query_lock('top10')) {
 			$Query = $BaseQuery;
 			if (!empty($Where)) { $Query .= ' WHERE '.$Where; }
 			$Query .= "
@@ -324,7 +314,9 @@
 			$DB->query($Query);
 			$TopTorrentsSeeded = $DB->to_array(false, MYSQLI_NUM);
 			$Cache->cache_value('top10tor_seeded_'.$Limit.$WhereSum,$TopTorrentsSeeded,3600*6);
-			clear_query_lock('top10');
+			$Cache->clear_query_lock('top10');
+		} else {
+			$TopTorrentsSeeded = false;
 		}
 	}
 	generate_torrent_table('Best Seeded Torrents', 'seeded', $TopTorrentsSeeded, $Limit);
@@ -333,11 +325,11 @@
 ?>
 </div>
 <?
-show_footer();
+View::show_footer();
 
 // generate a table based on data from most recent query to $DB
 function generate_torrent_table($Caption, $Tag, $Details, $Limit) {
-	global $LoggedUser,$Categories,$Debug,$ReleaseTypes;
+	global $LoggedUser,$Categories,$ReleaseTypes;
 ?>
 		<h3>Top <?=$Limit.' '.$Caption?>
 <?	if(empty($_GET['advanced'])){ ?> 
@@ -379,7 +371,7 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) {
 ?>
 		<tr class="rowb">
 			<td colspan="9" class="center">
-				Server is busy processing another top10 request. Please try again in a minute.
+				Server is busy processing another top list request. Please try again in a minute.
 			</td>
 		</tr>
 		</table><br />
@@ -402,7 +394,7 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) {
 	foreach ($Details as $Detail) {
 		$GroupIDs[] = $Detail[1];
 	}
-	$Artists = get_artists($GroupIDs);
+	$Artists = Artists::get_artists($GroupIDs);
 
 	foreach ($Details as $Detail) {
 		list($TorrentID,$GroupID,$GroupName,$GroupCategoryID,$TorrentTags,
@@ -418,7 +410,7 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) {
 		
 		
 		if(!empty($Artists[$GroupID])) {
-			$DisplayName = display_artists($Artists[$GroupID], true, true);
+			$DisplayName = Artists::display_artists($Artists[$GroupID], true, true);
 		}
 		
 		$DisplayName.= "<a href='torrents.php?id=$GroupID&amp;torrentid=$TorrentID'  title='View Torrent'>$GroupName</a>";
@@ -476,7 +468,7 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) {
 			<strong><?=$DisplayName?></strong> <?=$ExtraInfo?>
 			<?=$TorrentTags?>
 		</td>
-		<td style="text-align:right" class="nobr"><?=get_size($Data)?></td>
+		<td style="text-align:right" class="nobr"><?=Format::get_size($Data)?></td>
 		<td style="text-align:right"><?=number_format((double) $Snatched)?></td>
 		<td style="text-align:right"><?=number_format((double) $Seeders)?></td>
 		<td style="text-align:right"><?=number_format((double) $Leechers)?></td>
diff --git a/sections/top10/users.php b/sections/top10/users.php
index 32a44432..c9f8d074 100644
--- a/sections/top10/users.php
+++ b/sections/top10/users.php
@@ -10,7 +10,7 @@
 	$Details = 'all';
 }
 
-show_header('Top 10 Users');
+View::show_header('Top 10 Users');
 ?>
 <div class="thin">
 	<div class="header">
@@ -92,7 +92,7 @@
 
 
 echo '</div>';
-show_footer();
+View::show_footer();
 exit;
 
 // generate a table based on data from most recent query to $DB
@@ -151,13 +151,13 @@ function generate_user_table($Caption, $Tag, $Details, $Limit) {
 ?>
 	<tr class="row<?=$Highlight?>">
 		<td class="center"><?=$Rank?></td>
-		<td><?=format_username($Detail['ID'], false, false, false)?></td>
-		<td style="text-align:right"><?=get_size($Detail['Uploaded'])?></td>
-		<td style="text-align:right"><?=get_size($Detail['UpSpeed'])?>/s</td>
-		<td style="text-align:right"><?=get_size($Detail['Downloaded'])?></td>
-		<td style="text-align:right"><?=get_size($Detail['DownSpeed'])?>/s</td>
+		<td><?=Users::format_username($Detail['ID'], false, false, false)?></td>
+		<td style="text-align:right"><?=Format::get_size($Detail['Uploaded'])?></td>
+		<td style="text-align:right"><?=Format::get_size($Detail['UpSpeed'])?>/s</td>
+		<td style="text-align:right"><?=Format::get_size($Detail['Downloaded'])?></td>
+		<td style="text-align:right"><?=Format::get_size($Detail['DownSpeed'])?>/s</td>
 		<td style="text-align:right"><?=number_format($Detail['NumUploads'])?></td>
-		<td style="text-align:right"><?=ratio($Detail['Uploaded'], $Detail['Downloaded'])?></td>
+		<td style="text-align:right"><?=Format::get_ratio_html($Detail['Uploaded'], $Detail['Downloaded'])?></td>
 		<td style="text-align:right"><?=time_diff($Detail['JoinDate'])?></td>
 	</tr>
 <?
diff --git a/sections/torrents/add_alias.php b/sections/torrents/add_alias.php
index 05cb795c..2541625c 100644
--- a/sections/torrents/add_alias.php
+++ b/sections/torrents/add_alias.php
@@ -13,7 +13,7 @@
 $Changed = false;
 
 for($i = 0; $i < count($AliasNames); $i++) {
-	$AliasName = normalise_artist_name($AliasNames[$i]);
+	$AliasName = Artists::normalise_artist_name($AliasNames[$i]);
 	$Importance = $Importances[$i];
 	
 	if($Importance!='1' && $Importance!='2' && $Importance!='3' && $Importance!='4' && $Importance!='5' && $Importance!='6' && $Importance!='7') {
@@ -60,8 +60,8 @@
 				ON DUPLICATE KEY UPDATE 
 				NumArtists=VALUES(NumArtists);");
 			
-			write_log("Artist ".$ArtistID." (".$ArtistName.") was added to the group ".$GroupID." (".$GroupName.") as ".$ArtistTypes[$Importance]." by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].")");
-			write_group_log($GroupID, 0, $LoggedUser['ID'], "added artist ".$ArtistName." as ".$ArtistTypes[$Importance], 0);
+			Misc::write_log("Artist ".$ArtistID." (".$ArtistName.") was added to the group ".$GroupID." (".$GroupName.") as ".$ArtistTypes[$Importance]." by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].")");
+			Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "added artist ".$ArtistName." as ".$ArtistTypes[$Importance], 0);
 		}
 	}
 }
@@ -70,7 +70,7 @@
 	$Cache->delete_value('torrents_details_'.$GroupID);
 	$Cache->delete_value('groups_artists_'.$GroupID); // Delete group artist cache
 	$Cache->delete_value('artist_'.$ArtistID);
-	update_hash($GroupID);
+	Torrents::update_hash($GroupID);
 }
 
 header('Location: '.$_SERVER['HTTP_REFERER']);
diff --git a/sections/torrents/add_tag.php b/sections/torrents/add_tag.php
index 03b91459..07cf04fb 100644
--- a/sections/torrents/add_tag.php
+++ b/sections/torrents/add_tag.php
@@ -10,10 +10,10 @@
 
 $Tags = explode(',', $_POST['tagname']);
 foreach($Tags as $TagName) {
-	$TagName = sanitize_tag($TagName);
+	$TagName = Misc::sanitize_tag($TagName);
    
 	if(!empty($TagName)) {
-	    $TagName = get_alias_tag($TagName);
+	    $TagName = Misc::get_alias_tag($TagName);
 		// Check DB for tag matching name
 		$DB->query("SELECT t.ID FROM tags AS t WHERE t.Name LIKE '".$TagName."'");
 		list($TagID) = $DB->next_record();
@@ -43,6 +43,6 @@
 	}
 }
 
-update_hash($GroupID); // Delete torrent group cache
+Torrents::update_hash($GroupID); // Delete torrent group cache
 header('Location: '.$_SERVER['HTTP_REFERER']);
 ?>
diff --git a/sections/torrents/browse.php b/sections/torrents/browse.php
index 03cf3feb..98df16c3 100644
--- a/sections/torrents/browse.php
+++ b/sections/torrents/browse.php
@@ -92,7 +92,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 		else { $NewWay="DESC"; }
 	} else { $NewWay=$DefaultWay; }
 	
-	return "torrents.php?order_way=".$NewWay."&amp;order_by=".$SortKey."&amp;".get_url(array('order_way','order_by'));
+	return "torrents.php?order_way=".$NewWay."&amp;order_by=".$SortKey."&amp;".Format::get_url(array('order_way','order_by'));
 }
 
 // Setting default search options
@@ -137,7 +137,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 $OrderBy="s3"; // We order by GroupTime by default
 $OrderWay="DESC"; // We also order descending by default
 
-list($Page,$Limit) = page_limit(TORRENTS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(TORRENTS_PER_PAGE);
 
 if (preg_match('/^s[1-7]$/',$_GET['order_by'])) { $OrderBy=strtolower($_GET['order_by']); }
 if (in_array(strtolower($_GET['order_way']),array('desc','asc'))) { $OrderWay=strtoupper($_GET['order_way']); }
@@ -535,14 +535,14 @@ function header_link($SortKey,$DefaultWay="DESC") {
 }
  
  // List of pages
-$Pages=get_pages($Page,$TorrentCount,TORRENTS_PER_PAGE);
+$Pages=Format::get_pages($Page,$TorrentCount,TORRENTS_PER_PAGE);
 
 // Gets tacked onto torrent download URLs
 $DownloadString="&amp;authkey=".$LoggedUser['AuthKey']."&amp;torrent_pass=".$LoggedUser['torrent_pass'];
 
 if($Title) { $Title=$TitleUser."'s  ".$Title; } else { $Title="Browse Torrents"; }
 
-show_header($Title,'browse');
+View::show_header($Title,'browse');
 ?>
 <form name="filter" method="get" action=''>
 <? if($UserID) { ?>
@@ -553,9 +553,9 @@ function header_link($SortKey,$DefaultWay="DESC") {
 	<h3>
 		Filter
 <? if(strtolower($_GET['action'])!="advanced" && (!$LoggedUser['SearchType'] || strtolower($_GET['action'])=="basic") && check_perms('site_advanced_search')) { ?>
-		(<a href="torrents.php?action=advanced&amp;<?=get_url(array('action'))?>">Advanced Search</a>)
+		(<a href="torrents.php?action=advanced&amp;<?=Format::get_url(array('action'))?>">Advanced Search</a>)
 <? } elseif((strtolower($_GET['action'])=="advanced" || ($LoggedUser['SearchType'] && strtolower($_GET['action'])!="basic")) && check_perms('site_advanced_search')) { ?>
-		(<a href="torrents.php?<? if($LoggedUser['SearchType']) { ?>action=basic&amp;<? } echo get_url(array('action')); ?>">Basic Search</a>)
+		(<a href="torrents.php?<? if($LoggedUser['SearchType']) { ?>action=basic&amp;<? } echo Format::get_url(array('action')); ?>">Basic Search</a>)
 <? } ?>
 	</h3>
 	<div class="box pad">
@@ -810,7 +810,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 	foreach($TorrentList as $Key => $Properties) {
 		$GroupIDs[] = $Properties[0];
 	}
-	$Artists = get_artists($GroupIDs);
+	$Artists = Artists::get_artists($GroupIDs);
 	foreach ($TorrentList as $Key => $Properties) {
 		list($GroupID,$GroupName,$GroupYear,$GroupCategoryID,$GroupTime,$MaxSize,$TotalSnatched,$TotalSeeders,$TotalLeechers,$TorrentsID,$TorrentTags,$TorrentsMedia,$TorrentsFormat,$TorrentsEncoding,$TorrentsYear,$TorrentsRemastered,$TorrentsRemasterTitle,$TorrentsScene,$TorrentsLog,$TorrentsCue,$TorrentsLogScores,$TorrentsFileCount,$TorrentsFreeTorrent,$TorrentsSize,$TorrentsLeechers,$TorrentsSeeders,$TorrentsSnatched,$TorrentsTime) = $Properties;
 		$Torrents['id']		=explode('|',$TorrentsID);
@@ -872,7 +872,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 		}
 
 		if ($GroupName=='') { $GroupName="- None -"; }
-		$DisplayName = display_artists($Artists[$GroupID]);
+		$DisplayName = Artists::display_artists($Artists[$GroupID]);
 		if((count($Torrents['id'])>1 || $GroupCategoryID==1) && !$DisableGrouping) {
 			// These torrents are in a group
 			$DisplayName.='<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
@@ -887,7 +887,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 			<?=$TorrentTags?>
 		</td>
 		<td class="nobr"><?=time_diff($GroupTime,1)?></td>
-		<td class="nobr"><?=get_size($MaxSize)?> (Max)</td>
+		<td class="nobr"><?=Format::get_size($MaxSize)?> (Max)</td>
 		<td><?=number_format($TotalSnatched)?></td>
 		<td<?=($TotalSeeders==0)?' class="r00"':''?>><?=number_format($TotalSeeders)?></td>
 		<td><?=number_format($TotalLeechers)?></td>
@@ -960,7 +960,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 		</td>
 		<td><?=$Torrents['filecount'][$Key]?></td>
 		<td class="nobr"><?=time_diff($Torrents['time'][$Key],1)?></td>
-		<td class="nobr"><?=get_size($Torrents['size'][$Key])?></td>
+		<td class="nobr"><?=Format::get_size($Torrents['size'][$Key])?></td>
 		<td><?=number_format($Torrents['snatched'][$Key])?></td>
 		<td<?=($Torrents['seeders'][$Key]==0)?' class="r00"':''?>><?=number_format($Torrents['seeders'][$Key])?></td>
 		<td><?=number_format($Torrents['leechers'][$Key])?></td>
@@ -1007,7 +1007,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 		</td>
 		<td><?=$Torrents['filecount'][0]?></td>
 		<td class="nobr"><?=time_diff($GroupTime,1)?></td>
-		<td class="nobr"><?=get_size($Torrents['size'][0])?></td>
+		<td class="nobr"><?=Format::get_size($Torrents['size'][0])?></td>
 		<td><?=number_format($TotalSnatched)?></td>
 		<td<?=($TotalSeeders==0)?' class="r00"':''?>><?=number_format($TotalSeeders)?></td>
 		<td><?=number_format($TotalLeechers)?></td>
@@ -1043,4 +1043,4 @@ function header_link($SortKey,$DefaultWay="DESC") {
 </div>
 <? } ?>
 <div class="linkbox"><?=$Pages?></div>
-<? show_footer(array('disclaimer'=>false)); ?>
+<? View::show_footer(array('disclaimer'=>false)); ?>
diff --git a/sections/torrents/browse2.php b/sections/torrents/browse2.php
index 777acf12..d7a249bb 100644
--- a/sections/torrents/browse2.php
+++ b/sections/torrents/browse2.php
@@ -32,7 +32,7 @@ function header_link($SortKey,$DefaultWay="desc") {
 		else { $NewWay="desc"; }
 	} else { $NewWay=$DefaultWay; }
 	
-	return "torrents.php?order_way=".$NewWay."&amp;order_by=".$SortKey."&amp;".get_url(array('order_way','order_by'));
+	return "torrents.php?order_way=".$NewWay."&amp;order_by=".$SortKey."&amp;".Format::get_url(array('order_way','order_by'));
 }
 
 $TokenTorrents = $Cache->get_value('users_tokens_'.$UserID);
@@ -379,7 +379,7 @@ function header_link($SortKey,$DefaultWay="desc") {
 // If some were fetched from memcached, get their artists
 if(!empty($Results['matches'])) { // Fetch the artists for groups
 	$GroupIDs = array_keys($Results['matches']);
-	$Artists = get_artists($GroupIDs);
+	$Artists = Artists::get_artists($GroupIDs);
 	
 	foreach($Artists as $GroupID=>$Data) {
 		if(!empty($Data[1])) {
@@ -391,7 +391,7 @@ function header_link($SortKey,$DefaultWay="desc") {
 */
 // These ones were not found in the cache, run SQL
 if(!empty($Results['notfound'])) {
-	$SQLResults = get_groups($Results['notfound']);
+	$SQLResults = Torrents::get_groups($Results['notfound']);
 	
 	if(is_array($SQLResults['notfound'])) { // Something wasn't found in the db, remove it from results
 		reset($SQLResults['notfound']);
@@ -420,7 +420,7 @@ function header_link($SortKey,$DefaultWay="desc") {
 
 
 
-show_header('Browse Torrents','browse');
+View::show_header('Browse Torrents','browse');
 
 
 ?>
@@ -429,9 +429,9 @@ function header_link($SortKey,$DefaultWay="desc") {
 	<h3>
 		Filter		
 <? if($AdvancedSearch) { ?>
-			(<a href="torrents.php?<? if(!empty($LoggedUser['SearchType'])) { ?>action=basic&amp;<? } echo get_url(array('action')); ?>">Basic Search</a>)
+			(<a href="torrents.php?<? if(!empty($LoggedUser['SearchType'])) { ?>action=basic&amp;<? } echo Format::get_url(array('action')); ?>">Basic Search</a>)
 <? } else { ?>
-			(<a href="torrents.php?action=advanced&amp;<?=get_url(array('action'))?>">Advanced Search</a>)
+			(<a href="torrents.php?action=advanced&amp;<?=Format::get_url(array('action'))?>">Advanced Search</a>)
 <? } 
 ?>
 	</h3>
@@ -441,38 +441,38 @@ function header_link($SortKey,$DefaultWay="desc") {
 			<tr>
 				<td class="label">Artist Name:</td>
 				<td colspan="3">
-					<input type="text" spellcheck="false" size="40" name="artistname" class="inputtext smaller" value="<?form('artistname')?>" />
+					<input type="text" spellcheck="false" size="40" name="artistname" class="inputtext smaller" value="<?Format::form('artistname')?>" />
 					<input type="hidden" name="action" value="advanced" />
 				</td>
 			</tr>
 			<tr>
 				<td class="label">Album/Torrent Name:</td>
 				<td colspan="3">
-					<input type="text" spellcheck="false" size="40" name="groupname" class="inputtext smaller" value="<?form('groupname')?>" />
+					<input type="text" spellcheck="false" size="40" name="groupname" class="inputtext smaller" value="<?Format::form('groupname')?>" />
 				</td>
 			</tr>
 			<tr>
 				<td class="label">Record Label:</td>
 				<td colspan="3">
-					<input type="text" spellcheck="false" size="40" name="recordlabel" class="inputtext smaller" value="<?form('recordlabel')?>" />
+					<input type="text" spellcheck="false" size="40" name="recordlabel" class="inputtext smaller" value="<?Format::form('recordlabel')?>" />
 				</td>
 			</tr>
 			<tr>
 				<td class="label">Catalogue Number:</td>
 				<td>
-					<input type="text" size="40" name="cataloguenumber" class="inputtext smallest" value="<?form('cataloguenumber')?>"  />
+					<input type="text" size="40" name="cataloguenumber" class="inputtext smallest" value="<?Format::form('cataloguenumber')?>"  />
 				</td>
 				<td class="label">Year:</td>
 				<td>
-					<input type="text" name="year" class="inputtext smallest" value="<?form('year')?>" size="4" />
+					<input type="text" name="year" class="inputtext smallest" value="<?Format::form('year')?>" size="4" />
 				</td>
 			</tr>
 			<tr id="edition_expand">
 				<td colspan="4" class="center">[<a href="#" onclick="ToggleEditionRows();return false;">Click here to toggle searching for specific remaster information</a>]</td>
 			</tr>
 <?
-if(form('remastertitle', true) == "" && form('remasteryear', true) == "" && 
-	form('remasterrecordlabel', true) == "" && form('remastercataloguenumber', true) == "") {
+if(Format::form('remastertitle', true) == "" && Format::form('remasteryear', true) == "" && 
+	Format::form('remasterrecordlabel', true) == "" && Format::form('remastercataloguenumber', true) == "") {
 		$Hidden = 'hidden';
 } else {
 	$Hidden = '';
@@ -481,29 +481,29 @@ function header_link($SortKey,$DefaultWay="desc") {
 			<tr id="edition_title" class="<?=$Hidden?>">
 				<td class="label">Edition Title:</td>
 				<td>
-					<input type="text" spellcheck="false" size="40" name="remastertitle" class="inputtext smaller" value="<?form('remastertitle')?>" />
+					<input type="text" spellcheck="false" size="40" name="remastertitle" class="inputtext smaller" value="<?Format::form('remastertitle')?>" />
 				</td>
 				<td class="label">Edition Year:</td>
 				<td>
-					<input type="text" name="remasteryear" class="inputtext smallest" value="<?form('remasteryear')?>" size="4" />
+					<input type="text" name="remasteryear" class="inputtext smallest" value="<?Format::form('remasteryear')?>" size="4" />
 				</td>
 			</tr>
 			<tr id="edition_label" class="<?=$Hidden?>">
 				<td class="label">Edition Release Label:</td>
 				<td colspan="3">
-					<input type="text" spellcheck="false" size="40" name="remasterrecordlabel" class="inputtext smaller" value="<?form('remasterrecordlabel')?>" />
+					<input type="text" spellcheck="false" size="40" name="remasterrecordlabel" class="inputtext smaller" value="<?Format::form('remasterrecordlabel')?>" />
 				</td>
 			</tr>
 			<tr id="edition_catalogue" class="<?=$Hidden?>">
 				<td class="label">Edition Catalogue Number:</td>
 				<td colspan="3">
-					<input type="text" size="40" name="remastercataloguenumber" class="inputtext smallest" value="<?form('remastercataloguenumber')?>" />
+					<input type="text" size="40" name="remastercataloguenumber" class="inputtext smallest" value="<?Format::form('remastercataloguenumber')?>" />
 				</td>
 			</tr>
 			<tr>
 				<td class="label">File List:</td>
 				<td colspan="3">
-					<input type="text" spellcheck="false" size="40" name="filelist" class="inputtext" value="<?form('filelist')?>" />
+					<input type="text" spellcheck="false" size="40" name="filelist" class="inputtext" value="<?Format::form('filelist')?>" />
 				</td>
 			</tr>
 			<tr>
@@ -512,24 +512,24 @@ function header_link($SortKey,$DefaultWay="desc") {
 					<select id="bitrate" name="encoding">
 						<option value="">Bitrate</option>
 <?	foreach($Bitrates as $BitrateName) { ?>
-						<option value="<?=display_str($BitrateName); ?>" <?selected('encoding', $BitrateName)?>><?=display_str($BitrateName); ?></option>
+						<option value="<?=display_str($BitrateName); ?>" <?Format::selected('encoding', $BitrateName)?>><?=display_str($BitrateName); ?></option>
 <?	} ?>			</select>
 					
 					<select name="format">
 						<option value="">Format</option>
 <?	foreach($Formats as $FormatName) { ?>
-						<option value="<?=display_str($FormatName); ?>" <?selected('format', $FormatName)?>><?=display_str($FormatName); ?></option>
+						<option value="<?=display_str($FormatName); ?>" <?Format::selected('format', $FormatName)?>><?=display_str($FormatName); ?></option>
 <?	} ?>			</select>
 					<select name="media">
 						<option value="">Media</option>
 <?	foreach($Media as $MediaName) { ?>
-						<option value="<?=display_str($MediaName); ?>" <?selected('media',$MediaName)?>><?=display_str($MediaName); ?></option>
+						<option value="<?=display_str($MediaName); ?>" <?Format::selected('media',$MediaName)?>><?=display_str($MediaName); ?></option>
 <?	} ?>
 					</select>
 					<select name="releasetype">
 						<option value="">Release type</option>
 <?	foreach($ReleaseTypes as $ID=>$Type) { ?>
-						<option value="<?=display_str($ID); ?>" <?selected('releasetype',$ID)?>><?=display_str($Type); ?></option>
+						<option value="<?=display_str($ID); ?>" <?Format::selected('releasetype',$ID)?>><?=display_str($Type); ?></option>
 <?	} ?>
 					</select>
 				</td>
@@ -539,32 +539,32 @@ function header_link($SortKey,$DefaultWay="desc") {
 				<td class="nobr" colspan="3">
 					<select name="haslog">
 						<option value="">Has Log</option>
-						<option value="1" <?selected('haslog','1')?>>Yes</option>
-						<option value="0" <?selected('haslog','0')?>>No</option>
-						<option value="100" <?selected('haslog','100')?>>100% only</option>
-						<option value="-1" <?selected('haslog','-1')?>>&lt;100%/Unscored</option>
+						<option value="1" <?Format::selected('haslog','1')?>>Yes</option>
+						<option value="0" <?Format::selected('haslog','0')?>>No</option>
+						<option value="100" <?Format::selected('haslog','100')?>>100% only</option>
+						<option value="-1" <?Format::selected('haslog','-1')?>>&lt;100%/Unscored</option>
 					</select>
 					<select name="hascue">
 						<option value="">Has Cue</option>
-						<option value="1" <?selected('hascue',1)?>>Yes</option>
-						<option value="0" <?selected('hascue',0)?>>No</option>
+						<option value="1" <?Format::selected('hascue',1)?>>Yes</option>
+						<option value="0" <?Format::selected('hascue',0)?>>No</option>
 					</select>
 					<select name="scene">
 						<option value="">Scene</option>
-						<option value="1" <?selected('scene',1)?>>Yes</option>
-						<option value="0" <?selected('scene',0)?>>No</option>
+						<option value="1" <?Format::selected('scene',1)?>>Yes</option>
+						<option value="0" <?Format::selected('scene',0)?>>No</option>
 					</select>
 					<select name="vanityhouse">
 						<option value="">Vanity House</option>
-						<option value="1" <?selected('vanityhouse',1)?>>Yes</option>
-						<option value="0" <?selected('vanityhouse',0)?>>No</option>
+						<option value="1" <?Format::selected('vanityhouse',1)?>>Yes</option>
+						<option value="0" <?Format::selected('vanityhouse',0)?>>No</option>
 					</select>
 					<select name="freetorrent">
 						<option value="">Leech Status</option>
-						<option value="1" <?selected('freetorrent',1)?>>Freeleech</option>
-						<option value="2" <?selected('freetorrent',2)?>>Neutral Leech</option>
-						<option value="3" <?selected('freetorrent',3)?>>Either</option>
-						<option value="0" <?selected('freetorrent',0)?>>Normal</option>
+						<option value="1" <?Format::selected('freetorrent',1)?>>Freeleech</option>
+						<option value="2" <?Format::selected('freetorrent',2)?>>Neutral Leech</option>
+						<option value="3" <?Format::selected('freetorrent',3)?>>Either</option>
+						<option value="0" <?Format::selected('freetorrent',0)?>>Normal</option>
 					</select>
 				</td>
 			</tr>
@@ -572,7 +572,7 @@ function header_link($SortKey,$DefaultWay="desc") {
 			<tr>
 				<td class="label">Search terms:</td>
 				<td colspan="3">
-					<input type="text" spellcheck="false" size="40" name="searchstr" class="inputtext" value="<?form('searchstr')?>" />
+					<input type="text" spellcheck="false" size="40" name="searchstr" class="inputtext" value="<?Format::form('searchstr')?>" />
 <?	if(!empty($LoggedUser['SearchType'])) { ?>
 					<input type="hidden" name="action" value="basic" />
 <?	} ?>
@@ -582,26 +582,26 @@ function header_link($SortKey,$DefaultWay="desc") {
 			<tr>
 				<td class="label">Tags (comma-separated):</td>
 				<td colspan="3">
-					<input type="text" size="40" id="tags" name="taglist" class="inputtext smaller" title="Use !tag to exclude tag" value="<?=str_replace('_','.',form('taglist', true))?>" />&nbsp;
-					<input type="radio" name="tags_type" id="tags_type0" value="0" <?selected('tags_type',0,'checked')?> /><label for="tags_type0"> Any</label>&nbsp;&nbsp;
-					<input type="radio" name="tags_type" id="tags_type1" value="1"  <?selected('tags_type',1,'checked')?> /><label for="tags_type1"> All</label>
+					<input type="text" size="40" id="tags" name="taglist" class="inputtext smaller" title="Use !tag to exclude tag" value="<?=str_replace('_','.',Format::form('taglist', true))?>" />&nbsp;
+					<input type="radio" name="tags_type" id="tags_type0" value="0" <?Format::selected('tags_type',0,'checked')?> /><label for="tags_type0"> Any</label>&nbsp;&nbsp;
+					<input type="radio" name="tags_type" id="tags_type1" value="1"  <?Format::selected('tags_type',1,'checked')?> /><label for="tags_type1"> All</label>
 				</td>
 			</tr>
 			<tr>
 				<td class="label">Order by:</td>
 				<td colspan="<?=($AdvancedSearch)?'3':'1'?>">
 					<select name="order_by" style="width:auto;">
-						<option value="time"<?selected('order_by','time')?>>Time added</option>
-						<option value="year"<?selected('order_by','year')?>>Year</option>
-						<option value="size"<?selected('order_by','size')?>>Size</option>
-						<option value="snatched"<?selected('order_by','snatched')?>>Snatched</option>
-						<option value="seeders"<?selected('order_by','seeders')?>>Seeders</option>
-						<option value="leechers"<?selected('order_by','leechers')?>>Leechers</option>
-						<option value="random"<?selected('order_by','random')?>>Random</option>
+						<option value="time"<?Format::selected('order_by','time')?>>Time added</option>
+						<option value="year"<?Format::selected('order_by','year')?>>Year</option>
+						<option value="size"<?Format::selected('order_by','size')?>>Size</option>
+						<option value="snatched"<?Format::selected('order_by','snatched')?>>Snatched</option>
+						<option value="seeders"<?Format::selected('order_by','seeders')?>>Seeders</option>
+						<option value="leechers"<?Format::selected('order_by','leechers')?>>Leechers</option>
+						<option value="random"<?Format::selected('order_by','random')?>>Random</option>
 					</select>
 					<select name="order_way">
-						<option value="desc"<?selected('order_way','desc')?>>Descending</option>
-						<option value="asc" <?selected('order_way','asc')?>>Ascending</option>
+						<option value="desc"<?Format::selected('order_way','desc')?>>Descending</option>
+						<option value="asc" <?Format::selected('order_way','asc')?>>Ascending</option>
 					</select>
 				</td>
 			</tr>
@@ -710,12 +710,12 @@ function header_link($SortKey,$DefaultWay="desc") {
 	<p>You might like (Beta): <? while(list($Tag)=$DB->next_record()) { ?><a href="torrents.php?taglist=<?=$Tag?>"><?=$Tag?></a> <? } ?></p>
 </div>
 <? 
-show_footer();die();
+View::show_footer();die();
 }
 
 if($TorrentCount < ($Page-1)*TORRENTS_PER_PAGE+1) {
 	$LastPage = ceil($TorrentCount/TORRENTS_PER_PAGE);
-	$Pages = get_pages(0, $TorrentCount, TORRENTS_PER_PAGE);
+	$Pages = Format::get_pages(0, $TorrentCount, TORRENTS_PER_PAGE);
 ?>
 <div class="box pad" align="center">
 	<h2>The requested page contains no matches.</h2>
@@ -723,11 +723,11 @@ function header_link($SortKey,$DefaultWay="desc") {
 </div>
 <div class="linkbox">Go to page <?=$Pages?></div>
 <?
-show_footer();die();
+View::show_footer();die();
 }
 
 // List of pages
-$Pages = get_pages($Page, $TorrentCount, TORRENTS_PER_PAGE);
+$Pages = Format::get_pages($Page, $TorrentCount, TORRENTS_PER_PAGE);
 
 $Bookmarks = all_bookmarks('torrent');
 ?>
@@ -765,9 +765,9 @@ function header_link($SortKey,$DefaultWay="desc") {
 		if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
 			unset($ExtendedArtists[2]);
 			unset($ExtendedArtists[3]);
-			$DisplayName = display_artists($ExtendedArtists);
+			$DisplayName = Artists::display_artists($ExtendedArtists);
 		} elseif(!empty($Artists)) {
-			$DisplayName = display_artists(array(1=>$Artists));
+			$DisplayName = Artists::display_artists(array(1=>$Artists));
 		} else {
 			$DisplayName='';
 		}
@@ -802,7 +802,7 @@ function header_link($SortKey,$DefaultWay="desc") {
 			</div>
 		</td>
 		<td class="nobr"><?=time_diff($GroupTime,1)?></td>
-		<td class="nobr"><?=get_size($MaxSize*1024)?> (Max)</td>
+		<td class="nobr"><?=Format::get_size($MaxSize*1024)?> (Max)</td>
 		<td><?=number_format($TotalSnatched)?></td>
 		<td<?=($TotalSeeders==0)?' class="r00"':''?>><?=number_format($TotalSeeders)?></td>
 		<td><?=number_format($TotalLeechers)?></td>
@@ -969,11 +969,11 @@ function header_link($SortKey,$DefaultWay="desc") {
 <?			} ?>
 				| <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" title="Report">RP</a> ]
 			</span>
-			&raquo; <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=torrent_info($Data)?></a>
+			&raquo; <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=Torrents::torrent_info($Data)?></a>
 		</td>
 		<td><?=$Data['FileCount']?></td>
 		<td class="nobr"><?=time_diff($Data['Time'],1)?></td>
-		<td class="nobr"><?=get_size($Data['Size'])?></td>
+		<td class="nobr"><?=Format::get_size($Data['Size'])?></td>
 		<td><?=number_format($Data['Snatched'])?></td>
 		<td<?=($Data['Seeders']==0)?' class="r00"':''?>><?=number_format($Data['Seeders'])?></td>
 		<td><?=number_format($Data['Leechers'])?></td>
@@ -1016,7 +1016,7 @@ function header_link($SortKey,$DefaultWay="desc") {
 		</td>
 		<td><?=$Data['FileCount']?></td>
 		<td class="nobr"><?=time_diff($GroupTime,1)?></td>
-		<td class="nobr"><?=get_size($Data['Size'])?></td>
+		<td class="nobr"><?=Format::get_size($Data['Size'])?></td>
 		<td><?=number_format($TotalSnatched)?></td>
 		<td<?=($TotalSeeders==0)?' class="r00"':''?>><?=number_format($TotalSeeders)?></td>
 		<td><?=number_format($TotalLeechers)?></td>
@@ -1027,4 +1027,4 @@ function header_link($SortKey,$DefaultWay="desc") {
 ?>
 </table>
 <div class="linkbox"><?=$Pages?></div>
-<? show_footer(array('disclaimer'=>false)); ?>
+<? View::show_footer(array('disclaimer'=>false)); ?>
diff --git a/sections/torrents/delete.php b/sections/torrents/delete.php
index 4efea5f8..58a28e72 100644
--- a/sections/torrents/delete.php
+++ b/sections/torrents/delete.php
@@ -24,7 +24,7 @@
 	error('You can no longer delete this torrent as it has been snatched by 5 or more users. If you believe there is a problem with the torrent please report it instead.');
 }
 
-show_header('Delete torrent', 'reportsv2');
+View::show_header('Delete torrent', 'reportsv2');
 ?>
 <div class="thin center">
 	<div class="box" style="width:600px; margin:0px auto;">
@@ -275,4 +275,4 @@
 </div>
 <?
 }
-show_footer(); ?>
\ No newline at end of file
+View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/torrents/delete_alias.php b/sections/torrents/delete_alias.php
index 55a2af3b..0f14598e 100644
--- a/sections/torrents/delete_alias.php
+++ b/sections/torrents/delete_alias.php
@@ -32,7 +32,7 @@
 $GroupCount = $DB->record_count();
 if(($ReqCount + $GroupCount) == 0) {
 	//The only group to use this artist
-	delete_artist($ArtistID);
+	Artists::delete_artist($ArtistID);
 } else {
 	//Not the only group, still need to clear cache
 	$Cache->delete_value('artist_'.$ArtistID);
@@ -49,10 +49,10 @@
 
 $Cache->delete_value('torrents_details_'.$GroupID); // Delete torrent group cache
 $Cache->delete_value('groups_artists_'.$GroupID); // Delete group artist cache
-write_log("Artist (".$ArtistTypes[$Importance].") ".$ArtistID." (".$ArtistName.") was removed from the group ".$GroupID." (".$GroupName.") by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].")");
-write_group_log($GroupID, 0, $LoggedUser['ID'], "removed artist ".$ArtistName." (".$ArtistTypes[$Importance].")", 0);
+Misc::write_log("Artist (".$ArtistTypes[$Importance].") ".$ArtistID." (".$ArtistName.") was removed from the group ".$GroupID." (".$GroupName.") by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].")");
+Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "removed artist ".$ArtistName." (".$ArtistTypes[$Importance].")", 0);
 
-update_hash($GroupID);
+Torrents::update_hash($GroupID);
 
 header('Location: '.$_SERVER['HTTP_REFERER']);
 ?>
diff --git a/sections/torrents/delete_tag.php b/sections/torrents/delete_tag.php
index 416f74ab..f4ba54fe 100644
--- a/sections/torrents/delete_tag.php
+++ b/sections/torrents/delete_tag.php
@@ -18,7 +18,7 @@
 $DB->query("DELETE FROM torrents_tags_votes WHERE GroupID='$GroupID' AND TagID='$TagID'");
 $DB->query("DELETE FROM torrents_tags WHERE GroupID='$GroupID' AND TagID='$TagID'");
 
-update_hash($GroupID);
+Torrents::update_hash($GroupID);
 
 $DB->query("SELECT COUNT(GroupID) FROM torrents_tags WHERE TagID=".$TagID);
 list($Count) = $DB->next_record();
diff --git a/sections/torrents/details.php b/sections/torrents/details.php
index d3d187c0..707cdf81 100644
--- a/sections/torrents/details.php
+++ b/sections/torrents/details.php
@@ -33,11 +33,11 @@ function compare($X, $Y){
 $Title=$GroupName; // goes in <title>
 $WikiBody = $Text->full_format($WikiBody);
 
-$Artists = get_artist($GroupID);
+$Artists = Artists::get_artist($GroupID);
 
 if($Artists) {
-	$DisplayName = '<span dir="ltr">'.display_artists($Artists, true).$DisplayName.'</span>';
-	$AltName = display_str(display_artists($Artists, false)).$AltName;
+	$DisplayName = '<span dir="ltr">'.Artists::display_artists($Artists, true).$DisplayName.'</span>';
+	$AltName = display_str(Artists::display_artists($Artists, false)).$AltName;
 	$Title = $AltName;
 }
 
@@ -87,7 +87,7 @@ function compare($X, $Y){
 }
 
 // Start output
-show_header($Title,'browse,comments,torrent,bbcode');
+View::show_header($Title,'browse,comments,torrent,bbcode');
 ?>
 <div class="thin">
 	<div class="header">
@@ -147,7 +147,7 @@ function compare($X, $Y){
 		foreach($Artists[4] as $Artist) {
 ?>
 				<li class="artists_composers">
-					<?=display_artist($Artist).'&lrm;'?>
+					<?=Artists::display_artist($Artist).'&lrm;'?>
 <?			if(check_perms('torrents_edit')){
 				$DB->query("SELECT AliasID FROM artists_alias WHERE ArtistID = ".$Artist['id']." AND ArtistID != AliasID AND Name = '".db_string($Artist['name'])."'");
 				list($AliasID) = $DB->next_record();
@@ -166,7 +166,7 @@ function compare($X, $Y){
 		foreach($Artists[6] as $Artist) {
 ?>
 				<li class="artists_dj">
-					<?=display_artist($Artist).'&lrm;'?>
+					<?=Artists::display_artist($Artist).'&lrm;'?>
 <?		      if(check_perms('torrents_edit')){
 			        $DB->query("SELECT AliasID FROM artists_alias WHERE ArtistID = ".$Artist['id']." AND ArtistID != AliasID AND Name = '".db_string($Artist['name'])."'");
                                 list($AliasID) = $DB->next_record();
@@ -189,7 +189,7 @@ function compare($X, $Y){
 	foreach($Artists[1] as $Artist) {
 ?>
 				<li class="artist_main">
-					<?=display_artist($Artist).'&lrm;'?>
+					<?=Artists::display_artist($Artist).'&lrm;'?>
 <?		if(check_perms('torrents_edit')){
 			$AliasID = $Artist['aliasid'];
 			if (empty($AliasID)) {
@@ -207,7 +207,7 @@ function compare($X, $Y){
 		foreach($Artists[2] as $Artist) {
 ?>
 				<li class="artist_guest">
-					<?=display_artist($Artist).'&lrm;'?>
+					<?=Artists::display_artist($Artist).'&lrm;'?>
 <?			if(check_perms('torrents_edit')){
 				$DB->query("SELECT AliasID FROM artists_alias WHERE ArtistID = ".$Artist['id']." AND ArtistID != AliasID AND Name = '".db_string($Artist['name'])."'");
 				list($AliasID) = $DB->next_record();
@@ -227,7 +227,7 @@ function compare($X, $Y){
 		foreach($Artists[5] as $Artist) {
 ?>
 				<li class="artists_conductors">
-					<?=display_artist($Artist).'&lrm;'?>
+					<?=Artists::display_artist($Artist).'&lrm;'?>
 <?			if(check_perms('torrents_edit')){
 				$DB->query("SELECT AliasID FROM artists_alias WHERE ArtistID = ".$Artist['id']." AND ArtistID != AliasID AND Name = '".db_string($Artist['name'])."'");
 				list($AliasID) = $DB->next_record();
@@ -247,7 +247,7 @@ function compare($X, $Y){
 		foreach($Artists[3] as $Artist) {
 ?>
 				<li class="artists_remix">
-					<?=display_artist($Artist).'&lrm;'?>
+					<?=Artists::display_artist($Artist).'&lrm;'?>
 <?		      if(check_perms('torrents_edit')){
 			        $DB->query("SELECT AliasID FROM artists_alias WHERE ArtistID = ".$Artist['id']." AND ArtistID != AliasID AND Name = '".db_string($Artist['name'])."'");
                                 list($AliasID) = $DB->next_record();
@@ -267,7 +267,7 @@ function compare($X, $Y){
 		foreach($Artists[7] as $Artist) {
 ?>
 				<li class="artists_producer">
-					<?=display_artist($Artist).'&lrm;'?>
+					<?=Artists::display_artist($Artist).'&lrm;'?>
 <?		      if(check_perms('torrents_edit')){
 			        $DB->query("SELECT AliasID FROM artists_alias WHERE ArtistID = ".$Artist['id']." AND ArtistID != AliasID AND Name = '".db_string($Artist['name'])."'");
                                 list($AliasID) = $DB->next_record();
@@ -376,7 +376,7 @@ function compare($X, $Y){
 <?
 
 function filelist($Str) {
-	return "</td><td>".get_size($Str[1])."</td></tr>";
+	return "</td><td>".Format::get_size($Str[1])."</td></tr>";
 }
 
 $LastRemasterYear = '-';
@@ -426,7 +426,7 @@ function filelist($Str) {
 		foreach($Reports as $Report) {
 			list($ReportID, $ReporterID, $ReportType, $ReportReason, $ReportedTime) = $Report;
 
-			$Reporter = user_info($ReporterID);
+			$Reporter = Users::user_info($ReporterID);
 			$ReporterName = $Reporter['Username'];
 
 			if (array_key_exists($ReportType, $Types[$GroupCategoryID])) {
@@ -455,7 +455,7 @@ function filelist($Str) {
 
 	$TorrentUploader = $Username; // Save this for "Uploaded by:" below
 
-	// similar to torrent_info()
+	// similar to Torrents::torrent_info()
 	if($Format) { $ExtraInfo.=display_str($Format); $AddExtra=' / '; }
 	if($Encoding) { $ExtraInfo.=$AddExtra.display_str($Encoding); $AddExtra=' / '; }
 	if($HasLog) { $ExtraInfo.=$AddExtra.'Log'; $AddExtra=' / '; }
@@ -542,7 +542,7 @@ function filelist($Str) {
 					]</span>
 					&raquo; <a href="#" onclick="$('#torrent_<?=$TorrentID?>').toggle(); return false;"><?=$ExtraInfo; ?></a>
 				</td>
-				<td class="nobr"><?=get_size($Size)?></td>
+				<td class="nobr"><?=Format::get_size($Size)?></td>
 				<td><?=number_format($Snatched)?></td>
 				<td><?=number_format($Seeders)?></td>
 				<td><?=number_format($Leechers)?></td>
@@ -550,7 +550,7 @@ function filelist($Str) {
 			<tr class="releases_<?=$ReleaseType?> groupid_<?=$GroupID?> edition_<?=$EditionID?> torrentdetails pad <? if(!isset($_GET['torrentid']) || $_GET['torrentid']!=$TorrentID) { ?>hidden<? } ?>" id="torrent_<?=$TorrentID; ?>">
 				<td colspan="5">
 					<blockquote>
-						Uploaded by <?=format_username($UserID, false, false, false)?> <?=time_diff($TorrentTime);?>
+						Uploaded by <?=Users::format_username($UserID, false, false, false)?> <?=time_diff($TorrentTime);?>
 <? if($Seeders == 0){ ?>
 						<?
 						if ($LastActive != '0000-00-00 00:00:00' && time() - strtotime($LastActive) >= 1209600) { ?>
@@ -635,7 +635,7 @@ function filelist($Str) {
 							&nbsp;&nbsp; <a href="javascript:Vote(0, <?=$Request['ID']?>)"><strong>(+)</strong></a>
 						</form>
 					</td>
-					<td><?=get_size($RequestVotes['TotalBounty'])?></td>
+					<td><?=Format::get_size($RequestVotes['TotalBounty'])?></td>
 				</tr>
 <?	} ?>
 			</table>
@@ -750,9 +750,9 @@ function filelist($Str) {
 if(isset($_GET['postid']) && is_number($_GET['postid']) && $Results > TORRENT_COMMENTS_PER_PAGE) {
 	$DB->query("SELECT COUNT(ID) FROM torrents_comments WHERE GroupID = $GroupID AND ID <= $_GET[postid]");
 	list($PostNum) = $DB->next_record();
-	list($Page,$Limit) = page_limit(TORRENT_COMMENTS_PER_PAGE,$PostNum);
+	list($Page,$Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE,$PostNum);
 } else {
-	list($Page,$Limit) = page_limit(TORRENT_COMMENTS_PER_PAGE,$Results);
+	list($Page,$Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE,$Results);
 }
 
 //Get the cache catalogue
@@ -786,7 +786,7 @@ function filelist($Str) {
 ?>
 	<div class="linkbox"><a name="comments"></a>
 <?
-$Pages=get_pages($Page,$Results,TORRENT_COMMENTS_PER_PAGE,9,'#comments');
+$Pages=Format::get_pages($Page,$Results,TORRENT_COMMENTS_PER_PAGE,9,'#comments');
 echo $Pages;
 ?>
 	</div>
@@ -795,15 +795,15 @@ function filelist($Str) {
 //---------- Begin printing
 foreach($Thread as $Key => $Post){
 	list($PostID, $AuthorID, $AddedTime, $Body, $EditedUserID, $EditedTime, $EditedUsername) = array_values($Post);
-	list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(user_info($AuthorID));
+	list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(Users::user_info($AuthorID));
 ?>
 <table class="forum_post box vertical_margin<?=$HeavyInfo['DisableAvatars'] ? ' noavatar' : ''?>" id="post<?=$PostID?>">
 	<tr class="colhead_dark">
 		<td colspan="2">
 			<span style="float:left;"><a class="post_id" href='torrents.php?id=<?=$GroupID?>&amp;postid=<?=$PostID?>#post<?=$PostID?>'>#<?=$PostID?></a>
-				<strong><?=format_username($AuthorID, true, true, true, true)?></strong> <?=time_diff($AddedTime)?> <a href="reports.php?action=report&amp;type=torrents_comment&amp;id=<?=$PostID?>">[Report]</a>
+				<strong><?=Users::format_username($AuthorID, true, true, true, true)?></strong> <?=time_diff($AddedTime)?> <a href="reports.php?action=report&amp;type=torrents_comment&amp;id=<?=$PostID?>">[Report]</a>
                     <? if(check_perms('users_warn') && $AuthorID != $LoggedUser['ID']) { 
-                        $AuthorInfo = user_info($AuthorID);
+                        $AuthorInfo = Users::user_info($AuthorID);
                         if($LoggedUser['Class'] >= $AuthorInfo['Class']) { ?>
                         <form  class="manage_form hidden" name="user" id="warn<?=$PostID?>" action="" method="post">
 	                        <input type="hidden" name="action" value="warn" />
@@ -849,7 +849,7 @@ function filelist($Str) {
 				<a href="#content<?=$PostID?>" onclick="LoadEdit('torrents', <?=$PostID?>, 1); return false;">&laquo;</a> 
 <? 	} ?>
 				Last edited by
-				<?=format_username($EditedUserID, false, false, false) ?> <?=time_diff($EditedTime,2,true,true)?>
+				<?=Users::format_username($EditedUserID, false, false, false) ?> <?=time_diff($EditedTime,2,true,true)?>
 <? } ?>
 			</div>
 		</td>
@@ -868,7 +868,7 @@ function filelist($Str) {
 					<tr class="colhead_dark">
 						<td colspan="2">
 							<span style="float:left;"><a href='#quickreplypreview'>#XXXXXX</a>
-								by <strong><?=format_username($LoggedUser['ID'], true, true, true, true)?></strong>	Just now
+								by <strong><?=Users::format_username($LoggedUser['ID'], true, true, true, true)?></strong>	Just now
 							<a href="#quickreplypreview">[Report Comment]</a>
 							</span>
 							<span id="barpreview" style="float:right;">
@@ -903,4 +903,4 @@ function filelist($Str) {
 <? } ?>
 	</div>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/torrents/download.php b/sections/torrents/download.php
index 625ceb59..1f32f862 100644
--- a/sections/torrents/download.php
+++ b/sections/torrents/download.php
@@ -53,9 +53,9 @@
 		error(404);
 	}
 	$Info = array($DB->next_record(MYSQLI_NUM, array(4,5,6,10)));
-	$Artists = get_artist($Info[0][4],false);
-	$Info['Artists'] = display_artists($Artists, false, true);
-	$Info['PlainArtists'] = display_artists($Artists, false, true, false);
+	$Artists = Artists::get_artist($Info[0][4],false);
+	$Info['Artists'] = Artists::display_artists($Artists, false, true);
+	$Info['PlainArtists'] = Artists::display_artists($Artists, false, true, false);
 	$Cache->cache_value('torrent_download_'.$TorrentID, $Info, 0);
 }
 if(!is_array($Info[0])) {
@@ -74,7 +74,7 @@
 		}
 	}
 	else {
-		$UInfo = user_heavy_info($UserID);
+		$UInfo = Users::user_heavy_info($UserID);
 		if ($UInfo['CanLeech'] != '1') {
 			error('You may not use tokens while leech disabled.');
 		}
@@ -97,7 +97,7 @@
 		}
 		
 		// Let the tracker know about this
-		if (!update_tracker('add_token', array('info_hash' => rawurlencode($InfoHash), 'userid' => $UserID))) {
+		if (!Tracker::update_tracker('add_token', array('info_hash' => rawurlencode($InfoHash), 'userid' => $UserID))) {
 			error("Sorry! An error occurred while trying to register your token. Most often, this is due to the tracker being down or under heavy load. Please try again later.");
 		}
 		
@@ -115,7 +115,7 @@
 			$DB->query("UPDATE users_main SET FLTokens = FLTokens - 1 WHERE ID=$UserID");
 			
 			// Fix for downloadthemall messing with the cached token count
-			$UInfo = user_heavy_info($UserID);
+			$UInfo = Users::user_heavy_info($UserID);
 			$FLTokens = $UInfo['FLTokens'];
 			
 			$Cache->begin_transaction('user_info_heavy_'.$UserID);
@@ -197,9 +197,9 @@
 
 if (!$TorrentName) { $TorrentName="No Name"; }
 
-$FileName = ($Browser == 'Internet Explorer') ? urlencode(file_string($TorrentName)) : file_string($TorrentName);
+$FileName = ($Browser == 'Internet Explorer') ? urlencode(Misc::file_string($TorrentName)) : Misc::file_string($TorrentName);
 $MaxLength = $DownloadAlt ? 192 : 196;
-$FileName = cut_string($FileName, $MaxLength, true, false);
+$FileName = Format::cut_string($FileName, $MaxLength, true, false);
 $FileName = $DownloadAlt ? $FileName.'.txt' : $FileName.'.torrent';
 
 
diff --git a/sections/torrents/downloadlist.php b/sections/torrents/downloadlist.php
index 7c98eb9b..1e81ee50 100644
--- a/sections/torrents/downloadlist.php
+++ b/sections/torrents/downloadlist.php
@@ -56,7 +56,7 @@
 foreach($Results as $ID=>$Data) {
 	list($SnatcherID, $Timestamp) = array_values($Data);
 	
-	$User = format_username($SnatcherID, true, true, true, true);
+	$User = Users::format_username($SnatcherID, true, true, true, true);
 	
 	if(!array_key_exists($SnatcherID, $Snatched) && $SnatcherID!=$UserID) {
 		$User = '<span style="font-style: italic;">'.$User.'</span>';
diff --git a/sections/torrents/edit.php b/sections/torrents/edit.php
index 41bd646e..cbb7dfb0 100644
--- a/sections/torrents/edit.php
+++ b/sections/torrents/edit.php
@@ -67,7 +67,7 @@
 }
 
 
-show_header('Edit torrent', 'upload');
+View::show_header('Edit torrent', 'upload');
 
 
 if(!($Properties['Remastered'] && !$Properties['RemasterYear']) || check_perms('edit_unknowns')) {
@@ -158,4 +158,4 @@
 <?
 } // if check_perms('torrents_edit')
 
-show_footer(); ?>
+View::show_footer(); ?>
diff --git a/sections/torrents/editgroup.php b/sections/torrents/editgroup.php
index bdac5530..2f171175 100644
--- a/sections/torrents/editgroup.php
+++ b/sections/torrents/editgroup.php
@@ -37,7 +37,7 @@
 
 if(!$Body) { $Body = $WikiBody; $Image = $WikiImage; }
 
-show_header('Edit torrent group');
+View::show_header('Edit torrent group');
 
 // Start printing form
 ?>
@@ -165,4 +165,4 @@
 	</div>
 <?	} ?> 
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/torrents/editgroupid.php b/sections/torrents/editgroupid.php
index bc8baf9d..c4224485 100644
--- a/sections/torrents/editgroupid.php
+++ b/sections/torrents/editgroupid.php
@@ -35,9 +35,9 @@
 		error('Target must be a music group.');
 	}
 
-	$Artists = get_artists(array($OldGroupID, $GroupID));
+	$Artists = Artists::get_artists(array($OldGroupID, $GroupID));
 	
-	show_header();
+	View::show_header();
 ?>
 	<div class="thin">
 		<div class="header">
@@ -52,15 +52,15 @@
 				<input type="hidden" name="oldgroupid" value="<?=$OldGroupID?>" />
 				<input type="hidden" name="groupid" value="<?=$GroupID?>" />
 				<h3>You are attempting to move the torrent with ID <?=$TorrentID?> from the group:</h3>
-				<ul><li><?= display_artists($Artists[$OldGroupID], true, false)?> - <a href="torrents.php?id=<?=$OldGroupID?>"><?=$Name?></a></li></ul>
+				<ul><li><?= Artists::display_artists($Artists[$OldGroupID], true, false)?> - <a href="torrents.php?id=<?=$OldGroupID?>"><?=$Name?></a></li></ul>
 				<h3>Into the group:</h3>
-				<ul><li><?= display_artists($Artists[$GroupID], true, false)?> - <a href="torrents.php?id=<?=$GroupID?>"><?=$NewName?></a></li></ul>
+				<ul><li><?= Artists::display_artists($Artists[$GroupID], true, false)?> - <a href="torrents.php?id=<?=$GroupID?>"><?=$NewName?></a></li></ul>
 				<input type="submit" value="Confirm" />
 			</form>
 		</div>
 	</div>
 <?
-	show_footer();
+	View::show_footer();
 } else {
 	authorize();
 
@@ -75,11 +75,11 @@
 		$DB->query("UPDATE torrents_comments SET GroupID='$GroupID' WHERE GroupID='$OldGroupID'");
 		$Cache->delete_value('torrent_comments_'.$GroupID.'_catalogue_0');
 		$Cache->delete_value('torrent_comments_'.$GroupID);
-		delete_group($OldGroupID);
+		Torrents::delete_group($OldGroupID);
 	} else {
-		update_hash($OldGroupID);
+		Torrents::update_hash($OldGroupID);
 	}
-	update_hash($GroupID);
+	Torrents::update_hash($GroupID);
 	
 	// Clear artist caches
 	$DB->query("SELECT DISTINCT ArtistID FROM torrents_artists WHERE GroupID IN ('$GroupID', '$OldGroupID')");
@@ -87,8 +87,8 @@
 		$Cache->delete_value('artist_'.$ArtistID); 
 	}
 	
-	write_log("Torrent $TorrentID was edited by " . $LoggedUser['Username']); // TODO: this is probably broken
-	write_group_log($GroupID, 0, $LoggedUser['ID'], "merged group ".$OldGroupID, 0);
+	Misc::write_log("Torrent $TorrentID was edited by " . $LoggedUser['Username']); // TODO: this is probably broken
+	Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "merged group ".$OldGroupID, 0);
 	$DB->query("UPDATE group_log SET GroupID = ".$GroupID." WHERE GroupID = ".$OldGroupID);
 	
 	$Cache->delete_value('torrents_details_'.$GroupID);	
diff --git a/sections/torrents/functions.php b/sections/torrents/functions.php
index 57b47600..afa34d67 100644
--- a/sections/torrents/functions.php
+++ b/sections/torrents/functions.php
@@ -152,6 +152,6 @@ function get_group_requests($GroupID) {
 		$Requests = $DB->collect('ID');
 		$Cache->cache_value('requests_group_'.$GroupID, $Requests, 0);
 	}
-	$Requests = get_requests($Requests);
+	$Requests = Requests::get_requests($Requests);
 	return $Requests['matches'];
 }
diff --git a/sections/torrents/grouplog.php b/sections/torrents/grouplog.php
index b19ec6cb..96649dcc 100644
--- a/sections/torrents/grouplog.php
+++ b/sections/torrents/grouplog.php
@@ -2,12 +2,12 @@
 $GroupID = $_GET['groupid'];
 if (!is_number($GroupID)) { error(404); }
 
-show_header("History for Group $GroupID");
+View::show_header("History for Group $GroupID");
 
-$Groups = get_groups(array($GroupID), true, true, false);
+$Groups = Torrents::get_groups(array($GroupID), true, true, false);
 if (!empty($Groups['matches'][$GroupID])) {
 	$Group = $Groups['matches'][$GroupID];
-	$Title = display_artists($Group['ExtendedArtists']).'<a href="torrents.php?id='.$GroupID.'">'.$Group['Name'].'</a>';
+	$Title = Artists::display_artists($Group['ExtendedArtists']).'<a href="torrents.php?id='.$GroupID.'">'.$Group['Name'].'</a>';
 } else {
 	$Title = "Group $GroupID";
 }
@@ -47,7 +47,7 @@
 			} else { ?>
 				<td />
 <?			}	?>
-			<td><?=format_username($UserID, false, false, false)?></td>
+			<td><?=Users::format_username($UserID, false, false, false)?></td>
 			<td><?=$Info?></td>
 		</tr>
 <?
@@ -56,5 +56,5 @@
 	</table>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/torrents/history.php b/sections/torrents/history.php
index a98a4c92..d897b8f3 100644
--- a/sections/torrents/history.php
+++ b/sections/torrents/history.php
@@ -26,7 +26,7 @@
 
 if(!$Name) { error(404); }
 
-show_header("Revision history for $Name"); // Set title
+View::show_header("Revision history for $Name"); // Set title
 
 // Start printing form
 ?>
@@ -39,5 +39,5 @@
 ?>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/torrents/index.php b/sections/torrents/index.php
index 6cf43109..c5d59bb2 100644
--- a/sections/torrents/index.php
+++ b/sections/torrents/index.php
@@ -354,8 +354,8 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 						list($Size, $Name) = $File;
 						$TmpFileList []= $Name .'{{{'.$Size.'}}}'; // Name {{{Size}}}
 					}
-					$FilePath = isset($Tor->Val['info']->Val['files']) ? make_utf8($Tor->get_name()) : "";
-					$FileString = make_utf8(implode('|||', $TmpFileList));
+					$FilePath = isset($Tor->Val['info']->Val['files']) ? Format::make_utf8($Tor->get_name()) : "";
+					$FileString = Format::make_utf8(implode('|||', $TmpFileList));
 					$DB->query("UPDATE torrents SET Size = ".$TotalSize.", FilePath = '".db_string($FilePath)."', FileList = '".db_string($FileString)."' WHERE ID = ".$TorrentID);
 					$Cache->delete_value('torrents_details_'.$GroupID);
 				}
@@ -370,7 +370,7 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 				$DB->query("SELECT COUNT(ID) FROM torrents WHERE GroupID = ".$_GET['groupid']);
 				list($Count) = $DB->next_record();
 				if($Count == 0) {
-					delete_group($_GET['groupid']);
+					Torrents::delete_group($_GET['groupid']);
 				} else {
 				}
 				if(!empty($_GET['artistid']) && is_number($_GET['artistid'])) {
diff --git a/sections/torrents/manage_artists.php b/sections/torrents/manage_artists.php
index 98e4f86c..5bc1cc89 100644
--- a/sections/torrents/manage_artists.php
+++ b/sections/torrents/manage_artists.php
@@ -32,8 +32,8 @@
 		print_r($ArtistNames);
 		foreach ($CleanArtists AS $Artist) {
 			list($Importance,$ArtistID) = $Artist;
-			write_log("Artist (".$ArtistTypes[$Importance].") ".$ArtistID." (".$ArtistNames[$ArtistID]['Name'].") was removed from the group ".$_POST['groupid']." (".$GroupName.") by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].")");
-			write_group_log($GroupID, 0, $LoggedUser['ID'], "Removed artist ".$ArtistNames[$ArtistID]['Name']." (".$ArtistTypes[$Importance].")", 0);
+			Misc::write_log("Artist (".$ArtistTypes[$Importance].") ".$ArtistID." (".$ArtistNames[$ArtistID]['Name'].") was removed from the group ".$_POST['groupid']." (".$GroupName.") by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].")");
+			Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "Removed artist ".$ArtistNames[$ArtistID]['Name']." (".$ArtistTypes[$Importance].")", 0);
 			$DB->query("DELETE FROM torrents_artists WHERE GroupID = '$GroupID' AND ArtistID = '$ArtistID' AND Importance = '$Importance'");
 		}
 		$DB->query("SELECT ArtistID
@@ -45,7 +45,7 @@
 		$Items = $DB->collect('ArtistID');
 		$EmptyArtists = array_diff($ArtistIDs, $Items);
 		foreach($EmptyArtists as $ArtistID) {
-			delete_artist($ArtistID);
+			Artists::delete_artist($ArtistID);
 		}
 	} else {
 		$DB->query("UPDATE IGNORE torrents_artists SET Importance = '".$_POST['importance']."' WHERE GroupID = '$GroupID' AND ArtistID IN (".$ArtistsString.")");
diff --git a/sections/torrents/masspm.php b/sections/torrents/masspm.php
index 13a9ce0a..d0c63dce 100644
--- a/sections/torrents/masspm.php
+++ b/sections/torrents/masspm.php
@@ -32,7 +32,7 @@
 
 if(!$Properties) { error(404); }
 
-show_header('Edit torrent', 'upload');
+View::show_header('Edit torrent', 'upload');
 
 if(!check_perms('site_moderate_requests')) {
 	error(403);
@@ -69,4 +69,4 @@
 		</table>
 	</form>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/torrents/merge.php b/sections/torrents/merge.php
index de168869..17a38b51 100644
--- a/sections/torrents/merge.php
+++ b/sections/torrents/merge.php
@@ -24,9 +24,9 @@
 
 //Everything is legit, let's just confim they're not retarded
 if(empty($_POST['confirm'])) {
-	$Artists = get_artists(array($GroupID, $NewGroupID));
+	$Artists = Artists::get_artists(array($GroupID, $NewGroupID));
 	
-	show_header();
+	View::show_header();
 ?>
 	<div class="center thin">
 	<div class="header">
@@ -40,15 +40,15 @@
 			<input type="hidden" name="groupid" value="<?=$GroupID?>" />
 			<input type="hidden" name="targetgroupid" value="<?=$NewGroupID?>" />
 			<h3>You are attempting to merge the group:</h3>
-			<ul><li><?= display_artists($Artists[$GroupID], true, false)?> - <a href="torrents.php?id=<?=$GroupID?>"><?=$Name?></a></li></ul>
+			<ul><li><?= Artists::display_artists($Artists[$GroupID], true, false)?> - <a href="torrents.php?id=<?=$GroupID?>"><?=$Name?></a></li></ul>
 			<h3>Into the group:</h3>
-			<ul><li><?= display_artists($Artists[$NewGroupID], true, false)?> - <a href="torrents.php?id=<?=$NewGroupID?>"><?=$NewName?></a></li></ul>
+			<ul><li><?= Artists::display_artists($Artists[$NewGroupID], true, false)?> - <a href="torrents.php?id=<?=$NewGroupID?>"><?=$NewName?></a></li></ul>
 			<input type="submit" value="Confirm" />
 		</form>
 	</div>
 	</div>
 <?
-	show_footer();
+	View::show_footer();
 } else {
 	authorize();
 
@@ -56,9 +56,9 @@
 	$DB->query("UPDATE wiki_torrents SET PageID='$NewGroupID' WHERE PageID='$GroupID'");
 	$DB->query("UPDATE torrents_comments SET GroupID='$NewGroupID' WHERE GroupID='$GroupID'");
 	
-	delete_group($GroupID);
+	Torrents::delete_group($GroupID);
 
-	write_group_log($NewGroupID, 0, $LoggedUser['ID'], "Merged Group ".$GroupID." (".$Name.") to ".$NewGroupID." (".$NewName.")", 0);
+	Torrents::write_group_log($NewGroupID, 0, $LoggedUser['ID'], "Merged Group ".$GroupID." (".$Name.") to ".$NewGroupID." (".$NewName.")", 0);
 	$DB->query("UPDATE group_log SET GroupID = ".$NewGroupID." WHERE GroupID = ".$GroupID);
 	
 	$GroupID=$NewGroupID;
@@ -93,7 +93,7 @@
 	$Cache->delete_value('torrent_comments_'.$GroupID.'_catalogue_0');
 	$Cache->delete_value('torrent_comments_'.$GroupID);
 	$Cache->delete_value('groups_artists_'.$GroupID);
-	update_hash($GroupID);
+	Torrents::update_hash($GroupID);
 	
 	header('Location: torrents.php?id='.$GroupID);
 }
diff --git a/sections/torrents/nonwikiedit.php b/sections/torrents/nonwikiedit.php
index 622d6d86..1e156ccd 100644
--- a/sections/torrents/nonwikiedit.php
+++ b/sections/torrents/nonwikiedit.php
@@ -32,7 +32,7 @@
 		error(404);
 	}
 
-	freeleech_groups($GroupID, $Free, $FreeType);
+	Torrents::freeleech_groups($GroupID, $Free, $FreeType);
 }
 
 //Escape fields
@@ -61,7 +61,7 @@
 while(list($TorrentID) = $DB->next_record()) {
 	$Cache->delete_value('torrent_download_'.$TorrentID);
 }
-update_hash($GroupID);
+Torrents::update_hash($GroupID);
 $Cache->delete_value('torrents_details_'.$GroupID);
 
 header("Location: torrents.php?id=".$GroupID);
diff --git a/sections/torrents/notify.php b/sections/torrents/notify.php
index a6a7b566..b3581b2e 100644
--- a/sections/torrents/notify.php
+++ b/sections/torrents/notify.php
@@ -2,7 +2,7 @@
 if(!check_perms('site_torrents_notify')) { error(403); }
 
 define('NOTIFICATIONS_PER_PAGE', 50);
-list($Page,$Limit) = page_limit(NOTIFICATIONS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(NOTIFICATIONS_PER_PAGE);
 
 $TokenTorrents = $Cache->get_value('users_tokens_'.$LoggedUser['ID']);
 if (empty($TokenTorrents)) {
@@ -28,13 +28,13 @@
 $DB->query('SELECT FOUND_ROWS()');
 list($TorrentCount) = $DB->next_record();
 $Debug->log_var($TorrentCount, 'Torrent count');
-$Pages = get_pages($Page, $TorrentCount, NOTIFICATIONS_PER_PAGE, 9);
+$Pages = Format::get_pages($Page, $TorrentCount, NOTIFICATIONS_PER_PAGE, 9);
 
 if(count($GroupIDs)) {
-	$TorrentGroups = get_groups($GroupIDs);
+	$TorrentGroups = Torrents::get_groups($GroupIDs);
 	$TorrentGroups = $TorrentGroups['matches'];
 
-	// Need some extra info that get_groups() doesn't return
+	// Need some extra info that Torrents::get_groups() doesn't return
 	$DB->query("SELECT ID, CategoryID FROM torrents_group WHERE ID IN (".implode(',', $GroupIDs).")");
 	$GroupCategoryIDs = $DB->to_array('ID', MYSQLI_ASSOC, false);
 
@@ -43,7 +43,7 @@
 	$Cache->delete_value('notifications_new_'.$LoggedUser['ID']);
 }
 
-show_header('My notifications', 'notifications');
+View::show_header('My notifications', 'notifications');
 $DB->set_query_id($Results);
 ?>
 <div class="header">
@@ -111,7 +111,7 @@
 			// generate torrent's title
 			$DisplayName = '';
 			if(!empty($GroupInfo['ExtendedArtists'])) {
-				$DisplayName = display_artists($GroupInfo['ExtendedArtists'], true, true);
+				$DisplayName = Artists::display_artists($GroupInfo['ExtendedArtists'], true, true);
 			}
 			$DisplayName .= "<a href='torrents.php?id=$GroupID&amp;torrentid=$TorrentID#torrent$TorrentID' title='View Torrent'>".$GroupInfo['Name']."</a>";
 
@@ -125,7 +125,7 @@
 			}
 
 			// append extra info to torrent title
-			$ExtraInfo = torrent_info($TorrentInfo, true, true);
+			$ExtraInfo = Torrents::torrent_info($TorrentInfo, true, true);
 			$Debug->log_var($ExtraInfo, "Extra torrent info ($TorrentID)");
 
 			$TagLinks = array();
@@ -163,7 +163,7 @@
 		</td>
 		<td><?=$TorrentInfo['FileCount']?></td>
 		<td style="text-align:right" class="nobr"><?=time_diff($TorrentInfo['Time'])?></td>
-		<td class="nobr" style="text-align:right"><?=get_size($TorrentInfo['Size'])?></td>
+		<td class="nobr" style="text-align:right"><?=Format::get_size($TorrentInfo['Size'])?></td>
 		<td style="text-align:right"><?=number_format($TorrentInfo['Snatched'])?></td>
 		<td style="text-align:right"><?=number_format($TorrentInfo['Seeders'])?></td>
 		<td style="text-align:right"><?=number_format($TorrentInfo['Leechers'])?></td>
@@ -181,4 +181,4 @@
 <div class="linkbox">
 	<?=$Pages?>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/torrents/peerlist.php b/sections/torrents/peerlist.php
index 6b6e689c..3431ad4b 100644
--- a/sections/torrents/peerlist.php
+++ b/sections/torrents/peerlist.php
@@ -48,10 +48,10 @@
 while(list($PeerUserID, $Size, $Active, $Connectable, $Uploaded, $Remaining, $UserAgent) = $DB->next_record()) {
 ?>
 	<tr>
-		<td><?=format_username($PeerUserID, false, false, false)?></td>
+		<td><?=Users::format_username($PeerUserID, false, false, false)?></td>
 		<td><?= ($Active) ? '<span style="color:green">Yes</span>' : '<span style="color:red">No</span>' ?></td>
 		<td><?= ($Connectable) ? '<span style="color:green">Yes</span>' : '<span style="color:red">No</span>' ?></td>
-		<td><?=get_size($Uploaded) ?></td>
+		<td><?=Format::get_size($Uploaded) ?></td>
 		<td><?=number_format(($Size-$Remaining)/$Size*100, 2)?></td>
 		<td><?=display_str($UserAgent)?></td>
 	</tr>
diff --git a/sections/torrents/redownload.php b/sections/torrents/redownload.php
index 47d15407..4af13b42 100644
--- a/sections/torrents/redownload.php
+++ b/sections/torrents/redownload.php
@@ -9,8 +9,8 @@
 	error(403);
 }
 
-$User = user_info($UserID);
-$Perms = get_permissions($User['PermissionID']);
+$User = Users::user_info($UserID);
+$Perms = Permissions::get_permissions($User['PermissionID']);
 $UserClass = $Perms['Class'];
 
 require(SERVER_ROOT.'/classes/class_torrent.php');
@@ -59,13 +59,13 @@
 	".$SQL."
 	GROUP BY t.ID");
 $Downloads = $DB->to_array(false,MYSQLI_NUM,false);
-$Artists = get_artists($DB->collect('GroupID'));
+$Artists = Artists::get_artists($DB->collect('GroupID'));
 
-list($UserID, $Username) = array_values(user_info($UserID));
+list($UserID, $Username) = array_values(Users::user_info($UserID));
 $Zip = new ZIP($Username.'\'s '.ucfirst($_GET['type']));
 foreach($Downloads as $Download) {
 	list($Month, $GroupID, $Media, $Format, $Encoding, $Year, $Album, $Size, $Contents) = $Download;
-	$Artist = display_artists($Artists[$GroupID],false,true,false);
+	$Artist = Artists::display_artists($Artists[$GroupID],false,true,false);
 	$Contents = unserialize(base64_decode($Contents));
 	$Tor = new TORRENT($Contents, true);
 	$Tor->set_announce_url(ANNOUNCE_URL.'/'.$LoggedUser['torrent_pass'].'/announce');
@@ -94,12 +94,12 @@
 
 	if (!$TorrentName) { $TorrentName="No Name"; }
 
-	$FileName = file_string($TorrentName);
+	$FileName = Misc::file_string($TorrentName);
 	if ($Browser == 'Internet Explorer') {
 		$FileName = urlencode($FileName);
 	}
 	$FileName .= '.torrent';
-	$Zip->add_file($Tor->enc(), file_string($Month).'/'.$FileName);
+	$Zip->add_file($Tor->enc(), Misc::file_string($Month).'/'.$FileName);
 }
 $Zip->close_stream();
 
diff --git a/sections/torrents/rename.php b/sections/torrents/rename.php
index c8a02024..019766c2 100644
--- a/sections/torrents/rename.php
+++ b/sections/torrents/rename.php
@@ -24,9 +24,9 @@
 	$Cache->delete_value('artist_'.$ArtistID); 
 }
 
-update_hash($GroupID);
+Torrents::update_hash($GroupID);
 
-write_log("Torrent Group ".$GroupID." (".$OldName.")  was renamed to '".$NewName."' by ".$LoggedUser['Username']);
-write_group_log($GroupID, 0, $LoggedUser['ID'], "renamed to ".$NewName." from ".$OldName, 0);
+Misc::write_log("Torrent Group ".$GroupID." (".$OldName.")  was renamed to '".$NewName."' by ".$LoggedUser['Username']);
+Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "renamed to ".$NewName." from ".$OldName, 0);
 
 header('Location: torrents.php?id='.$GroupID);
diff --git a/sections/torrents/reseed.php b/sections/torrents/reseed.php
index 4cdabb40..a1466b05 100644
--- a/sections/torrents/reseed.php
+++ b/sections/torrents/reseed.php
@@ -12,12 +12,12 @@
 
 $DB->query("UPDATE torrents SET LastReseedRequest=NOW() WHERE ID='$TorrentID'");
 
-$Group = get_groups(array($GroupID));
+$Group = Torrents::get_groups(array($GroupID));
 $Group = array_pop($Group['matches']);
 list($GroupID, $GroupName, $GroupYear, $GroupRecordLabel, $GroupCatalogueNumber, $TagList, $ReleaseType, $GroupVanityHouse, $Torrents, $GroupArtists) = array_values($Group);
 
 $Name = '';
-$Name .= display_artists(array('1'=>$GroupArtists), false, true);
+$Name .= Artists::display_artists(array('1'=>$GroupArtists), false, true);
 $Name .= $GroupName;
 
 $DB->query("SELECT uid, tstamp FROM xbt_snatched WHERE fid='$TorrentID' ORDER BY tstamp DESC LIMIT 10");
@@ -29,7 +29,7 @@
 		$DB->query("SELECT UserID FROM top_snatchers WHERE UserID='$UserID'");
 		if($DB->record_count()>0) { continue; }
 		
-		$UserInfo = user_info($UserID);
+		$UserInfo = Users::user_info($UserID);
 		$Username = $UserInfo['Username'];
 		$TimeStamp = $User['tstamp'];
 		$Request = "Hi $Username,
@@ -40,11 +40,11 @@
 
 Thanks!";
 		
-		send_pm($UserID, 0, 'Re-seed request for torrent '.db_string($Name), db_string($Request));
+		Misc::send_pm($UserID, 0, 'Re-seed request for torrent '.db_string($Name), db_string($Request));
 	}
 	$NumUsers = count($Users);
 } else {
-	$UserInfo = user_info($UploaderID);
+	$UserInfo = Users::user_info($UploaderID);
 	$Username = $UserInfo['Username'];
 	
 	$Request = "Hi $Username,
@@ -54,12 +54,12 @@
 The exact process for re-seeding a torrent is slightly different for each client, but the concept is the same. The idea is to download the .torrent file and open it in your client, and point your client to the location where the data files are, then initiate a hash check.
 
 Thanks!";
-	send_pm($UploaderID, 0, 'Re-seed request for torrent '.db_string($Name), db_string($Request));
+	Misc::send_pm($UploaderID, 0, 'Re-seed request for torrent '.db_string($Name), db_string($Request));
 	
 	$NumUsers = 1;
 	
 }
-show_header();
+View::show_header();
 ?>
 <div class="thin">
 	<div class="header">
@@ -67,5 +67,5 @@
 	</div>
 	<p>Successfully sent re-seed request for torrent <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=display_str($Name)?></a> to <?=$NumUsers?> user(s).</p>
 </div>
-<?show_footer();?>
+<?View::show_footer();?>
 
diff --git a/sections/torrents/snatchlist.php b/sections/torrents/snatchlist.php
index 6324806a..7ec4b0bf 100644
--- a/sections/torrents/snatchlist.php
+++ b/sections/torrents/snatchlist.php
@@ -51,7 +51,7 @@
 <?
 	}
 ?> 
-		<td><?=format_username($SnatcherID, true, true, true, true)?></td>
+		<td><?=Users::format_username($SnatcherID, true, true, true, true)?></td>
 		<td><?=time_diff($Timestamp)?></td>
 <?
 	$i++;
diff --git a/sections/torrents/take_warn.php b/sections/torrents/take_warn.php
index e497235b..d561d510 100644
--- a/sections/torrents/take_warn.php
+++ b/sections/torrents/take_warn.php
@@ -1,7 +1,7 @@
 <?php
 if (!check_perms('users_warn')) { error(404);
 }
-isset_request($_POST, array('reason', 'privatemessage', 'body', 'length', 'groupid', 'postid', 'userid'));
+Misc::assert_isset_request($_POST, array('reason', 'privatemessage', 'body', 'length', 'groupid', 'postid', 'userid'));
 
 $Reason = db_string($_POST['reason']);
 $PrivateMessage = db_string($_POST['privatemessage']);
@@ -12,14 +12,14 @@
 $UserID = (int)$_POST['userid'];
 $Key = (int)$_POST['key'];
 $SQLTime = sqltime();
-$UserInfo = user_info($UserID);
+$UserInfo = Users::user_info($UserID);
 if($UserInfo['Class'] > $LoggedUser['Class']) {
     error(403);
 }
 $URL = "https://". SSL_SITE_URL."/torrents.php?id=$GroupID&postid=$PostID#post$PostID";
 if ($Length != 'verbal') {
     $Time = ((int)$Length) * (7 * 24 * 60 * 60);
-    warn_user($UserID, $Time, "$URL - ". $Reason);
+    Tools::warn_user($UserID, $Time, "$URL - ". $Reason);
     $Subject = "You have received a warning";
     $PrivateMessage = "You have received a $Length week warning for [url=$URL]this post.[/url]\n\n" . $PrivateMessage;
 	$WarnTime = time_plus($Time);
@@ -31,7 +31,7 @@
 	}
 $DB -> query("INSERT INTO users_warnings_forums (UserID, Comment) VALUES('$UserID', '" . db_string($AdminComment) . "')
 	        ON DUPLICATE KEY UPDATE Comment = CONCAT('" . db_string($AdminComment) . "', Comment)");
-send_pm($UserID, $LoggedUser['ID'], $Subject, $PrivateMessage);
+Misc::send_pm($UserID, $LoggedUser['ID'], $Subject, $PrivateMessage);
 
 // Mainly
 $DB -> query("SELECT
diff --git a/sections/torrents/takedelete.php b/sections/torrents/takedelete.php
index 75c48f7c..07320ef5 100644
--- a/sections/torrents/takedelete.php
+++ b/sections/torrents/takedelete.php
@@ -38,14 +38,14 @@
 }
 
 $InfoHash = unpack("H*", $InfoHash);
-delete_torrent($TorrentID, $GroupID);
-write_log('Torrent '.$TorrentID.' ('.$Name.') ('.number_format($Size/(1024*1024), 2).' MB) ('.strtoupper($InfoHash[1]).') was deleted by '.$LoggedUser['Username'].': ' .$_POST['reason'].' '.$_POST['extra']);
-write_group_log($GroupID, $TorrentID, $LoggedUser['ID'], "deleted torrent (".number_format($Size/(1024*1024), 2)." MB, ".strtoupper($InfoHash[1]).") for reason: ".$_POST['reason']." ".$_POST['extra'], 0);
+Torrents::delete_torrent($TorrentID, $GroupID);
+Misc::write_log('Torrent '.$TorrentID.' ('.$Name.') ('.number_format($Size/(1024*1024), 2).' MB) ('.strtoupper($InfoHash[1]).') was deleted by '.$LoggedUser['Username'].': ' .$_POST['reason'].' '.$_POST['extra']);
+Torrents::write_group_log($GroupID, $TorrentID, $LoggedUser['ID'], "deleted torrent (".number_format($Size/(1024*1024), 2)." MB, ".strtoupper($InfoHash[1]).") for reason: ".$_POST['reason']." ".$_POST['extra'], 0);
 
-show_header('Torrent deleted');
+View::show_header('Torrent deleted');
 ?>
 <div class="thin">
 	<h3>Torrent was successfully deleted.</h3>
 </div>
 <?
-show_footer();
+View::show_footer();
diff --git a/sections/torrents/takeedit.php b/sections/torrents/takeedit.php
index 0ea42a7a..cdd09158 100644
--- a/sections/torrents/takeedit.php
+++ b/sections/torrents/takeedit.php
@@ -385,7 +385,7 @@
 $DB->query($SQL);
 
 if(check_perms('torrents_freeleech') && $Properties['FreeLeech'] != $CurFreeLeech) {
-	freeleech_torrents($TorrentID, $Properties['FreeLeech'], $Properties['FreeLeechType']);
+	Torrents::freeleech_torrents($TorrentID, $Properties['FreeLeech'], $Properties['FreeLeechType']);
 }
 
 $DB->query("SELECT GroupID, Time FROM torrents WHERE ID='$TorrentID'");
@@ -423,8 +423,8 @@
 $DB->query("SELECT Name FROM torrents_group WHERE ID=$GroupID");
 list($Name) = $DB->next_record(MYSQLI_NUM, false);
 
-write_log("Torrent $TorrentID ($Name) in group $GroupID was edited by ".$LoggedUser['Username']." (".$LogDetails.")"); // TODO: this is probably broken
-write_group_log($GroupID, $TorrentID, $LoggedUser['ID'], $LogDetails, 0);
+Misc::write_log("Torrent $TorrentID ($Name) in group $GroupID was edited by ".$LoggedUser['Username']." (".$LogDetails.")"); // TODO: this is probably broken
+Torrents::write_group_log($GroupID, $TorrentID, $LoggedUser['ID'], $LogDetails, 0);
 $Cache->delete_value('torrents_details_'.$GroupID);
 $Cache->delete_value('torrent_download_'.$TorrentID);
 
@@ -434,7 +434,7 @@
 	$Cache->delete_value('artist_'.$ArtistID);
 }
 
-update_hash($GroupID);
+Torrents::update_hash($GroupID);
 // All done!
 
 header("Location: torrents.php?id=$GroupID");
diff --git a/sections/torrents/takegroupedit.php b/sections/torrents/takegroupedit.php
index 07e8a591..2d660e44 100644
--- a/sections/torrents/takegroupedit.php
+++ b/sections/torrents/takegroupedit.php
@@ -61,7 +61,7 @@
 				VALUES ('$GroupID', '".db_string($Body)."', '".db_string($Image)."', '$UserID', '$Summary', '".sqltime()."')");
 	
 	$DB->query("UPDATE torrents_group SET ReleaseType='$ReleaseType' WHERE ID='$GroupID'");
-	update_hash($GroupID);
+	Torrents::update_hash($GroupID);
 	
 	$DB->query("SELECT ArtistID FROM torrents_artists WHERE GroupID = ".$GroupID);
 	$Artists = $DB->collect('ArtistID');
diff --git a/sections/torrents/takemasspm.php b/sections/torrents/takemasspm.php
index ebd2977b..f1d5c2b0 100644
--- a/sections/torrents/takemasspm.php
+++ b/sections/torrents/takemasspm.php
@@ -47,11 +47,11 @@
 	// Save this because send_pm uses $DB to run its own query... Oops...
 	$Snatchers = $DB->to_array();
 	foreach ($Snatchers as $UserID) { 
-		send_pm($UserID[0],0,db_string($Subject),db_string($Message)); 
+		Misc::send_pm($UserID[0],0,db_string($Subject),db_string($Message)); 
 	}
 }
 
-write_log($LoggedUser['Username']." sent mass notice to snatches of torrent $TorrentID in group $GroupID");
+Misc::write_log($LoggedUser['Username']." sent mass notice to snatches of torrent $TorrentID in group $GroupID");
 
 header("Location: torrents.php?id=$GroupID");
 
diff --git a/sections/torrents/takenewgroup.php b/sections/torrents/takenewgroup.php
index 689f22cd..5c35f44c 100644
--- a/sections/torrents/takenewgroup.php
+++ b/sections/torrents/takenewgroup.php
@@ -52,18 +52,18 @@
 // Delete old group if needed
 $DB->query("SELECT ID FROM torrents WHERE GroupID='$OldGroupID'");
 if($DB->record_count() == 0) {
-	delete_group($OldGroupID);
+	Torrents::delete_group($OldGroupID);
 } else {
-	update_hash($OldGroupID);
+	Torrents::update_hash($OldGroupID);
 }
 
-update_hash($GroupID);
+Torrents::update_hash($GroupID);
 
 $Cache->delete_value('torrent_download_'.$TorrentID);
 $Cache->delete_value('artist_'.$ArtistID);
 $Cache->delete_value('artist_'.$OldArtistID);
 
-write_log("Torrent $TorrentID was edited by " . $LoggedUser['Username']);
+Misc::write_log("Torrent $TorrentID was edited by " . $LoggedUser['Username']);
 
 header("Location: torrents.php?id=$GroupID");
 ?>
diff --git a/sections/torrents/user.php b/sections/torrents/user.php
index 3cb6aa59..628d95aa 100644
--- a/sections/torrents/user.php
+++ b/sections/torrents/user.php
@@ -11,7 +11,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 		else { $NewWay="DESC"; }
 	} else { $NewWay=$DefaultWay; }
 	
-	return "torrents.php?way=".$NewWay."&amp;order=".$SortKey."&amp;".get_url(array('way','order'));
+	return "torrents.php?way=".$NewWay."&amp;order=".$SortKey."&amp;".Format::get_url(array('way','order'));
 }
 
 $UserID = $_GET['userid'];
@@ -129,8 +129,8 @@ function header_link($SortKey,$DefaultWay="DESC") {
 	$SearchWhere = ' AND '.$SearchWhere;
 }
 
-$User = user_info($UserID);
-$Perms = get_permissions($User['PermissionID']);
+$User = Users::user_info($UserID);
+$Perms = Permissions::get_permissions($User['PermissionID']);
 $UserClass = $Perms['Class'];
 
 switch($_GET['type']) {
@@ -259,14 +259,14 @@ function header_link($SortKey,$DefaultWay="DESC") {
 $DB->query("SELECT FOUND_ROWS()");
 list($TorrentCount) = $DB->next_record();
 
-$Results = get_groups($GroupIDs);
+$Results = Torrents::get_groups($GroupIDs);
 
 $Action = display_str($_GET['type']);
-$User = user_info($UserID);
+$User = Users::user_info($UserID);
 
-show_header($User['Username'].'\'s '.$Action.' torrents');
+View::show_header($User['Username'].'\'s '.$Action.' torrents');
 
-$Pages=get_pages($Page,$TorrentCount,TORRENTS_PER_PAGE);
+$Pages=Format::get_pages($Page,$TorrentCount,TORRENTS_PER_PAGE);
 
 
 ?>
@@ -282,7 +282,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 					<td>
 						<input type="hidden" name="type" value="<?=$_GET['type']?>" />
 						<input type="hidden" name="userid" value="<?=$UserID?>" />
-						<input type="text" name="search" size="60" value="<?form('search')?>" />
+						<input type="text" name="search" size="60" value="<?Format::form('search')?>" />
 					</td>
 				</tr>
 				<tr>
@@ -291,26 +291,26 @@ function header_link($SortKey,$DefaultWay="DESC") {
 						<select id="bitrate" name="bitrate">
 							<option value="">Bitrate</option>
 <?	foreach($Bitrates as $BitrateName) { ?>
-							<option value="<?=display_str($BitrateName); ?>" <?selected('bitrate', $BitrateName)?>><?=display_str($BitrateName); ?></option>
+							<option value="<?=display_str($BitrateName); ?>" <?Format::selected('bitrate', $BitrateName)?>><?=display_str($BitrateName); ?></option>
 <?	} ?>				</select>
 						
 						<select name="format">
 							<option value="">Format</option>
 <?	foreach($Formats as $FormatName) { ?>
-							<option value="<?=display_str($FormatName); ?>" <?selected('format', $FormatName)?>><?=display_str($FormatName); ?></option>
+							<option value="<?=display_str($FormatName); ?>" <?Format::selected('format', $FormatName)?>><?=display_str($FormatName); ?></option>
 <?	} ?>				
-							<option value="perfectflac" <?selected('filter', 'perfectflac')?>>Perfect FLACs</option>
+							<option value="perfectflac" <?Format::selected('filter', 'perfectflac')?>>Perfect FLACs</option>
 						</select>
 						<select name="media">
 							<option value="">Media</option>
 <?	foreach($Media as $MediaName) { ?>
-							<option value="<?=display_str($MediaName); ?>" <?selected('media',$MediaName)?>><?=display_str($MediaName); ?></option>
+							<option value="<?=display_str($MediaName); ?>" <?Format::selected('media',$MediaName)?>><?=display_str($MediaName); ?></option>
 <?	} ?>
 						</select>
 						<select name="releasetype">
 							<option value="">Release type</option>
 <?	foreach($ReleaseTypes as $ID=>$Type) { ?>
-							<option value="<?=display_str($ID); ?>" <?selected('releasetype',$ID)?>><?=display_str($Type); ?></option>
+							<option value="<?=display_str($ID); ?>" <?Format::selected('releasetype',$ID)?>><?=display_str($Type); ?></option>
 <?	} ?>
 						</select>
 					</td>
@@ -320,34 +320,34 @@ function header_link($SortKey,$DefaultWay="DESC") {
 					<td class="nobr" colspan="3">
 						<select name="log">
 							<option value="">Has Log</option>
-							<option value="1" <?selected('log','1')?>>Yes</option>
-							<option value="0" <?selected('log','0')?>>No</option>
-							<option value="100" <?selected('log','100')?>>100% only</option>
-							<option value="-1" <?selected('log','-1')?>>&lt;100%/Unscored</option>
+							<option value="1" <?Format::selected('log','1')?>>Yes</option>
+							<option value="0" <?Format::selected('log','0')?>>No</option>
+							<option value="100" <?Format::selected('log','100')?>>100% only</option>
+							<option value="-1" <?Format::selected('log','-1')?>>&lt;100%/Unscored</option>
 						</select>
 						<select name="cue">
 							<option value="">Has Cue</option>
-							<option value="1" <?selected('cue',1)?>>Yes</option>
-							<option value="0" <?selected('cue',0)?>>No</option>
+							<option value="1" <?Format::selected('cue',1)?>>Yes</option>
+							<option value="0" <?Format::selected('cue',0)?>>No</option>
 						</select>
 						<select name="scene">
 							<option value="">Scene</option>
-							<option value="1" <?selected('scene',1)?>>Yes</option>
-							<option value="0" <?selected('scene',0)?>>No</option>
+							<option value="1" <?Format::selected('scene',1)?>>Yes</option>
+							<option value="0" <?Format::selected('scene',0)?>>No</option>
 						</select>
 						<select name="vanityhouse">
 							<option value="">Vanity House</option>
-							<option value="1" <?selected('vanityhouse',1)?>>Yes</option>
-							<option value="0" <?selected('vanityhouse',0)?>>No</option>
+							<option value="1" <?Format::selected('vanityhouse',1)?>>Yes</option>
+							<option value="0" <?Format::selected('vanityhouse',0)?>>No</option>
 						</select>
 					</td>
 				</tr>
 				<tr>
 					<td class="label"><strong>Tags:</strong></td>
 					<td>
-						<input type="text" name="tags" size="60" title="Use !tag to exclude tag" value="<?form('tags')?>" />&nbsp;
-						<input type="radio" name="tags_type" id="tags_type0" value="0" <?selected('tags_type',0,'checked')?> /><label for="tags_type0"> Any</label>&nbsp;&nbsp;
-						<input type="radio" name="tags_type" id="tags_type1" value="1" <?selected('tags_type',1,'checked')?> /><label for="tags_type1"> All</label>
+						<input type="text" name="tags" size="60" title="Use !tag to exclude tag" value="<?Format::form('tags')?>" />&nbsp;
+						<input type="radio" name="tags_type" id="tags_type0" value="0" <?Format::selected('tags_type',0,'checked')?> /><label for="tags_type0"> Any</label>&nbsp;&nbsp;
+						<input type="radio" name="tags_type" id="tags_type1" value="1" <?Format::selected('tags_type',1,'checked')?> /><label for="tags_type1"> All</label>
 					</td>
 				</tr>
 				
@@ -356,12 +356,12 @@ function header_link($SortKey,$DefaultWay="DESC") {
 					<td>
 						<select name="order">
 <? foreach($Orders as $OrderText) { ?>
-							<option value="<?=$OrderText?>" <?selected('order', $OrderText)?>><?=$OrderText?></option>
+							<option value="<?=$OrderText?>" <?Format::selected('order', $OrderText)?>><?=$OrderText?></option>
 <? }?>
 						</select>&nbsp;
 						<select name="way">
 <? foreach($Ways as $WayKey=>$WayText) { ?>
-							<option value="<?=$WayKey?>" <?selected('way', $WayKey)?>><?=$WayText?></option>
+							<option value="<?=$WayKey?>" <?Format::selected('way', $WayKey)?>><?=$WayText?></option>
 <? }?>
 						</select>
 					</td>
@@ -439,9 +439,9 @@ function header_link($SortKey,$DefaultWay="DESC") {
 		if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5])) {
 			unset($ExtendedArtists[2]);
 			unset($ExtendedArtists[3]);
-			$DisplayName = display_artists($ExtendedArtists);
+			$DisplayName = Artists::display_artists($ExtendedArtists);
 		} elseif(!empty($Artists)) {
-			$DisplayName = display_artists(array(1=>$Artists));
+			$DisplayName = Artists::display_artists(array(1=>$Artists));
 		} else {
 			$DisplayName='';
 		}
@@ -449,7 +449,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 		if($GroupYear>0) { $DisplayName.=" [".$GroupYear."]"; }
 		if($GroupVanityHouse) { $DisplayName .= ' [<abbr title="This is a vanity house release">VH</abbr>]'; }
 		
-		$ExtraInfo = torrent_info($Torrent);
+		$ExtraInfo = Torrents::torrent_info($Torrent);
 		if($ExtraInfo) {
 			$DisplayName.=' - '.$ExtraInfo;
 		}
@@ -472,7 +472,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 				</div>
 			</td>
 			<td class="nobr"><?=time_diff($Time,1)?></td>
-			<td class="nobr"><?=get_size($Torrent['Size'])?></td>
+			<td class="nobr"><?=Format::get_size($Torrent['Size'])?></td>
 			<td><?=number_format($Torrent['Snatched'])?></td>
 			<td<?=($Torrent['Seeders']==0)?' class="r00"':''?>><?=number_format($Torrent['Seeders'])?></td>
 			<td><?=number_format($Torrent['Leechers'])?></td>
@@ -484,4 +484,4 @@ function header_link($SortKey,$DefaultWay="DESC") {
 ?>
 	<div class="linkbox"><?=$Pages?></div>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/torrents/warn.php b/sections/torrents/warn.php
index 56113d31..424fdf28 100644
--- a/sections/torrents/warn.php
+++ b/sections/torrents/warn.php
@@ -1,12 +1,12 @@
 <?php
 if (!check_perms('users_warn')) { error(404);}
-isset_request($_POST, array('groupid', 'postid', 'userid', 'key'));
+Misc::assert_isset_request($_POST, array('groupid', 'postid', 'userid', 'key'));
 
 $GroupID = (int) $_POST['groupid'];
 $PostID = (int) $_POST['postid'];
 $UserID = (int) $_POST['userid'];
 $Key = (int) $_POST['key'];
-$UserInfo = user_info($UserID);
+$UserInfo = Users::user_info($UserID);
 $DB -> query("SELECT
     tc.Body,
     tc.AddedTime
@@ -14,7 +14,7 @@
     WHERE tc.ID='" . db_string($PostID) . "'");
 list($PostBody) = $DB -> next_record();
 
-show_header('Warn User');
+View::show_header('Warn User');
 ?>
 
 <div class="thin">
@@ -66,4 +66,4 @@
 		</form>
 	</div>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/upload/upload.php b/sections/upload/upload.php
index a9aa7f15..b87d06be 100644
--- a/sections/upload/upload.php
+++ b/sections/upload/upload.php
@@ -10,7 +10,7 @@
 //*********************************************************************//
 
 ini_set('max_file_uploads','100');
-show_header('Upload','upload,jquery,valid_tags,musicbrainz');
+View::show_header('Upload','upload,jquery,valid_tags,musicbrainz');
 
 if(empty($Properties) && !empty($_GET['groupid']) && is_number($_GET['groupid'])) {
 	$DB->query("SELECT 
@@ -32,7 +32,7 @@
 		list($Properties) = $DB->to_array(false,MYSQLI_BOTH);
 		$UploadForm = $Categories[$Properties['CategoryID']-1];
 		$Properties['CategoryName'] = $Categories[$Properties['CategoryID']-1];
-		$Properties['Artists'] = get_artist($_GET['groupid']);
+		$Properties['Artists'] = Artists::get_artist($_GET['groupid']);
 		
 		$DB->query("SELECT 
 			GROUP_CONCAT(tags.Name SEPARATOR ', ') AS TagList 
@@ -158,5 +158,5 @@
 </script>
 
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/upload/upload_handle.php b/sections/upload/upload_handle.php
index 27f4a89c..ba866602 100644
--- a/sections/upload/upload_handle.php
+++ b/sections/upload/upload_handle.php
@@ -287,7 +287,7 @@
 	for($i = 0, $il = count($Artists); $i < $il; $i++) {
 		if(trim($Artists[$i]) != "") {
 			if(!in_array($Artists[$i], trim($ArtistNames))) {
-				$ArtistForm[$Importance[$i]][] = array('name' => normalise_artist_name($Artists[$i]));
+				$ArtistForm[$Importance[$i]][] = array('name' => Artists::normalise_artist_name($Artists[$i]));
 				if($Importance[$i] == 1) {
 					$MainArtistCount++;
 				}
@@ -299,14 +299,14 @@
 		$Err = "Please enter at least one main artist";
 		$ArtistForm = array();
 	}
-	$LogName .= display_artists($ArtistForm, false, true, false);
+	$LogName .= Artists::display_artists($ArtistForm, false, true, false);
 } elseif($Type == "Music" && empty($ArtistForm)) {
 	$DB->query("SELECT ta.ArtistID,aa.Name,ta.Importance FROM torrents_artists AS ta JOIN artists_alias AS aa ON ta.AliasID = aa.AliasID WHERE ta.GroupID = ".$Properties['GroupID']." ORDER BY ta.Importance ASC, aa.Name ASC;");
 	while(list($ArtistID,$ArtistName,$ArtistImportance) = $DB->next_record(MYSQLI_BOTH, false)) {
 		$ArtistForm[$ArtistImportance][] = array('id' => $ArtistID, 'name' => display_str($ArtistName));
 		$ArtistsUnescaped[$ArtistImportance][] = array('name' => $ArtistName);
 	}
-	$LogName .= display_artists($ArtistsUnescaped, false, true, false);
+	$LogName .= Artists::display_artists($ArtistsUnescaped, false, true, false);
 }
 
 
@@ -388,10 +388,10 @@
 }
 
 // To be stored in the database
-$FilePath = isset($Tor->Val['info']->Val['files']) ? db_string(make_utf8($DirName)) : "";
+$FilePath = isset($Tor->Val['info']->Val['files']) ? db_string(Format::make_utf8($DirName)) : "";
 
 // Name {{{Size}}}|||Name {{{Size}}}|||Name {{{Size}}}|||Name {{{Size}}}
-$FileString = "'".db_string(make_utf8(implode('|||', $TmpFileList)))."'";
+$FileString = "'".db_string(Format::make_utf8(implode('|||', $TmpFileList)))."'";
 
 // Number of files described in torrent
 $NumFiles = count($FileList);
@@ -460,7 +460,7 @@
 					$NoRevision = true;
 				}
 			}
-			$Properties['Artist'] = display_artists(get_artist($GroupID), false, false);
+			$Properties['Artist'] = Artists::display_artists(Artists::get_artist($GroupID), false, false);
 		}
 	}
 	if(!$GroupID) {
@@ -492,7 +492,7 @@
 							$NoRevision = true;
 						}
 					}
-					$ArtistForm = get_artist($GroupID);
+					$ArtistForm = Artists::get_artist($GroupID);
 					//This torrent belongs in a group
 					break;
 
@@ -598,9 +598,9 @@
 $Tags = explode(',', $Properties['TagList']);
 if(!$Properties['GroupID']) {
 	foreach($Tags as $Tag) {
-		$Tag = sanitize_tag($Tag);
+		$Tag = Misc::sanitize_tag($Tag);
 		if(!empty($Tag)) {
-		$Tag = get_alias_tag($Tag);
+		$Tag = Misc::get_alias_tag($Tag);
 			$DB->query("INSERT INTO tags
 				(Name, UserID) VALUES
 				('".$Tag."', $LoggedUser[ID])
@@ -637,7 +637,7 @@
 $Cache->increment('stats_torrent_count');
 $TorrentID = $DB->inserted_id();
 
-update_tracker('add_torrent', array('id' => $TorrentID, 'info_hash' => rawurlencode($InfoHash), 'freetorrent' => $T['FreeLeech']));
+Tracker::update_tracker('add_torrent', array('id' => $TorrentID, 'info_hash' => rawurlencode($InfoHash), 'freetorrent' => $T['FreeLeech']));
 
 
 
@@ -646,10 +646,10 @@
 
 $DB->query("INSERT INTO torrents_files (TorrentID, File) VALUES ($TorrentID, '".db_string($Tor->dump_data())."')");
 
-write_log("Torrent $TorrentID ($LogName) (".number_format($TotalSize/(1024*1024), 2)." MB) was uploaded by " . $LoggedUser['Username']);
-write_group_log($GroupID, $TorrentID, $LoggedUser['ID'], "uploaded (".number_format($TotalSize/(1024*1024), 2)." MB)", 0);
+Misc::write_log("Torrent $TorrentID ($LogName) (".number_format($TotalSize/(1024*1024), 2)." MB) was uploaded by " . $LoggedUser['Username']);
+Torrents::write_group_log($GroupID, $TorrentID, $LoggedUser['ID'], "uploaded (".number_format($TotalSize/(1024*1024), 2)." MB)", 0);
 
-update_hash($GroupID);
+Torrents::update_hash($GroupID);
 
 
 
@@ -682,7 +682,7 @@
 			if(count($RecentUploads) == 5) {
 				array_pop($RecentUploads);
 			}
-			array_unshift($RecentUploads, array('ID'=>$GroupID,'Name'=>trim($Properties['Title']),'Artist'=>display_artists($ArtistForm, false, true),'WikiImage'=>trim($Properties['Image'])));
+			array_unshift($RecentUploads, array('ID'=>$GroupID,'Name'=>trim($Properties['Title']),'Artist'=>Artists::display_artists($ArtistForm, false, true),'WikiImage'=>trim($Properties['Image'])));
 			$Cache->cache_value('recent_uploads_'.$UserID, $RecentUploads, 0);
 		} while (0);
 	}
@@ -699,7 +699,7 @@
 //--------------- IRC announce and feeds ---------------------------------------//
 $Announce = "";
 
-if($Type == 'Music'){ $Announce .= display_artists($ArtistForm, false); }
+if($Type == 'Music'){ $Announce .= Artists::display_artists($ArtistForm, false); }
 $Announce .= trim($Properties['Title'])." ";
 if($Type == 'Music'){
 	$Announce .= '['.trim($Properties['Year']).']';
@@ -932,12 +932,12 @@
 }
 
 if (!$Private) {
-	show_header("Warning");
+	View::show_header("Warning");
 ?>
 	<h1>Warning</h1>
 	<p><strong>Your torrent has been uploaded; however, you must download your torrent from <a href="torrents.php?id=<?=$GroupID?>">here</a> because you didn't make your torrent using the "private" option.</strong></p>
 <?
-	show_footer();
+	View::show_footer();
 	die();
 } elseif($RequestID) {
 	header("Location: requests.php?action=takefill&requestid=".$RequestID."&torrentid=".$TorrentID."&auth=".$LoggedUser['AuthKey']);
diff --git a/sections/user/advancedsearch.php b/sections/user/advancedsearch.php
index d26bf62a..b506dad7 100644
--- a/sections/user/advancedsearch.php
+++ b/sections/user/advancedsearch.php
@@ -420,12 +420,12 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 			$RunQuery = true;
 		}
 
-		list($Page,$Limit) = page_limit(USERS_PER_PAGE);
+		list($Page,$Limit) = Format::page_limit(USERS_PER_PAGE);
 		$SQL.=" LIMIT $Limit";
 	} else { error($Err); }
 
 }
-show_header('User search');
+View::show_header('User search');
 ?>
 <div class="thin">
 	<form class="search_form" name="users" action="user.php" method="get">
@@ -480,7 +480,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 <?	foreach($ClassLevels as $Class){ 
 		if ($Class['Secondary']) { continue; }
 ?>
-					<option value="<?=$Class['ID'] ?>" <? if($_GET['class']===$Class['ID']) {echo ' selected="selected"';}?>><?=cut_string($Class['Name'], 10, 1, 1).' ('.$Class['Level'].')'?></option>
+					<option value="<?=$Class['ID'] ?>" <? if($_GET['class']===$Class['ID']) {echo ' selected="selected"';}?>><?=Format::cut_string($Class['Name'], 10, 1, 1).' ('.$Class['Level'].')'?></option>
 <?	} ?>
 					</select>
 				</td>
@@ -507,7 +507,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 	usort($Secondaries, $fnc);
 	foreach($Secondaries as $Class) {
 ?>
-					<option value="<?=$Class['ID'] ?>" <? if($_GET['secclass']===$Class['ID']) {echo ' selected="selected"';}?>><?=cut_string($Class['Name'], 20, 1, 1)?></option>
+					<option value="<?=$Class['ID'] ?>" <? if($_GET['secclass']===$Class['ID']) {echo ' selected="selected"';}?>><?=Format::cut_string($Class['Name'], 20, 1, 1)?></option>
 <?	} ?>
 					</select>
 				</td>
@@ -651,7 +651,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 					<select name="stylesheet" id="stylesheet">
 						<option value="">Any</option>
 <? foreach($Stylesheets as $Style) { ?>
-						<option value="<?=$Style['ID']?>"<?selected('stylesheet',$Style['ID'])?>><?=$Style['ProperName']?></option>
+						<option value="<?=$Style['ID']?>"<?Format::selected('stylesheet',$Style['ID'])?>><?=$Style['ProperName']?></option>
 <? } ?>
 					</select>
 				</td>
@@ -716,7 +716,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 ?>
 <div class="linkbox">
 <?
-$Pages=get_pages($Page,$NumResults,USERS_PER_PAGE,11);
+$Pages=Format::get_pages($Page,$NumResults,USERS_PER_PAGE,11);
 echo $Pages;
 ?>
 </div>
@@ -738,14 +738,14 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 <?
 while(list($UserID, $Username, $Uploaded, $Downloaded, $Snatched, $Class, $Email, $Enabled, $IP, $Invites, $DisableInvites, $Warned, $Donor, $JoinDate, $LastAccess) = $DB->next_record()){ ?>
 		<tr>
-			<td><?=format_username($UserID, true, true, true, true)?></td>
-			<td><?=ratio($Uploaded, $Downloaded)?></td>
-			<td><?=display_str($IP)?> (<?=get_cc($IP)?>)</td>
+			<td><?=Users::format_username($UserID, true, true, true, true)?></td>
+			<td><?=Format::get_ratio_html($Uploaded, $Downloaded)?></td>
+			<td><?=display_str($IP)?> (<?=Tools::get_country_code_by_ajax($IP)?>)</td>
 			<td><?=display_str($Email)?></td>
 			<td><?=time_diff($JoinDate)?></td>
 			<td><?=time_diff($LastAccess)?></td>
-			<td><?=get_size($Uploaded)?></td>
-			<td><?=get_size($Downloaded)?></td>
+			<td><?=Format::get_size($Uploaded)?></td>
+			<td><?=Format::get_size($Downloaded)?></td>
 <?			$DB->query("SELECT COUNT(ud.UserID) FROM users_downloads AS ud JOIN torrents AS t ON t.ID = ud.TorrentID WHERE ud.UserID = ".$UserID);
 			list($Downloads) = $DB->next_record();
 			$DB->set_query_id($Results);
@@ -763,5 +763,5 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 <?=$Pages?>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/user/community_stats.php b/sections/user/community_stats.php
index 9ac510f9..791c9add 100644
--- a/sections/user/community_stats.php
+++ b/sections/user/community_stats.php
@@ -23,9 +23,9 @@
 		<div class="box box_info box_userinfo_community">
 			<div class="head colhead_dark">Community</div>
 			<ul class="stats nobullet">
-				<li>Forum Posts: <?=number_format($ForumPosts)?> [<a href="userhistory.php?action=posts&amp;userid=<?=$UserID?>" title="View">View</a>]</li>
+				<li>Forum posts: <?=number_format($ForumPosts)?> [<a href="userhistory.php?action=posts&amp;userid=<?=$UserID?>" title="View">View</a>]</li>
 <? if (($Override=check_paranoia_here('torrentcomments+'))) { ?>
-				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Torrent Comments: <?=number_format($NumComments)?>
+				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Torrent comments: <?=number_format($NumComments)?>
 					<? if($Override=check_paranoia_here('torrentcomments')) { ?>[<a href="comments.php?id=<?=$UserID?>" <?= $Override===2 ? 'class="paranoia_override"'
 																																		 : ''
 																				?> title="View">View</a>]
@@ -33,7 +33,7 @@
 				</li>
 <? }
    if (($Override=check_paranoia_here('collages+'))) { ?>
-				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Collages Started: <?=number_format($NumCollages)?>
+				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Collages started: <?=number_format($NumCollages)?>
 					<? if(($Override=check_paranoia_here('collages'))) { ?>[<a <?= ($Override===2) ? 'class="paranoia_override"'
 																							  :'' ?>
 																		href="collages.php?userid=<?=$UserID?>" title="View">View</a>]
@@ -55,15 +55,15 @@
 $ViewBounty  = check_paranoia_here('requestsfilled_bounty');
 
    if ($ViewCount && !$ViewBounty && !$ViewAll) { ?>
-				<li>Requests Filled: <?=number_format($RequestsFilled)?></li>
+				<li>Requests filled: <?=number_format($RequestsFilled)?></li>
 <? } elseif(!$ViewCount && $ViewBounty && !$ViewAll) { ?>
-				<li>Requests Voted: <?=get_size($TotalSpent)?> collected</li>
+				<li>Requests voted: <?=Format::get_size($TotalSpent)?> collected</li>
 <? } elseif($ViewCount && $ViewBounty && !$ViewAll) { ?>
-				<li>Requests Filled: <?=number_format($RequestsFilled)?> for <?=get_size($TotalBounty)?></li>
+				<li>Requests filled: <?=number_format($RequestsFilled)?> for <?=Format::get_size($TotalBounty)?></li>
 <? } elseif($ViewAll) { ?>
 				<li>
 					<span <?= ($ViewCount===2) ? 'class="paranoia_override"' : ''?> >Requests filled: <?=number_format($RequestsFilled)?> </span>
-					<span <?= ($ViewBounty===2) ? 'class="paranoia_override"' : ''?>> for <?=get_size($TotalBounty) ?> </span>
+					<span <?= ($ViewBounty===2) ? 'class="paranoia_override"' : ''?>> for <?=Format::get_size($TotalBounty) ?> </span>
 					[<a href="requests.php?type=filled&amp;userid=<?=$UserID?>" <?= ($ViewAll===2) ? 'class="paranoia_override"' : ''?> title="View">View</a>]
 				</li>
 <? }
@@ -74,15 +74,15 @@
 $ViewBounty  = check_paranoia_here('requestsvoted_bounty');
 
    if ($ViewCount && !$ViewBounty && !$ViewAll) { ?>
-				<li>Requests Voted: <?=number_format($RequestsVoted)?></li>
+				<li>Requests voted: <?=number_format($RequestsVoted)?></li>
 <? } elseif(!$ViewCount && $ViewBounty && !$ViewAll) { ?>
-				<li>Requests Voted: <?=get_size($TotalSpent)?> spent</li>
+				<li>Requests voted: <?=Format::get_size($TotalSpent)?> spent</li>
 <? } elseif($ViewCount && $ViewBounty && !$ViewAll) { ?>
-				<li>Requests Voted: <?=number_format($RequestsVoted)?> for <?=get_size($TotalSpent)?></li>
+				<li>Requests voted: <?=number_format($RequestsVoted)?> for <?=Format::get_size($TotalSpent)?></li>
 <? } elseif($ViewAll) { ?>
 				<li>
-					<span <?= ($ViewCount===2) ? 'class="paranoia_override"' : ''?> >Requests Voted: <?=number_format($RequestsVoted)?> </span>
-					<span <?= ($ViewBounty===2) ? 'class="paranoia_override"' : ''?>> for <?=get_size($TotalSpent)?> </span>
+					<span <?= ($ViewCount===2) ? 'class="paranoia_override"' : ''?> >Requests voted: <?=number_format($RequestsVoted)?> </span>
+					<span <?= ($ViewBounty===2) ? 'class="paranoia_override"' : ''?>> for <?=Format::get_size($TotalSpent)?> </span>
 					[<a href="requests.php?type=voted&amp;userid=<?=$UserID?>" <?= ($ViewAll===2) ? 'class="paranoia_override"' : ''?> title="View">View</a>]
 				</li>
 <? }
@@ -94,7 +94,7 @@
 <? }
    if (($Override=check_paranoia_here('uniquegroups+'))) { ?>
 				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >
-					Unique Groups: <?echo number_format($UniqueGroups);
+					Unique groups: <?echo number_format($UniqueGroups);
 									if(($Override=check_paranoia_here('uniquegroups'))) {?>
 										[<a <?= $Override===2 ? 'class="paranoia_override"' :'' ?> href="torrents.php?type=uploaded&amp;userid=<?=$UserID?>&amp;filter=uniquegroup">View</a>]
 									<?}?>
diff --git a/sections/user/connchecker.php b/sections/user/connchecker.php
index 55b8f0df..ae727567 100644
--- a/sections/user/connchecker.php
+++ b/sections/user/connchecker.php
@@ -32,7 +32,7 @@
 	}
 }
 
-show_header('Connectability Checker');
+View::show_header('Connectability Checker');
 ?>
 <div class="thin">
 	<div class="header">
@@ -69,4 +69,4 @@ function check_ip() {
 	});
 }
 </script>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/user/edit.php b/sections/user/edit.php
index b75e3145..a5f6ef27 100644
--- a/sections/user/edit.php
+++ b/sections/user/edit.php
@@ -61,12 +61,12 @@ function checked($Checked) {
 	$SiteOptions = array();
 }
 
-show_header($Username.' > Settings','user,jquery,password_validate,validate');
+View::show_header($Username.' > Settings','user,jquery,password_validate,validate');
 echo $Val->GenerateJS('userform');
 ?>
 <div class="thin">
 	<div class="header">
-		<h2><?=format_username($UserID, false, false, false)?> &gt; Settings</h2>
+		<h2><?=Users::format_username($UserID, false, false, false)?> &gt; Settings</h2>
 	</div>
 	<form class="edit_form" name="user" id="userform" action="" method="post" onsubmit="return formVal();" autocomplete="off">
 		<div>
@@ -457,4 +457,4 @@ function checked($Checked) {
 		</table>
 	</form>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/user/invite.php b/sections/user/invite.php
index 79df1e02..b87f14b1 100644
--- a/sections/user/invite.php
+++ b/sections/user/invite.php
@@ -16,7 +16,7 @@
 	
 }
 
-list($UserID, $Username, $PermissionID) = array_values(user_info($UserID));
+list($UserID, $Username, $PermissionID) = array_values(Users::user_info($UserID));
 
 
 $DB->query("SELECT InviteKey, Email, Expires FROM invites WHERE InviterID='$UserID' ORDER BY Expires");
@@ -69,7 +69,7 @@
 		break;
 }
 
-$CurrentURL = get_url(array('action', 'order', 'sort'));
+$CurrentURL = Format::get_url(array('action', 'order', 'sort'));
 
 $DB->query("SELECT
 	ID,
@@ -85,11 +85,11 @@
 
 $Invited = $DB->to_array();
 
-show_header('Invites');
+View::show_header('Invites');
 ?>
 <div class="thin">
 	<div class="header">
-		<h2><?=format_username($UserID, false, false, false)?> &gt; Invites</h2>
+		<h2><?=Users::format_username($UserID, false, false, false)?> &gt; Invites</h2>
 		<div class="linkbox">
 			[<a href="user.php?action=invitetree<? if($Sneaky){ echo '&amp;userid='.$UserID; }?>">Invite tree</a>]
 		</div>
@@ -200,16 +200,16 @@
 		$Row = ($Row == 'a') ? 'b' : 'a';
 ?> 
 			<tr class="row<?=$Row?>">
-				<td><?=format_username($ID, true, true, true, true)?></td>
+				<td><?=Users::format_username($ID, true, true, true, true)?></td>
 				<td><?=display_str($Email)?></td>
 				<td><?=time_diff($JoinDate,1)?></td>
 				<td><?=time_diff($LastAccess,1);?></td>
-				<td><?=get_size($Uploaded)?></td>
-				<td><?=get_size($Downloaded)?></td>
-				<td><?=ratio($Uploaded, $Downloaded)?></td>
+				<td><?=Format::get_size($Uploaded)?></td>
+				<td><?=Format::get_size($Downloaded)?></td>
+				<td><?=Format::get_ratio_html($Uploaded, $Downloaded)?></td>
 			</tr>
 <? } ?>
 		</table>
 	</div>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/user/invitetree.php b/sections/user/invitetree.php
index 4f68b84f..9374f1a9 100644
--- a/sections/user/invitetree.php
+++ b/sections/user/invitetree.php
@@ -15,19 +15,19 @@
 	$Sneaky = false;
 }
 
-list($UserID, $Username, $PermissionID) = array_values(user_info($UserID));
+list($UserID, $Username, $PermissionID) = array_values(Users::user_info($UserID));
 
 include(SERVER_ROOT.'/classes/class_invite_tree.php');
 $Tree = new INVITE_TREE($UserID);
 
-show_header($Username.' &gt; Invites &gt; Tree');
+View::show_header($Username.' &gt; Invites &gt; Tree');
 ?>
 <div class="thin">
 	<div class="header">
-		<h2><?=format_username($UserID, false, false, false)?> &gt; <a href="user.php?action=invite&amp;userid=<?=$UserID?>">Invites</a> &gt; Tree</h2>
+		<h2><?=Users::format_username($UserID, false, false, false)?> &gt; <a href="user.php?action=invite&amp;userid=<?=$UserID?>">Invites</a> &gt; Tree</h2>
 	</div>
 	<div class="box pad">
 <?	$Tree->make_tree(); ?>
 	</div>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/user/linkedfunctions.php b/sections/user/linkedfunctions.php
index da2ecf68..287d500e 100644
--- a/sections/user/linkedfunctions.php
+++ b/sections/user/linkedfunctions.php
@@ -28,8 +28,8 @@ function link_users($UserID, $TargetID) {
 	$DB->query("SELECT u.GroupID, d.Comments FROM users_dupes AS u JOIN dupe_groups AS d ON d.ID = u.GroupID WHERE UserID = $UserID");
 	list($UserGroupID, $Comments) = $DB->next_record();
 
-	$UserInfo = user_info($UserID);
-	$TargetInfo = user_info($TargetID);
+	$UserInfo = Users::user_info($UserID);
+	$TargetInfo = Users::user_info($TargetID);
 	if (!$UserInfo || !$TargetInfo) {
 		return;
 	}
@@ -75,7 +75,7 @@ function unlink_user($UserID) {
 	if (!is_number($UserID)) {
 		error(403);
 	}
-	$UserInfo = user_info($UserID);
+	$UserInfo = Users::user_info($UserID);
 	if ($UserInfo === FALSE) {
 		return;
 	}
@@ -175,9 +175,9 @@ function user_dupes_table($UserID) {
 	foreach ($Dupes as $Dupe) {
 		$i++;
 		list($DupeID) = $Dupe;
-		$DupeInfo = user_info($DupeID);
+		$DupeInfo = Users::user_info($DupeID);
 ?>
-					<td align="left"><?=format_username($DupeID, true, true, true, true)?>
+					<td align="left"><?=Users::format_username($DupeID, true, true, true, true)?>
 						(<a href="user.php?action=dupes&amp;dupeaction=remove&amp;auth=<?=$LoggedUser['AuthKey']?>&amp;userid=<?=$UserID?>&amp;removeid=<?=$DupeID?>" onclick="return confirm('Are you sure you wish to remove <?=$DupeInfo['Username']?> from this group?');">x</a>)</td>
 <?
 		if ($i == 5) {
@@ -206,7 +206,7 @@ function user_dupes_table($UserID) {
 					</tr>
 				</table>
 				<div class="pad hidden linkedaccounts">
-					<label for="target">Link this user with: </label><input type="text" name="target" id="target" /><input type="submit" value="Link" id="submitlink" />
+					<label for="target">Link this user with: </label><input type="text" name="target" id="target" /><input type="submit" value="Update" id="submitlink" />
 				</div>
 			</div>
 		</form>
diff --git a/sections/user/notify_edit.php b/sections/user/notify_edit.php
index fe6f5cf6..287a3207 100644
--- a/sections/user/notify_edit.php
+++ b/sections/user/notify_edit.php
@@ -1,6 +1,6 @@
 <?
 if(!check_perms('site_torrents_notify')){ error(403); }
-show_header('Manage notifications');
+View::show_header('Manage notifications');
 ?>
 <div class="thin">
 	<div class="header">
@@ -152,4 +152,4 @@
 <?	}
 } ?>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/user/permissions.php b/sections/user/permissions.php
index 10dbd665..e8546c6d 100644
--- a/sections/user/permissions.php
+++ b/sections/user/permissions.php
@@ -5,7 +5,7 @@
 
 include(SERVER_ROOT."/classes/permissions_form.php");
 
-list($UserID, $Username, $PermissionID) = array_values(user_info($_REQUEST['userid']));
+list($UserID, $Username, $PermissionID) = array_values(Users::user_info($_REQUEST['userid']));
 
 $DB->query("SELECT 
 		u.CustomPermissions 
@@ -15,7 +15,7 @@
 list($Customs)=$DB->next_record(MYSQLI_NUM, false);
 
 
-$Defaults = get_permissions_for_user($UserID, array());
+$Defaults = Permissions::get_permissions_for_user($UserID, array());
 
 $Delta=array();
 if (isset($_POST['action'])) {
@@ -52,7 +52,7 @@ function display_perm($Key,$Title) {
 	echo $Perm;
 }
 
-show_header($Username.' &gt; Permissions');
+View::show_header($Username.' &gt; Permissions');
 ?>
 <script type="text/javascript">
 function reset() {
@@ -65,7 +65,7 @@ function reset() {
 }
 </script>
 <div class="header">
-	<h2><?=format_username($UserID, false, false, false)?> > Permissions</h2>
+	<h2><?=Users::format_username($UserID, false, false, false)?> > Permissions</h2>
 	<div class="linkbox">
 		[<a href="#" onclick="reset();return false;">Defaults</a>]
 	</div>
@@ -89,4 +89,4 @@ function reset() {
 permissions_form();
 ?>
 </form>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/user/search.php b/sections/user/search.php
index 5b2fccd3..dd04f959 100644
--- a/sections/user/search.php
+++ b/sections/user/search.php
@@ -18,7 +18,7 @@
 	
 	if(!$Err){
 		// Passed validation. Let's rock.
-		list($Page,$Limit) = page_limit(USERS_PER_PAGE);
+		list($Page,$Limit) = Format::page_limit(USERS_PER_PAGE);
 		$DB->query("SELECT SQL_CALC_FOUND_ROWS
 			ID,
 			Username,
@@ -37,7 +37,7 @@
 	}
 
 }
-show_header('User search');
+View::show_header('User search');
 ?>
 <div class="thin">
 	<div class="header">
@@ -45,7 +45,7 @@
 	</div>
 	<div class="linkbox">
 <?
-$Pages=get_pages($Page,$NumResults,USERS_PER_PAGE,9);
+$Pages=Format::get_pages($Page,$NumResults,USERS_PER_PAGE,9);
 echo $Pages;
 ?>
 	</div>
@@ -74,8 +74,8 @@
 	list($UserID, $Username, $Enabled, $PermissionID, $Donor, $Warned) = $Result;
 ?>
 			<tr>
-				<td><?=format_username($UserID, true, true, true, true);?></td>
-				<td><?=make_class_string($PermissionID);?></td>
+				<td><?=Users::format_username($UserID, true, true, true, true);?></td>
+				<td><?=Users::make_class_string($PermissionID);?></td>
 			</tr>
 <? } ?>
 		</table>
@@ -85,4 +85,4 @@
 	</div>
 </div>
 
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/user/sessions.php b/sections/user/sessions.php
index 3a82446e..e5eca6b1 100644
--- a/sections/user/sessions.php
+++ b/sections/user/sessions.php
@@ -38,11 +38,11 @@
 	$Cache->cache_value('users_sessions_'.$UserID, $UserSessions, 0);
 }
 
-list($UserID, $Username) = array_values(user_info($UserID));
-show_header($Username.' &gt; Sessions');
+list($UserID, $Username) = array_values(Users::user_info($UserID));
+View::show_header($Username.' &gt; Sessions');
 ?>
 <div class="thin">
-<h2><?=format_username($UserID,$Username)?> &gt; Sessions</h2>
+<h2><?=Users::format_username($UserID,$Username)?> &gt; Sessions</h2>
 	<div class="box pad">
 		<p>Note: Clearing cookies can result in ghost sessions which are automatically removed after 30 days.</p>
 	</div>
@@ -87,5 +87,5 @@
 	</div>
 </div>
 
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/user/takeedit.php b/sections/user/takeedit.php
index 070d88f4..db29e22f 100644
--- a/sections/user/takeedit.php
+++ b/sections/user/takeedit.php
@@ -7,13 +7,13 @@
 }
 
 //For the entire of this page we should in general be using $UserID not $LoggedUser['ID'] and $U[] not $LoggedUser[]	
-$U = user_info($UserID);
+$U = Users::user_info($UserID);
 
 if (!$U) {
 	error(404);
 }
 
-$Permissions = get_permissions($U['PermissionID']);
+$Permissions = Permissions::get_permissions($U['PermissionID']);
 if ($UserID != $LoggedUser['ID'] && !check_perms('users_edit_profiles', $Permissions['Class'])) {
 	send_irc("PRIVMSG ".ADMIN_CHAN." :User ".$LoggedUser['Username']." (https://".SSL_SITE_URL."/user.php?id=".$LoggedUser['ID'].") just tried to edit the profile of https://".SSL_SITE_URL."/user.php?id=".$_REQUEST['userid']);
 	error(403);
@@ -130,7 +130,7 @@
 	if(!check_perms('users_edit_profiles')) { // Non-admins have to authenticate to change email
 		$DB->query("SELECT PassHash,Secret FROM users_main WHERE ID='".db_string($UserID)."'");
 		list($PassHash,$Secret)=$DB->next_record();
-		if(!check_password($_POST['cur_pass'], $PassHash, $Secret)) {
+		if(!Users::check_password($_POST['cur_pass'], $PassHash, $Secret)) {
 			$Err = "You did not enter the correct password.";
 		}
 	}
@@ -159,7 +159,7 @@
 	$DB->query("SELECT PassHash,Secret FROM users_main WHERE ID='".db_string($UserID)."'");
 	list($PassHash,$Secret)=$DB->next_record();
 
-	if (check_password($_POST['cur_pass'], $PassHash, $Secret)) {
+	if (Users::check_password($_POST['cur_pass'], $PassHash, $Secret)) {
 		if ($_POST['new_pass_1'] && $_POST['new_pass_2']) { 
 			$ResetPassword = true; 
 		}
@@ -258,7 +258,7 @@
 
 if($ResetPassword) {
 	$ChangerIP = db_string($LoggedUser['IP']);
-	$PassHash=make_crypt_hash($_POST['new_pass_1']);
+	$PassHash=Users::make_crypt_hash($_POST['new_pass_1']);
 	$SQL.=",m.PassHash='".db_string($PassHash)."'";
 	$DB->query("INSERT INTO users_history_passwords
 		(UserID, ChangerIP, ChangeTime) VALUES
@@ -271,9 +271,9 @@
 	
 	
 	
-	$UserInfo = user_heavy_info($UserID);
+	$UserInfo = Users::user_heavy_info($UserID);
 	$OldPassKey = db_string($UserInfo['torrent_pass']);
-	$NewPassKey = db_string(make_secret());
+	$NewPassKey = db_string(Users::make_secret());
 	$ChangerIP = db_string($LoggedUser['IP']);
 	$SQL.=",m.torrent_pass='$NewPassKey'";
 	$DB->query("INSERT INTO users_history_passkeys
@@ -284,7 +284,7 @@
 	$Cache->commit_transaction(0);
 	$Cache->delete_value('user_'.$OldPassKey);
 	
-	update_tracker('change_passkey', array('oldpasskey' => $OldPassKey, 'newpasskey' => $NewPassKey));
+	Tracker::update_tracker('change_passkey', array('oldpasskey' => $OldPassKey, 'newpasskey' => $NewPassKey));
 }
 
 $SQL.="WHERE m.ID='".db_string($UserID)."'";
diff --git a/sections/user/takeinvite.php b/sections/user/takeinvite.php
index 918ff767..3b759cd3 100644
--- a/sections/user/takeinvite.php
+++ b/sections/user/takeinvite.php
@@ -52,7 +52,7 @@
 		header('Location: user.php?action=invite');
 		die();
 	}
-	$InviteKey = db_string(make_secret());
+	$InviteKey = db_string(Users::make_secret());
 		
 $Message = <<<EOT
 The user $Username has invited you to join $SiteName, and has specified this address ($CurEmail) as your email address. If you do not know this person, please ignore this email, and do not reply.
@@ -80,7 +80,7 @@
 		$Cache->commit_transaction(0);
 	}
 	
-	send_email($CurEmail, 'You have been invited to '.SITE_NAME, $Message,'noreply');
+	Misc::send_email($CurEmail, 'You have been invited to '.SITE_NAME, $Message,'noreply');
 
 	
 }
diff --git a/sections/user/takemoderate.php b/sections/user/takemoderate.php
index 414f7643..03d0f691 100644
--- a/sections/user/takemoderate.php
+++ b/sections/user/takemoderate.php
@@ -38,11 +38,11 @@
 if(isset($_POST['Uploaded']) && isset($_POST['Downloaded'])) {
 	$Uploaded = ($_POST['Uploaded']  == "" ? 0 : $_POST['Uploaded']);
 	if($Arithmetic = strpbrk($Uploaded, '+-')) {
-		$Uploaded += max(-$Uploaded, get_bytes($Arithmetic));
+		$Uploaded += max(-$Uploaded, Format::get_bytes($Arithmetic));
 	}
 	$Downloaded = ($_POST['Downloaded'] == "" ? 0 : $_POST['Downloaded']);
 	if($Arithmetic = strpbrk($Downloaded, '+-')) {
-		$Downloaded += max(-$Downloaded, get_bytes($Arithmetic));
+		$Downloaded += max(-$Downloaded, Format::get_bytes($Arithmetic));
 	}
 	if(!is_number($Uploaded) || !is_number($Downloaded)) {
 		error(0);
@@ -156,12 +156,12 @@
 // If we're deleting the user, we can ignore all the other crap
 
 if ($_POST['UserStatus']=="delete" && check_perms('users_delete_users')) {
-	write_log("User account ".$UserID." (".$Cur['Username'].") was deleted by ".$LoggedUser['Username']);
+	Misc::write_log("User account ".$UserID." (".$Cur['Username'].") was deleted by ".$LoggedUser['Username']);
 	$DB->query("DELETE FROM users_main WHERE id=".$UserID);
 	$DB->query("DELETE FROM users_info WHERE UserID=".$UserID);
 	$Cache->delete_value('user_info_'.$UserID);
 	
-	update_tracker('remove_user', array('passkey' => $Cur['torrent_pass']));
+	Tracker::update_tracker('remove_user', array('passkey' => $Cur['torrent_pass']));
 	
 	header("Location: log.php?search=User+".$UserID);
 	die();
@@ -252,7 +252,7 @@
 	($Classes[$Class]['Level'] < $LoggedUser['Class'] && check_perms('users_promote_below', $Cur['Class']))
 	|| ($Classes[$Class]['Level'] <= $LoggedUser['Class'] && check_perms('users_promote_to', $Cur['Class']-1)))) {
 	$UpdateSet[]="PermissionID='$Class'";
-	$EditSummary[]="class changed to ".make_class_string($Class);
+	$EditSummary[]="class changed to ".Users::make_class_string($Class);
 	$LightUpdates['PermissionID']=$Class;
 	$DeleteKeys = true;
 
@@ -341,14 +341,14 @@
 if ($Uploaded!=$Cur['Uploaded'] && $Uploaded!=$_POST['OldUploaded'] && (check_perms('users_edit_ratio') 
  || (check_perms('users_edit_own_ratio') && $UserID == $LoggedUser['ID']))) {
 	$UpdateSet[]="Uploaded='".$Uploaded."'";
-	$EditSummary[]="uploaded changed from ".get_size($Cur['Uploaded'])." to ".get_size($Uploaded);
+	$EditSummary[]="uploaded changed from ".Format::get_size($Cur['Uploaded'])." to ".Format::get_size($Uploaded);
 	$Cache->delete_value('users_stats_'.$UserID);
 }
 
 if ($Downloaded!=$Cur['Downloaded'] && $Downloaded!=$_POST['OldDownloaded'] && (check_perms('users_edit_ratio') 
  || (check_perms('users_edit_own_ratio') && $UserID == $LoggedUser['ID']))) {
 	$UpdateSet[]="Downloaded='".$Downloaded."'";
-	$EditSummary[]="downloaded changed from ".get_size($Cur['Downloaded'])." to ".get_size($Downloaded);
+	$EditSummary[]="downloaded changed from ".Format::get_size($Cur['Downloaded'])." to ".Format::get_size($Downloaded);
 	$Cache->delete_value('users_stats_'.$UserID);
 }
 
@@ -365,7 +365,7 @@
 }
 
 if ($Warned == 1 && $Cur['Warned']=='0000-00-00 00:00:00' && check_perms('users_warn')) {
-	send_pm($UserID,0,db_string('You have received a warning'),db_string("You have been [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;id=218]warned for $WarnLength week(s)[/url] by [user]".$LoggedUser['Username']."[/user]. The reason given was: $WarnReason"));
+	Misc::send_pm($UserID,0,db_string('You have received a warning'),db_string("You have been [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;id=218]warned for $WarnLength week(s)[/url] by [user]".$LoggedUser['Username']."[/user]. The reason given was: $WarnReason"));
 	$UpdateSet[]="Warned='".sqltime()."' + INTERVAL $WarnLength WEEK";
 	$Msg = "warned for $WarnLength week(s)";
 	if ($WarnReason) { $Msg.=" for $WarnReason"; }
@@ -379,7 +379,7 @@
 
 } elseif ($Warned == 1 && $ExtendWarning!='---' && check_perms('users_warn')) {
 	
-	send_pm($UserID,0,db_string('Your warning has been extended'),db_string("Your warning has been extended by $ExtendWarning week(s) by [user]".$LoggedUser['Username']."[/user]. The reason given was: $WarnReason"));
+	Misc::send_pm($UserID,0,db_string('Your warning has been extended'),db_string("Your warning has been extended by $ExtendWarning week(s) by [user]".$LoggedUser['Username']."[/user]. The reason given was: $WarnReason"));
 	
 	$UpdateSet[]="Warned=Warned + INTERVAL $ExtendWarning WEEK";
 	$DB->query("SELECT Warned + INTERVAL $ExtendWarning WEEK FROM users_info WHERE UserID='$UserID'");
@@ -390,7 +390,7 @@
 	$LightUpdates['Warned']=$WarnedUntil;
 } elseif ($Warned == 1 && $ExtendWarning=='---' && $ReduceWarning!='---' && check_perms('users_warn')) {
 	
-	send_pm($UserID,0,db_string('Your warning has been reduced'),db_string("Your warning has been reduced by $ReduceWarning week(s) by [user]".$LoggedUser['Username']."[/user]. The reason given was: $WarnReason"));
+	Misc::send_pm($UserID,0,db_string('Your warning has been reduced'),db_string("Your warning has been reduced by $ReduceWarning week(s) by [user]".$LoggedUser['Username']."[/user]. The reason given was: $WarnReason"));
 	
 	$UpdateSet[]="Warned=Warned - INTERVAL $ReduceWarning WEEK";
 	$DB->query("SELECT Warned  - INTERVAL $ReduceWarning WEEK FROM users_info WHERE UserID='$UserID'");
@@ -444,7 +444,7 @@
 	$EditSummary[]="avatar status changed";
 	$HeavyUpdates['DisableAvatar']=$DisableAvatar;
 	if (!empty($UserReason)) {
-		send_pm($UserID, 0, db_string('Your avatar privileges have been disabled'),db_string("Your avatar privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
+		Misc::send_pm($UserID, 0, db_string('Your avatar privileges have been disabled'),db_string("Your avatar privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
 	}
 }
 
@@ -454,9 +454,9 @@
 	$HeavyUpdates['DisableLeech']=$DisableLeech;
 	$HeavyUpdates['CanLeech']=$DisableLeech;
 	if (!empty($UserReason)) {
-		send_pm($UserID, 0, db_string('Your leeching privileges have been disabled'),db_string("Your leeching privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
+		Misc::send_pm($UserID, 0, db_string('Your leeching privileges have been disabled'),db_string("Your leeching privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
 	}
-	update_tracker('update_user', array('passkey' => $Cur['torrent_pass'], 'can_leech' => $DisableLeech));
+	Tracker::update_tracker('update_user', array('passkey' => $Cur['torrent_pass'], 'can_leech' => $DisableLeech));
 }
 
 if ($DisableInvites!=$Cur['DisableInvites'] && check_perms('users_disable_any')) {
@@ -464,7 +464,7 @@
 	if ($DisableInvites == 1) { 
 		//$UpdateSet[]="Invites='0'"; 
 		if (!empty($UserReason)) {
-			send_pm($UserID, 0, db_string('Your invite privileges have been disabled'),db_string("Your invite privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
+			Misc::send_pm($UserID, 0, db_string('Your invite privileges have been disabled'),db_string("Your invite privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
 		}
 	}
 	$EditSummary[]="invites status changed";
@@ -476,7 +476,7 @@
 	$EditSummary[]="posting status changed";
 	$HeavyUpdates['DisablePosting']=$DisablePosting;
 	if (!empty($UserReason)) {
-		send_pm($UserID, 0, db_string('Your forum posting privileges have been disabled'),db_string("Your forum posting privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
+		Misc::send_pm($UserID, 0, db_string('Your forum posting privileges have been disabled'),db_string("Your forum posting privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
 	}
 }
 
@@ -485,7 +485,7 @@
 	$EditSummary[]="forums status changed";
 	$HeavyUpdates['DisableForums']=$DisableForums;
 	if (!empty($UserReason)) {
-		send_pm($UserID, 0, db_string('Your forum privileges have been disabled'),db_string("Your forum privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
+		Misc::send_pm($UserID, 0, db_string('Your forum privileges have been disabled'),db_string("Your forum privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
 	}
 }
 
@@ -494,7 +494,7 @@
 	$EditSummary[]="tagging status changed";
 	$HeavyUpdates['DisableTagging']=$DisableTagging;
 	if (!empty($UserReason)) {
-		send_pm($UserID, 0, db_string('Your tagging privileges have been disabled'),db_string("Your tagging privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
+		Misc::send_pm($UserID, 0, db_string('Your tagging privileges have been disabled'),db_string("Your tagging privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
 	}
 }
 
@@ -503,7 +503,7 @@
 	$EditSummary[]="upload status changed";
 	$HeavyUpdates['DisableUpload']=$DisableUpload;
 	if ($DisableUpload == 1) {
-		send_pm($UserID, 0, db_string('Your upload privileges have been disabled'),db_string("Your upload privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
+		Misc::send_pm($UserID, 0, db_string('Your upload privileges have been disabled'),db_string("Your upload privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
 	}
 }
 
@@ -513,7 +513,7 @@
 	$HeavyUpdates['DisableWiki']=$DisableWiki;
 	$HeavyUpdates['site_edit_wiki']=0;
 	if (!empty($UserReason)) {
-		send_pm($UserID, 0, db_string('Your site editing privileges have been disabled'),db_string("Your site editing privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
+		Misc::send_pm($UserID, 0, db_string('Your site editing privileges have been disabled'),db_string("Your site editing privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
 	}
 	
 }
@@ -523,7 +523,7 @@
 	$EditSummary[]="PM status changed";
 	$HeavyUpdates['DisablePM']=$DisablePM;
 	if (!empty($UserReason)) {
-		send_pm($UserID, 0, db_string('Your PM privileges have been disabled'),db_string("Your PM privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
+		Misc::send_pm($UserID, 0, db_string('Your PM privileges have been disabled'),db_string("Your PM privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
 	}
 }
 
@@ -532,7 +532,7 @@
 	$EditSummary[]="IRC status changed";
 	$HeavyUpdates['DisableIRC']=$DisableIRC;
 	if (!empty($UserReason)) {
-		send_pm($UserID, 0, db_string('Your IRC privileges have been disabled'),db_string("Your IRC privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]. This loss of privileges does not affect the ability to join and talk to staff in #what.cd-disabled."));
+		Misc::send_pm($UserID, 0, db_string('Your IRC privileges have been disabled'),db_string("Your IRC privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]. This loss of privileges does not affect the ability to join and talk to staff in #what.cd-disabled."));
 	}
 }
 
@@ -541,7 +541,7 @@
 	$EditSummary[]="request status changed";
 	$HeavyUpdates['DisableRequests']=$DisableRequests;
 	if (!empty($UserReason)) {
-		send_pm($UserID, 0, db_string('Your request privileges have been disabled'),db_string("Your request privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]. This loss of privileges does not affect the ability to join and talk to staff in #what.cd-disabled."));
+		Misc::send_pm($UserID, 0, db_string('Your request privileges have been disabled'),db_string("Your request privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]. This loss of privileges does not affect the ability to join and talk to staff in #what.cd-disabled."));
 	}
 }
 
@@ -550,10 +550,10 @@
 if ($EnableUser!=$Cur['Enabled'] && check_perms('users_disable_users')) {
 	$EnableStr = 'account '.translateUserStatus($Cur['Enabled']).'->'.translateUserStatus($EnableUser);
 	if($EnableUser == '2') {
-		disable_users($UserID, '', 1);
+		Tools::disable_users($UserID, '', 1);
 	} elseif($EnableUser == '1') {
 		$Cache->increment('stats_user_count');
-		update_tracker('add_user', array('id' => $UserID, 'passkey' => $Cur['torrent_pass']));
+		Tracker::update_tracker('add_user', array('id' => $UserID, 'passkey' => $Cur['torrent_pass']));
 		if (($Cur['Downloaded'] == 0) || ($Cur['Uploaded']/$Cur['Downloaded'] >= $Cur['RequiredRatio'])) {
 			$UpdateSet[]="i.RatioWatchEnds='0000-00-00 00:00:00'";
 			$CanLeech = 1;
@@ -566,7 +566,7 @@
 				$UpdateSet[]="i.RatioWatchDownload=m.Downloaded";
 				$CanLeech = 0;
 			}
-			update_tracker('update_user', array('passkey' => $Cur['torrent_pass'], 'can_leech' => '0'));
+			Tracker::update_tracker('update_user', array('passkey' => $Cur['torrent_pass'], 'can_leech' => '0'));
 		}
 		$UpdateSet[]="Enabled='1'";
 		$LightUpdates['Enabled'] = 1;
@@ -576,7 +576,7 @@
 }
 
 if ($ResetPasskey == 1 && check_perms('users_edit_reset_keys')) {
-	$Passkey = db_string(make_secret());
+	$Passkey = db_string(Users::make_secret());
 	$UpdateSet[]="torrent_pass='$Passkey'";
 	$EditSummary[]="passkey reset";
 	$HeavyUpdates['torrent_pass']=$Passkey;
@@ -586,11 +586,11 @@
 	$DB->query("INSERT INTO users_history_passkeys
 			(UserID, OldPassKey, NewPassKey, ChangerIP, ChangeTime) VALUES
 			('$UserID', '".$Cur['torrent_pass']."', '$Passkey', '0.0.0.0', '".sqltime()."')");
-	update_tracker('change_passkey', array('oldpasskey' => $Cur['torrent_pass'], 'newpasskey' => $Passkey));
+	Tracker::update_tracker('change_passkey', array('oldpasskey' => $Cur['torrent_pass'], 'newpasskey' => $Passkey));
 }
 
 if ($ResetAuthkey == 1 && check_perms('users_edit_reset_keys')) {
-	$Authkey = db_string(make_secret());
+	$Authkey = db_string(Users::make_secret());
 	$UpdateSet[]="AuthKey='$Authkey'";
 	$EditSummary[]="authkey reset";
 	$HeavyUpdates['AuthKey']=$Authkey;
@@ -598,7 +598,7 @@
 
 if ($SendHackedMail && check_perms('users_disable_any')) {
 	$EditSummary[]="hacked email sent to ".$HackedEmail;
-	send_email($HackedEmail, "Your ".SITE_NAME." account.","Your ".SITE_NAME." account appears to have been compromised. As a security measure we have disabled your account. To resolve this please visit us on IRC.
+	Misc::send_email($HackedEmail, "Your ".SITE_NAME." account.","Your ".SITE_NAME." account appears to have been compromised. As a security measure we have disabled your account. To resolve this please visit us on IRC.
 
 This is the information to connect to our server:
 IRC Server: ".BOT_SERVER."
@@ -624,7 +624,7 @@
 }
 
 if ($Pass && check_perms('users_edit_password')) {
-	$UpdateSet[]="PassHash='".db_string(make_crypt_hash($Pass))."'";
+	$UpdateSet[]="PassHash='".db_string(Users::make_crypt_hash($Pass))."'";
 	$EditSummary[]='password reset';
        
 	$Cache->delete_value('user_info_'.$UserID);
diff --git a/sections/user/user.php b/sections/user/user.php
index 1e83cd11..fb96844f 100644
--- a/sections/user/user.php
+++ b/sections/user/user.php
@@ -6,13 +6,13 @@
 include(SERVER_ROOT.'/sections/requests/functions.php');
 include(SERVER_ROOT.'/classes/class_image_tools.php');
 
-if (empty($_GET['id']) || !is_numeric($_GET['id'])) 
-	error(404); 
-	
+if (empty($_GET['id']) || !is_numeric($_GET['id']))
+	error(404);
+
 $UserID = $_GET['id'];
-if($UserID == $LoggedUser['ID']) { 
+if($UserID == $LoggedUser['ID']) {
 	$OwnProfile = true;
-} else { 
+} else {
 	$OwnProfile = false;
 }
 
@@ -152,7 +152,7 @@ function check_paranoia_here($Setting) {
 $Badges.=($Enabled == '1' || $Enabled == '0' || !$Enabled) ? '': '<img src="'.STATIC_SERVER.'common/symbols/disabled.png" alt="Banned" />';
 
 
-show_header($Username,'user,bbcode,requests');
+View::show_header($Username,'user,bbcode,requests');
 ?>
 <div class="thin">
 	<h2><?=$Username?></h2>
@@ -191,7 +191,7 @@ function check_paranoia_here($Setting) {
 if (check_perms('users_mod')) {
 ?>
 		[<a href="userhistory.php?action=token_history&amp;userid=<?=$UserID?>">FL Tokens</a>]
-<? } 
+<? }
 if (check_perms('admin_clear_cache') && check_perms('users_override_paranoia')) {
 ?>
 		[<a href="user.php?action=clearcache&amp;id=<?=$UserID?>">Clear Cache</a>]
@@ -217,13 +217,13 @@ function check_paranoia_here($Setting) {
 				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Last Seen: <?=$LastAccess?></li>
 <? } ?>
 <? if (($Override=check_paranoia_here('uploaded'))) { ?>
-				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Uploaded: <?=get_size($Uploaded)?></li>
+				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Uploaded: <?=Format::get_size($Uploaded)?></li>
 <? } ?>
 <? if (($Override=check_paranoia_here('downloaded'))) { ?>
-				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Downloaded: <?=get_size($Downloaded)?></li>
+				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Downloaded: <?=Format::get_size($Downloaded)?></li>
 <? } ?>
 <? if (($Override=check_paranoia_here('ratio'))) { ?>
-				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Ratio: <?=ratio($Uploaded, $Downloaded)?></li>
+				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Ratio: <?=Format::get_ratio_html($Uploaded, $Downloaded)?></li>
 <? } ?>
 <? if (($Override=check_paranoia_here('requiredratio')) && isset($RequiredRatio)) { ?>
 				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Required ratio: <?=number_format((double)$RequiredRatio, 2)?></li>
@@ -288,10 +288,10 @@ function check_paranoia_here($Setting) {
 			<div class="head colhead_dark">Percentile Rankings (Hover for values)</div>
 			<ul class="stats nobullet">
 <? if (($Override=check_paranoia_here('uploaded'))) { ?>
-				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> title="<?=get_size($Uploaded)?>">Data uploaded: <?=$UploadedRank === false ? 'Server busy' : number_format($UploadedRank)?></li>
+				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> title="<?=Format::get_size($Uploaded)?>">Data uploaded: <?=$UploadedRank === false ? 'Server busy' : number_format($UploadedRank)?></li>
 <? } ?>
 <? if (($Override=check_paranoia_here('downloaded'))) { ?>
-				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> title="<?=get_size($Downloaded)?>">Data downloaded: <?=$DownloadedRank === false ? 'Server busy' : number_format($DownloadedRank)?></li>
+				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> title="<?=Format::get_size($Downloaded)?>">Data downloaded: <?=$DownloadedRank === false ? 'Server busy' : number_format($DownloadedRank)?></li>
 <? } ?>
 <? if (($Override=check_paranoia_here('uploads+'))) { ?>
 				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> title="<?=$Uploads?>">Torrents uploaded: <?=$UploadsRank === false ? 'Server busy' : number_format($UploadsRank)?></li>
@@ -300,7 +300,7 @@ function check_paranoia_here($Setting) {
 				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> title="<?=$RequestsFilled?>">Requests filled: <?=$RequestRank === false ? 'Server busy' : number_format($RequestRank)?></li>
 <? } ?>
 <? if (($Override=check_paranoia_here('requestsvoted_bounty'))) { ?>
-				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> title="<?=get_size($TotalSpent)?>">Bounty spent: <?=$BountyRank === false ? 'Server busy' : number_format($BountyRank)?></li>
+				<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> title="<?=Format::get_size($TotalSpent)?>">Bounty spent: <?=$BountyRank === false ? 'Server busy' : number_format($BountyRank)?></li>
 <? } ?>
 				<li title="<?=$ForumPosts?>">Posts made: <?=$PostRank === false ? 'Server busy' : number_format($PostRank)?></li>
 <? if (($Override=check_paranoia_here('artistsadded'))) { ?>
@@ -366,7 +366,7 @@ function check_paranoia_here($Setting) {
 			<ul class="stats nobullet">
 				<li>Class: <?=$ClassLevels[$Class]['Name']?></li>
 <?
-$UserInfo = user_info($UserID);
+$UserInfo = Users::user_info($UserID);
 if (!empty($UserInfo['ExtraClasses'])) {
 ?>
 				<li>
@@ -404,8 +404,8 @@ function check_paranoia_here($Setting) {
 
 if (check_perms('users_view_ips',$Class)) {
 ?>
-				<li>IP: <?=display_ip($IP)?></li>
-				<li>Host: <?=get_host($IP)?></li>
+				<li>IP: <?=Tools::display_ip($IP)?></li>
+				<li>Host: <?=Tools::get_host_by_ajax($IP)?></li>
 <?
 }
 
@@ -497,7 +497,7 @@ function check_paranoia_here($Setting) {
 			AND r.TorrentID = 0
 		GROUP BY r.ID
 		ORDER BY Votes DESC");
-	
+
 	if($DB->record_count() > 0) {
 		$Requests = $DB->to_array();
 ?>
@@ -523,7 +523,7 @@ function check_paranoia_here($Setting) {
 		foreach($Requests as $Request) {
 			list($RequestID, $CategoryID, $Title, $Year, $TimeAdded, $Votes, $Bounty) = $Request;
 
-			$Request = get_requests(array($RequestID));
+			$Request = Requests::get_requests(array($RequestID));
 			$Request = $Request['matches'][$RequestID];
 			if(empty($Request)) {
 				continue;
@@ -531,26 +531,26 @@ function check_paranoia_here($Setting) {
 
 			list($RequestID, $RequestorID, $RequestorName, $TimeAdded, $LastVote, $CategoryID, $Title, $Year, $Image, $Description, $CatalogueNumber, $ReleaseType,
 			$BitrateList, $FormatList, $MediaList, $LogCue, $FillerID, $FillerName, $TorrentID, $TimeFilled) = $Request;
-		
+
 			$CategoryName = $Categories[$CategoryID - 1];
-			
+
 			if($CategoryName == "Music") {
 				$ArtistForm = get_request_artists($RequestID);
-				$ArtistLink = display_artists($ArtistForm, true, true);
+				$ArtistLink = Artists::display_artists($ArtistForm, true, true);
 				$FullName = $ArtistLink."<a href='requests.php?action=view&amp;id=".$RequestID."'>".$Title." [".$Year."]</a>";
 			} else if($CategoryName == "Audiobooks" || $CategoryName == "Comedy") {
 				$FullName = "<a href='requests.php?action=view&amp;id=".$RequestID."'>".$Title." [".$Year."]</a>";
 			} else {
 				$FullName ="<a href='requests.php?action=view&amp;id=".$RequestID."'>".$Title."</a>";
 			}
-			
+
 			$Row = (empty($Row) || $Row == 'a') ? 'b' : 'a';
 ?>
 					<tr class="row<?=$Row?>">
 						<td>
 							<?=$FullName?>
 							<div class="tags">
-<?			
+<?
 			$Tags = $Request['Tags'];
 			$TagList = array();
 			foreach($Tags as $TagID => $TagName) {
@@ -566,10 +566,10 @@ function check_paranoia_here($Setting) {
 <?		  	if(check_perms('site_vote')){ ?>
 							<input type="hidden" id="auth" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
 							&nbsp;&nbsp; <a href="javascript:Vote(0, <?=$RequestID?>)"><strong>(+)</strong></a>
-<?			} ?> 
+<?			} ?>
 						</td>
 						<td>
-							<span id="bounty_<?=$RequestID?>"><?=get_size($Bounty)?></span>
+							<span id="bounty_<?=$RequestID?>"><?=Format::get_size($Bounty)?></span>
 						</td>
 						<td>
 							<?=time_diff($TimeAdded)?>
@@ -584,18 +584,18 @@ function check_paranoia_here($Setting) {
 }
 
 $IsFLS = $LoggedUser['ExtraClasses'][41];
-if (check_perms('users_mod', $Class) || $IsFLS) { 
+if (check_perms('users_mod', $Class) || $IsFLS) {
 	$UserLevel = $LoggedUser['EffectiveClass'];
-	$DB->query("SELECT 
+	$DB->query("SELECT
 					SQL_CALC_FOUND_ROWS
-					ID, 
-					Subject, 
-					Status, 
-					Level, 
-					AssignedToUser, 
-					Date, 
-					ResolverID 
-				FROM staff_pm_conversations 
+					ID,
+					Subject,
+					Status,
+					Level,
+					AssignedToUser,
+					Date,
+					ResolverID
+				FROM staff_pm_conversations
 				WHERE UserID = $UserID AND (Level <= $UserLevel OR AssignedToUser='".$LoggedUser['ID']."')
 				ORDER BY Date DESC");
 	if ($DB->record_count()) {
@@ -618,18 +618,18 @@ function check_paranoia_here($Setting) {
 				$Assigned = ($Level == 0) ? "First Line Support" : $ClassLevels[$Level]['Name'];
 				// No + on Sysops
 				if ($Assigned != 'Sysop') { $Assigned .= "+"; }
-					
+
 			} else {
 				// Assigned to user
-				$Assigned = format_username($UserID, true, true, true, true);
-			} 
-			
+				$Assigned = Users::format_username($UserID, true, true, true, true);
+			}
+
 			if ($ResolverID) {
-				$Resolver = format_username($ResolverID, true, true, true, true);
+				$Resolver = Users::format_username($ResolverID, true, true, true, true);
 			} else {
 				$Resolver = "(unresolved)";
 			}
-			
+
 			?>
 				<tr>
 					<td><a href="staffpm.php?action=viewconv&amp;id=<?=$ID?>"><?=display_str($Subject)?></a></td>
@@ -637,7 +637,7 @@ function check_paranoia_here($Setting) {
 					<td><?=$Assigned?></td>
 					<td><?=$Resolver?></td>
 				</tr>
-<?		} ?>				
+<?		} ?>
 			</table>
 		</div>
 <?	}
@@ -659,7 +659,7 @@ function check_paranoia_here($Setting) {
 	</div>
 </div>
 <br />
-<? 
+<?
 	}
 }
 if (check_perms('users_mod', $Class)) { ?>
@@ -819,7 +819,7 @@ function check_paranoia_here($Setting) {
 					<input type="checkbox" name="ResetIPHistory" id="ResetIPHistory" /> <label for="ResetIPHistory">IP History</label> |
 					<input type="checkbox" name="ResetEmailHistory" id="ResetEmailHistory" /> <label for="ResetEmailHistory">Email History</label>
 					<br />
-					<input type="checkbox" name="ResetSnatchList" id="ResetSnatchList" /> <label for="ResetSnatchList">Snatch List</label> | 
+					<input type="checkbox" name="ResetSnatchList" id="ResetSnatchList" /> <label for="ResetSnatchList">Snatch List</label> |
 					<input type="checkbox" name="ResetDownloadList" id="ResetDownloadList" /> <label for="ResetDownloadList">Download List</label>
 				</td>
 			</tr>
@@ -936,7 +936,7 @@ function check_paranoia_here($Setting) {
 			<tr>
 				<td class="label">Hacked:</td>
 				<td>
-					<input type="checkbox" name="SendHackedMail" id="SendHackedMail" /> <label for="SendHackedMail">Send hacked account email</label> to 
+					<input type="checkbox" name="SendHackedMail" id="SendHackedMail" /> <label for="SendHackedMail">Send hacked account email</label> to
 					<select name="HackedEmail">
 <?
 			foreach($Emails as $Email) {
@@ -1022,4 +1022,4 @@ function check_paranoia_here($Setting) {
 <? } ?>
 	</div>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/userhistory/email_history.php b/sections/userhistory/email_history.php
index c0bfe943..8f21b40a 100644
--- a/sections/userhistory/email_history.php
+++ b/sections/userhistory/email_history.php
@@ -25,7 +25,7 @@
 
 $DB->query("SELECT Username FROM users_main WHERE ID = ".$UserID);
 list($Username)= $DB->next_record();
-show_header("Email history for $Username");
+View::show_header("Email history for $Username");
 
 if ($UsersOnly == 1) {
 	$DB->query("SELECT
@@ -109,7 +109,7 @@
 			list($Enabled)=$DB->next_record();
 			$DB->set_query_id($ueQuery);
 ?>
-		<td><a href="<?=display_str($UserURL)?>"><?=format_username($UserID2, false, false, true)?></a></td>
+		<td><a href="<?=display_str($UserURL)?>"><?=Users::format_username($UserID2, false, false, true)?></a></td>
 	</tr>	
 <?
 		}
@@ -117,4 +117,4 @@
 ?>
 <? } ?>
 </table>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/userhistory/email_history2.php b/sections/userhistory/email_history2.php
index e8e7f15f..f59cd770 100644
--- a/sections/userhistory/email_history2.php
+++ b/sections/userhistory/email_history2.php
@@ -24,7 +24,7 @@
 
 $DB->query("SELECT Username FROM users_main WHERE ID = ".$UserID);
 list($Username)= $DB->next_record();
-show_header("Email history for $Username");
+View::show_header("Email history for $Username");
 
 // Get current email (and matches)
 $DB->query("
@@ -86,7 +86,7 @@
 	$UserIPs=explode('|', $CurrentEmail['UserIPs']);
 
 	foreach($UserIDs as $Key => $Val) {
-		$CurrentMatches[$Key]['Username'] = '&nbsp;&nbsp;&#187;&nbsp;'.format_username($Val, true, true, true);
+		$CurrentMatches[$Key]['Username'] = '&nbsp;&nbsp;&#187;&nbsp;'.Users::format_username($Val, true, true, true);
 		$CurrentMatches[$Key]['IP'] = $UserIPs[$Key];
 		$CurrentMatches[$Key]['EndTime'] = $UserSetTimes[$Key];
 	}
@@ -132,7 +132,7 @@
 		if ($Val['Usernames'] != '') {
 			// Match with old email
 			$OldMatches[$Key]['Email'] = $Val['Email'];
-			$OldMatches[$Key]['Username'] = '&nbsp;&nbsp;&#187;&nbsp;'.format_username($Val['UserIDs'], true, true, true);
+			$OldMatches[$Key]['Username'] = '&nbsp;&nbsp;&#187;&nbsp;'.Users::format_username($Val['UserIDs'], true, true, true);
 			$OldMatches[$Key]['EndTime'] = $Val['UserSetTimes'];
 			$OldMatches[$Key]['IP'] = $Val['UserIPs'];
 		}
@@ -176,12 +176,12 @@
 			<td><?=time_diff($Current['StartTime'])?></td>
 			<td></td>
 			<td>
-				<?=display_str($Current['CurrentIP'])?> (<?=get_cc($Current['CurrentIP'])?>) [<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Current['CurrentIP'])?>" title="Search">S</a>] [<a href="http://whatismyipaddress.com/ip/<?=display_str($Current['CurrentIP'])?>" title="WIPA">WI</a>]<br />
-				<?=get_host($Current['CurrentIP'])?>
+				<?=display_str($Current['CurrentIP'])?> (<?=Tools::get_country_code_by_ajax($Current['CurrentIP'])?>) [<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Current['CurrentIP'])?>" title="Search">S</a>] [<a href="http://whatismyipaddress.com/ip/<?=display_str($Current['CurrentIP'])?>" title="WIPA">WI</a>]<br />
+				<?=Tools::get_host_by_ajax($Current['CurrentIP'])?>
 			</td>
 			<td>
-				<?=display_str($Current['IP'])?> (<?=get_cc($Current['IP'])?>) [<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Current['IP'])?>" title="Search">S</a>] [<a href="http://whatismyipaddress.com/ip/<?=display_str($Current['IP'])?>" title="WIPA">WI</a>]<br />
-				<?=get_host($Current['IP'])?>
+				<?=display_str($Current['IP'])?> (<?=Tools::get_country_code_by_ajax($Current['IP'])?>) [<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Current['IP'])?>" title="Search">S</a>] [<a href="http://whatismyipaddress.com/ip/<?=display_str($Current['IP'])?>" title="WIPA">WI</a>]<br />
+				<?=Tools::get_host_by_ajax($Current['IP'])?>
 			</td>
 		</tr>
 <?
@@ -195,8 +195,8 @@
 			<td><?=time_diff($Match['EndTime'])?></td>
 			<td></td>
 			<td>
-				<?=display_str($Match['IP'])?> (<?=get_cc($Match['IP'])?>) [<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Match['IP'])?>" title="Search">S</a>] [<a href="http://whatismyipaddress.com/ip/<?=display_str($Match['IP'])?>" title="WIPA">WI</a>]<br />
-				<?=get_host($Match['IP'])?>
+				<?=display_str($Match['IP'])?> (<?=Tools::get_country_code_by_ajax($Match['IP'])?>) [<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Match['IP'])?>" title="Search">S</a>] [<a href="http://whatismyipaddress.com/ip/<?=display_str($Match['IP'])?>" title="WIPA">WI</a>]<br />
+				<?=Tools::get_host_by_ajax($Match['IP'])?>
 			</td>
 		</tr>			
 <? 
@@ -232,8 +232,8 @@
 			<td><?=time_diff($Match['EndTime'])?></td>
 			<td></td>
 			<td>
-				<?=display_str($Match['IP'])?> (<?=get_cc($Match['IP'])?>) [<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Match['IP'])?>" title="Search">S</a>] [<a href="http://whatismyipaddress.com/ip/<?=display_str($Match['IP'])?>" title="WIPA">WI</a>]<br />
-				<?=get_host($Match['IP'])?>
+				<?=display_str($Match['IP'])?> (<?=Tools::get_country_code_by_ajax($Match['IP'])?>) [<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Match['IP'])?>" title="Search">S</a>] [<a href="http://whatismyipaddress.com/ip/<?=display_str($Match['IP'])?>" title="WIPA">WI</a>]<br />
+				<?=Tools::get_host_by_ajax($Match['IP'])?>
 			</td>
 		</tr>	
 <?			
@@ -251,8 +251,8 @@
 			<td><?=time_diff($Record['EndTime'])?></td>
 			<td><?=time_diff($Record['ElapsedTime'])?></td>
 			<td>
-				<?=display_str($Record['IP'])?> (<?=get_cc($Record['IP'])?>) [<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Record['IP'])?>" title="Search">S</a>] [<a href="http://whatismyipaddress.com/ip/<?=display_str($Record['IP'])?>" title="WIPA">WI</a>]<br />
-				<?=get_host($Record['IP'])?>
+				<?=display_str($Record['IP'])?> (<?=Tools::get_country_code_by_ajax($Record['IP'])?>) [<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Record['IP'])?>" title="Search">S</a>] [<a href="http://whatismyipaddress.com/ip/<?=display_str($Record['IP'])?>" title="WIPA">WI</a>]<br />
+				<?=Tools::get_host_by_ajax($Record['IP'])?>
 			</td>
 		</tr>			
 <?		
@@ -290,8 +290,8 @@
 			<td><?=time_diff($Match['EndTime'])?></td>
 			<td></td>
 			<td>
-				<?=display_str($Match['IP'])?> (<?=get_cc($Match['IP'])?>) [<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Match['IP'])?>" title="Search">S</a>] [<a href="http://whatismyipaddress.com/ip/<?=display_str($Match['IP'])?>" title="WIPA">WI</a>]<br />
-				<?=get_host($Match['IP'])?>
+				<?=display_str($Match['IP'])?> (<?=Tools::get_country_code_by_ajax($Match['IP'])?>) [<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Match['IP'])?>" title="Search">S</a>] [<a href="http://whatismyipaddress.com/ip/<?=display_str($Match['IP'])?>" title="WIPA">WI</a>]<br />
+				<?=Tools::get_host_by_ajax($Match['IP'])?>
 			</td>
 		</tr>	
 <?
@@ -308,8 +308,8 @@
 			<td><?=time_diff($Invite['EndTime'])?></td>
 			<td><?=time_diff($Invite['AccountAge'])?></td>
 			<td>
-				<?=display_str($Invite['IP'])?> (<?=get_cc($Invite['IP'])?>) [<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Invite['IP'])?>" title="Search">S</a>] [<a href="http://whatismyipaddress.com/ip/<?=display_str($Invite['IP'])?>" title="WIPA">WI</a>]<br />
-				<?=get_host($Invite['IP'])?>
+				<?=display_str($Invite['IP'])?> (<?=Tools::get_country_code_by_ajax($Invite['IP'])?>) [<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Invite['IP'])?>" title="Search">S</a>] [<a href="http://whatismyipaddress.com/ip/<?=display_str($Invite['IP'])?>" title="WIPA">WI</a>]<br />
+				<?=Tools::get_host_by_ajax($Invite['IP'])?>
 			</td>
 		</tr>
 <?
@@ -321,4 +321,4 @@
 ?>		
 	</table>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/userhistory/ip_history.php b/sections/userhistory/ip_history.php
index 37082af5..b43f3990 100644
--- a/sections/userhistory/ip_history.php
+++ b/sections/userhistory/ip_history.php
@@ -29,7 +29,7 @@
 	$SearchIPQuery = " AND h1.IP = '$SearchIP' ";
 }
 
-show_header("IP history for $Username");
+View::show_header("IP history for $Username");
 ?>
 <script type="text/javascript">
 function ShowIPs(rowname) {
@@ -75,7 +75,7 @@ function UnBan(ip, id, elemID) {
  */
 </script>
 <?
-list($Page,$Limit) = page_limit(IPS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(IPS_PER_PAGE);
 
 if ($UsersOnly == 1) {
 	$RS = $DB->query("SELECT SQL_CALC_FOUND_ROWS
@@ -121,7 +121,7 @@ function UnBan(ip, id, elemID) {
 list($NumResults) = $DB->next_record();
 $DB->set_query_id($RS);
 
-$Pages=get_pages($Page,$NumResults,IPS_PER_PAGE,9);
+$Pages=Format::get_pages($Page,$NumResults,IPS_PER_PAGE,9);
 
 ?>
 <div class="thin">
@@ -181,11 +181,11 @@ function UnBan(ip, id, elemID) {
 ?>
 		<tr class="rowa">
 			<td>
-				<?=$IP?> (<?=get_cc($IP)?>)
+				<?=$IP?> (<?=Tools::get_country_code_by_ajax($IP)?>)
 <?
 	if($CanManageIPBans) {
         	if(!isset($IPs[$IP])) {
-                	$sql = "SELECT ID, FromIP, ToIP FROM ip_bans WHERE '".ip2unsigned($IP)."' BETWEEN FromIP AND ToIP LIMIT 1";
+                	$sql = "SELECT ID, FromIP, ToIP FROM ip_bans WHERE '".Tools::ip_to_unsigned($IP)."' BETWEEN FromIP AND ToIP LIMIT 1";
 			$DB->query($sql);
 			
 			if($DB->record_count() > 0) {
@@ -204,7 +204,7 @@ function UnBan(ip, id, elemID) {
 
 
 			<br />
-			<?=get_host($IP)?>
+			<?=Tools::get_host_by_ajax($IP)?>
 			<?=($HasDupe ? 
 			'<a href="#" onclick="ShowIPs('.$Index.'); return false;">('.count($UserIDs).')</a>' 
 			: '(0)')?></td>
@@ -219,7 +219,7 @@ function UnBan(ip, id, elemID) {
 		if(!$UserEndTimes[$Key]){ $UserEndTimes[$Key] = sqltime(); }
 ?>
 		<tr class="rowb<?=($HideMe ? ' hidden' : '')?>" name="<?=$Index?>">
-			<td>&nbsp;&nbsp;&#187;&nbsp;<?=format_username($Val, true, true, true)?></td>
+			<td>&nbsp;&nbsp;&#187;&nbsp;<?=Users::format_username($Val, true, true, true)?></td>
 			<td><?=time_diff($UserStartTimes[$Key])?></td>
 			<td><?=time_diff($UserEndTimes[$Key])?></td>
 			<td><?//time_diff(strtotime($UserStartTimes[$Key]), strtotime($UserEndTimes[$Key])); ?></td>
@@ -238,4 +238,4 @@ function UnBan(ip, id, elemID) {
 	</div>
 </div>
 
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/userhistory/ip_tracker_history.php b/sections/userhistory/ip_tracker_history.php
index a89b1b98..2456b79a 100644
--- a/sections/userhistory/ip_tracker_history.php
+++ b/sections/userhistory/ip_tracker_history.php
@@ -26,7 +26,7 @@
 
 $UsersOnly = $_GET['usersonly'];
 
-show_header("Tracker IP history for $Username");
+View::show_header("Tracker IP history for $Username");
 ?>
 <script type="text/javascript">
 function ShowIPs(rowname) {
@@ -34,7 +34,7 @@ function ShowIPs(rowname) {
 }
 </script>
 <?
-list($Page,$Limit) = page_limit(IPS_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(IPS_PER_PAGE);
 
 $TrackerIps = $DB->query("SELECT IP, fid, tstamp FROM xbt_snatched WHERE uid = ".$UserID." AND IP != '' ORDER BY tstamp DESC LIMIT $Limit");
 
@@ -42,7 +42,7 @@ function ShowIPs(rowname) {
 list($NumResults) = $DB->next_record();
 $DB->set_query_id($TrackerIps);
 
-$Pages=get_pages($Page,$NumResults,IPS_PER_PAGE,9);
+$Pages=Format::get_pages($Page,$NumResults,IPS_PER_PAGE,9);
 
 ?>
 <div class="thin">
@@ -63,7 +63,7 @@ function ShowIPs(rowname) {
 
 ?>
 	<tr class="rowa">
-		<td><?=$IP?> (<?=get_cc($IP)?>)<br /><?=get_host($IP)?>
+		<td><?=$IP?> (<?=Tools::get_country_code_by_ajax($IP)?>)<br /><?=Tools::get_host_by_ajax($IP)?> 
 		[<a href="http://whatismyipaddress.com/ip/<?=display_str($IP)?>" title="Search WIMIA.com">WI</a>] 
 		<td><a href="torrents.php?torrentid=<?=$TorrentID?>"><?=$TorrentID?></a></td>
 		<td><?=date("Y-m-d g:i:s", $Time)?></td>
@@ -78,5 +78,5 @@ function ShowIPs(rowname) {
 </div>
 
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/userhistory/passkey_history.php b/sections/userhistory/passkey_history.php
index 7d148d52..3fc80e6d 100644
--- a/sections/userhistory/passkey_history.php
+++ b/sections/userhistory/passkey_history.php
@@ -20,7 +20,7 @@
 	error(403);
 }
 
-show_header("PassKey history for $Username");
+View::show_header("PassKey history for $Username");
 
 $DB->query("SELECT 
 	OldPassKey, 
@@ -47,8 +47,8 @@
 		<td><?=display_str($OldPassKey)?></td>
 		<td><?=display_str($NewPassKey)?></td>
 		<td><?=time_diff($ChangeTime)?></td>
-		<td><?=display_str($ChangerIP)?> [<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($ChangerIP)?>" title="Search">S</a>]<br /><?=display_str(gethostbyip($ChangerIP))?></td>
+		<td><?=display_str($ChangerIP)?> [<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($ChangerIP)?>" title="Search">S</a>]<br /><?=display_str(Tools::get_host_by_ip($ChangerIP))?></td>
 	</tr>
 <? } ?>
 </table>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/userhistory/password_history.php b/sections/userhistory/password_history.php
index e9f6d57d..4ac22417 100644
--- a/sections/userhistory/password_history.php
+++ b/sections/userhistory/password_history.php
@@ -20,7 +20,7 @@
 	error(403);
 }
 
-show_header("Password reset history for $Username");
+View::show_header("Password reset history for $Username");
 
 $DB->query("SELECT 
 	ChangeTime,
@@ -41,8 +41,8 @@
 <? while(list($ChangeTime, $ChangerIP) = $DB->next_record()){ ?>
 	<tr class="rowa">
 		<td><?=time_diff($ChangeTime)?></td>
-		<td><?=display_str($ChangerIP)?> [<a href="/user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($ChangerIP)?>" title="Search">S</a>]<br /><?=get_host($ChangerIP)?></td>
+		<td><?=display_str($ChangerIP)?> [<a href="/user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($ChangerIP)?>" title="Search">S</a>]<br /><?=Tools::get_host_by_ajax($ChangerIP)?></td>
 	</tr>
 <? } ?>
 </table>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/userhistory/post_history.php b/sections/userhistory/post_history.php
index 08f4abe1..2654063c 100644
--- a/sections/userhistory/post_history.php
+++ b/sections/userhistory/post_history.php
@@ -1,5 +1,5 @@
 <?
-//TODO: replace 24-43 with user_info()
+//TODO: replace 24-43 with Users::user_info()
 /*
 User post history page
 */
@@ -24,7 +24,7 @@
 	$PerPage = POSTS_PER_PAGE;
 }
 
-list($Page,$Limit) = page_limit($PerPage);
+list($Page,$Limit) = Format::page_limit($PerPage);
 
 if(($UserInfo = $Cache->get_value('user_info_'.$UserID)) === FALSE) {
 	$DB->query("SELECT
@@ -50,7 +50,7 @@
 	$Avatar = 'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&i='.urlencode($Avatar);
 }
 
-show_header('Post history for '.$Username,'subscriptions,comments,bbcode');
+View::show_header('Post history for '.$Username,'subscriptions,comments,bbcode');
 
 if($LoggedUser['CustomForums']) {
 	unset($LoggedUser['CustomForums']['']);
@@ -246,7 +246,7 @@
 ?>
 	<div class="linkbox">
 <?
-	$Pages=get_pages($Page,$Results,$PerPage, 11);
+	$Pages=Format::get_pages($Page,$Results,$PerPage, 11);
 	echo $Pages;
 ?>
 	</div>
@@ -258,7 +258,7 @@
 			<td  colspan="2">
 				<span style="float:left;">
 					<?=time_diff($AddedTime) ?>
-					in <a href="forums.php?action=viewthread&amp;threadid=<?=$TopicID?>&amp;postid=<?=$PostID?>#post<?=$PostID?>" title="<?=display_str($ThreadTitle)?>"><?=cut_string($ThreadTitle, 75)?></a>
+					in <a href="forums.php?action=viewthread&amp;threadid=<?=$TopicID?>&amp;postid=<?=$PostID?>#post<?=$PostID?>" title="<?=display_str($ThreadTitle)?>"><?=Format::cut_string($ThreadTitle, 75)?></a>
 <?
 		if($ViewingOwn) {
 			if ((!$Locked  || $Sticky) && (!$LastRead || $LastRead < $LastPostID)) { ?> 
@@ -315,7 +315,7 @@
 					<a href="#content<?=$PostID?>" onclick="LoadEdit(<?=$PostID?>, 1)">&laquo;</a>
 <? 				} ?>		   
 					Last edited by
-					<?=format_username($EditedUserID, false, false, false) ?> <?=time_diff($EditedTime,2,true,true)?>
+					<?=Users::format_username($EditedUserID, false, false, false) ?> <?=time_diff($EditedTime,2,true,true)?>
 <?			} ?>		
 				</div>
 			</td>
@@ -332,6 +332,6 @@
 </div>
 <?
 
-show_footer();
+View::show_footer();
 
 ?>
diff --git a/sections/userhistory/subscribed_collages.php b/sections/userhistory/subscribed_collages.php
index 7ccf02e1..144d14df 100644
--- a/sections/userhistory/subscribed_collages.php
+++ b/sections/userhistory/subscribed_collages.php
@@ -7,7 +7,7 @@
 include(SERVER_ROOT.'/classes/class_text.php'); // Text formatting class
 $Text = new TEXT;
 
-show_header('Subscribed collages','browse,collage');
+View::show_header('Subscribed collages','browse,collage');
 
 $ShowAll = !empty($_GET['showall']);
 
@@ -86,23 +86,23 @@
 					ORDER BY ct.AddedOn");
 		$NewTorrentCount = $DB->record_count();
 		//$NewTorrents = $DB->to_array();
-		//$Artists = get_artists($GroupID);
+		//$Artists = Artists::get_artists($GroupID);
 		
 		$GroupIDs = $DB->collect('GroupID');
 		$CollageDataList=$DB->to_array('GroupID', MYSQLI_ASSOC);
 		if(count($GroupIDs)>0) {
-			$TorrentList = get_groups($GroupIDs);
+			$TorrentList = Torrents::get_groups($GroupIDs);
 			$TorrentList = $TorrentList['matches'];
 		} else {
 			$TorrentList = array();
 		}
 		
-		$Artists = get_artists($GroupIDs);
+		$Artists = Artists::get_artists($GroupIDs);
 		$Number = 0;
 		
 	//	foreach ($NewTorrents as $TorrentGroup) {
 	//		list($GroupID, $GroupName, $GroupYear, $ReleaseType, $RecordLabel, $CatalogueNumber, $WikiImage) = $TorrentGroup;
-	//		$DisplayName = display_artists($Artists[$GroupID]);
+	//		$DisplayName = Artists::display_artists($Artists[$GroupID]);
 	//		$AltName=$GroupName;
 		foreach ($TorrentList as $GroupID => $Group) {
 			list($GroupID, $GroupName, $GroupYear, $GroupRecordLabel, $GroupCatalogueNumber, $TagList, $ReleaseType, $GroupVanityHouse, $Torrents, $GroupArtists, $ExtendedArtists) = array_values($Group);
@@ -128,9 +128,9 @@
 			if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
 				unset($ExtendedArtists[2]);
 				unset($ExtendedArtists[3]);
-				$DisplayName .= display_artists($ExtendedArtists);
+				$DisplayName .= Artists::display_artists($ExtendedArtists);
 			} elseif(count($GroupArtists)>0) {
-				$DisplayName .= display_artists(array('1'=>$GroupArtists));
+				$DisplayName .= Artists::display_artists(array('1'=>$GroupArtists));
 			}
 			$DisplayName .= '<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
 			if($GroupYear>0) { $DisplayName = $DisplayName. ' ['. $GroupYear .']';}
@@ -226,9 +226,9 @@
 			<span>
 				[ <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>" title="Download">DL</a> ]
 			</span>
-			&nbsp;&nbsp;&raquo;&nbsp; <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=torrent_info($Torrent)?></a>
+			&nbsp;&nbsp;&raquo;&nbsp; <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=Torrents::torrent_info($Torrent)?></a>
 		</td>
-		<td class="nobr"><?=get_size($Torrent['Size'])?></td>
+		<td class="nobr"><?=Format::get_size($Torrent['Size'])?></td>
 		<td><?=number_format($Torrent['Snatched'])?></td>
 		<td<?=($Torrent['Seeders']==0)?' class="r00"':''?>><?=number_format($Torrent['Seeders'])?></td>
 		<td><?=number_format($Torrent['Leechers'])?></td>
@@ -260,7 +260,7 @@
 			<strong><?=$DisplayName?></strong>
 			<?=$TorrentTags?>
 		</td>
-		<td class="nobr"><?=get_size($Torrent['Size'])?></td>
+		<td class="nobr"><?=Format::get_size($Torrent['Size'])?></td>
 		<td><?=number_format($Torrent['Snatched'])?></td>
 		<td<?=($Torrent['Seeders']==0)?' class="r00"':''?>><?=number_format($Torrent['Seeders'])?></td>
 		<td><?=number_format($Torrent['Leechers'])?></td>
@@ -304,6 +304,6 @@
 </div>
 <?
 
-show_footer();
+View::show_footer();
 
 ?>
diff --git a/sections/userhistory/subscriptions.php b/sections/userhistory/subscriptions.php
index 4d9ba036..0b0c7667 100644
--- a/sections/userhistory/subscriptions.php
+++ b/sections/userhistory/subscriptions.php
@@ -15,9 +15,9 @@
 } else {
 	$PerPage = POSTS_PER_PAGE;
 }
-list($Page,$Limit) = page_limit($PerPage);
+list($Page,$Limit) = Format::page_limit($PerPage);
 
-show_header('Subscribed topics','subscriptions,bbcode');
+View::show_header('Subscribed topics','subscriptions,bbcode');
 
 if($LoggedUser['CustomForums']) {
 	unset($LoggedUser['CustomForums']['']);
@@ -131,7 +131,7 @@
 ?>
 	<div class="linkbox">
 <?
-	$Pages=get_pages($Page,$NumResults,$PerPage, 11);
+	$Pages=Format::get_pages($Page,$NumResults,$PerPage, 11);
 	echo $Pages;
 ?>
 	</div>
@@ -143,7 +143,7 @@
 			<td colspan="2">
 				<span style="float:left;">
 					<a href="forums.php?action=viewforum&amp;forumid=<?=$ForumID?>"><?=$ForumName?></a> &gt;
-					<a href="forums.php?action=viewthread&amp;threadid=<?=$TopicID?>" title="<?=display_str($ThreadTitle)?>"><?=cut_string($ThreadTitle, 75)?></a>
+					<a href="forums.php?action=viewthread&amp;threadid=<?=$TopicID?>" title="<?=display_str($ThreadTitle)?>"><?=Format::cut_string($ThreadTitle, 75)?></a>
 		<? if($PostID<$LastPostID && !$Locked) { ?>
 					<span class="new">(New!)</span>
 		<? } ?>
@@ -176,7 +176,7 @@
 		<? if($EditedUserID) { ?>
 					<br /><br />
 					Last edited by
-					<?=format_username($EditedUserID, false, false, false) ?> <?=time_diff($EditedTime)?>
+					<?=Users::format_username($EditedUserID, false, false, false) ?> <?=time_diff($EditedTime)?>
 		<? } ?>
 				</div>
 			</td>
@@ -190,6 +190,6 @@
 </div>
 <?
 
-show_footer();
+View::show_footer();
 
 ?>
diff --git a/sections/userhistory/token_history.php b/sections/userhistory/token_history.php
index ead9fb62..f06f95fb 100644
--- a/sections/userhistory/token_history.php
+++ b/sections/userhistory/token_history.php
@@ -15,8 +15,8 @@
 }
 if (!is_number($UserID)) { error(404); }
 
-$UserInfo = user_info($UserID);
-$Perms = get_permissions($UserInfo['PermissionID']);
+$UserInfo = Users::user_info($UserID);
+$Perms = Permissions::get_permissions($UserInfo['PermissionID']);
 $UserClass = $Perms['Class'];
 
 if(!check_perms('users_mod')) {
@@ -35,14 +35,14 @@
 	if (list($InfoHash) = $DB->next_record(MYSQLI_NUM, FALSE)) {
 		$DB->query("UPDATE users_freeleeches SET Expired=TRUE WHERE UserID=$UserID AND TorrentID=$TorrentID");
 		$Cache->delete_value('users_tokens_'.$UserID);
-		update_tracker('remove_token', array('info_hash' => rawurlencode($InfoHash), 'userid' => $UserID));
+		Tracker::update_tracker('remove_token', array('info_hash' => rawurlencode($InfoHash), 'userid' => $UserID));
 	}
 	header("Location: userhistory.php?action=token_history&userid=$UserID");
 }
 
-show_header('Freeleech token history');
+View::show_header('Freeleech token history');
 
-list($Page,$Limit) = page_limit(25);
+list($Page,$Limit) = Format::page_limit(25);
 
 $DB->query("SELECT SQL_CALC_FOUND_ROWS
 			   f.TorrentID,
@@ -64,11 +64,11 @@
 
 $DB->query("SELECT FOUND_ROWS()");
 list($NumResults) = $DB->next_record();
-$Pages=get_pages($Page, $NumResults, 25);
+$Pages=Format::get_pages($Page, $NumResults, 25);
 
 ?>
 <div class="header">
-	<h2>Freeleech token history for <?=format_username($UserID, true, true, true)?></h2>
+	<h2>Freeleech token history for <?=Users::format_username($UserID, true, true, true)?></h2>
 </div>
 <div class="linkbox"><?=$Pages?></div>
 <table>
@@ -85,14 +85,14 @@
 foreach ($Tokens as $Token) {
 	$GroupIDs[] = $Token['GroupID'];
 }
-$Artists = get_artists($GroupIDs);
+$Artists = Artists::get_artists($GroupIDs);
 
 $i = true;
 foreach ($Tokens as $Token) {
 	$i = !$i;
 	list($TorrentID, $GroupID, $Time, $Expired, $Downloaded, $Uses, $Name, $Format, $Encoding) = $Token; 
 	$Name = "<a href=\"torrents.php?torrentid=$TorrentID\">$Name</a>";
-	$ArtistName = display_artists($Artists[$GroupID]);
+	$ArtistName = Artists::display_artists($Artists[$GroupID]);
 	if($ArtistName) {
 		$Name = $ArtistName.$Name;
 	}
@@ -106,7 +106,7 @@
 		<td><?=($Expired ? 'Yes' : 'No')?><?=(check_perms('users_mod') && !$Expired)?" <a href=\"userhistory.php?action=token_history&amp;expire=1&amp;userid=$UserID&amp;torrentid=$TorrentID\">(expire)</a>":''?>
 		</td>
 <?	if (check_perms('users_mod')) { ?>
-		<td><?=get_size($Downloaded)?></td>
+		<td><?=Format::get_size($Downloaded)?></td>
 		<td><?=$Uses?></td>
 <?	} ?>
 	</tr>
@@ -115,5 +115,5 @@
 </table>
 <div class="linkbox"><?=$Pages?></div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/wiki/aliases.php b/sections/wiki/aliases.php
index 74d825a9..e9c37e76 100644
--- a/sections/wiki/aliases.php
+++ b/sections/wiki/aliases.php
@@ -6,7 +6,7 @@
 list($Revision, $Title, $Body, $Read, $Edit, $Date, $AuthorID, $AuthorName) = array_shift($Latest);
 if($Edit > $LoggedUser['EffectiveClass']){ error(404); }
 
-show_header($Title." Aliases");
+View::show_header($Title." Aliases");
 ?>
 <div class="thin">
 	<div class="header">
@@ -57,4 +57,4 @@
 		</table>
 	</form>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/wiki/article.php b/sections/wiki/article.php
index 3333f343..29added1 100644
--- a/sections/wiki/article.php
+++ b/sections/wiki/article.php
@@ -12,7 +12,7 @@
 }
 
 if(!$ArticleID) { //No article found
-	show_header('No article found');
+	View::show_header('No article found');
 ?>
 <div class="thin">
 	<div class="header">
@@ -28,14 +28,14 @@
 	</div>
 </div>
 <?
-	show_footer();
+	View::show_footer();
 	die();
 }
 $Article = $Alias->article($ArticleID);
 list($Revision, $Title, $Body, $Read, $Edit, $Date, $AuthorID, $AuthorName, $Aliases, $UserIDs) = array_shift($Article);
 if($Read > $LoggedUser['EffectiveClass']){ error('You must be a higher user class to view this wiki article'); }
 
-show_header($Title,'wiki,bbcode');
+View::show_header($Title,'wiki,bbcode');
 ?>
 <div class="thin">
 	<div class="header">
@@ -85,7 +85,7 @@
 					<strong>Details:</strong>
 					<ul>
 						<li>Version: r<?=$Revision?></li>
-						<li>Last edited by: <?=format_username($AuthorID, false, false, false)?></li>
+						<li>Last edited by: <?=Users::format_username($AuthorID, false, false, false)?></li>
 						<li>Last updated: <?=time_diff($Date)?></li>
 					</ul>
 				</li>
@@ -98,7 +98,7 @@
 		$i = 0;
 		foreach($AliasArray as $AliasItem){
 ?>
-						<li id="alias_<?=$AliasItem?>"><a href="wiki.php?action=article&amp;name=<?=$AliasItem?>"><?=cut_string($AliasItem,20,1)?></a><? if(check_perms('admin_manage_wiki')){ ?> <a href="#" onclick="Remove_Alias('<?=$AliasItem?>');return false;" title="Delete Alias">[X]</a> <a href="user.php?id=<?=$UserArray[$i]?>" title="View User">[U]</a><? } ?></li>
+						<li id="alias_<?=$AliasItem?>"><a href="wiki.php?action=article&amp;name=<?=$AliasItem?>"><?=Format::cut_string($AliasItem,20,1)?></a><? if(check_perms('admin_manage_wiki')){ ?> <a href="#" onclick="Remove_Alias('<?=$AliasItem?>');return false;" title="Delete Alias">[X]</a> <a href="user.php?id=<?=$UserArray[$i]?>" title="View User">[U]</a><? } ?></li>
 <?			$i++;
 		} 
 	}
@@ -131,4 +131,4 @@
 	</div>
 	</div>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/wiki/compare.php b/sections/wiki/compare.php
index eebb6907..b3ba23ed 100644
--- a/sections/wiki/compare.php
+++ b/sections/wiki/compare.php
@@ -79,7 +79,7 @@ function get_body($ID, $Rev) {
 list($Revision, $Title, $Body, $Read, $Edit, $Date, $AuthorID, $AuthorName) = array_shift($Article);
 if($Read > $LoggedUser['EffectiveClass']){ error(404); }
 
-show_header('Compare Article Revisions');
+View::show_header('Compare Article Revisions');
 $Diff2 = get_body($ArticleID, $_GET['new']);
 $Diff1 = get_body($ArticleID, $_GET['old']);
 ?>
@@ -92,5 +92,5 @@ function get_body($ID, $Rev) {
 	</div>
 </div>
 <?
-show_footer();
+View::show_footer();
 ?>
diff --git a/sections/wiki/create.php b/sections/wiki/create.php
index 867f32aa..6771bfd0 100644
--- a/sections/wiki/create.php
+++ b/sections/wiki/create.php
@@ -1,5 +1,5 @@
 <?
-show_header('Create an article');
+View::show_header('Create an article');
 ?>
 <div class="thin">
 	<div class="box pad">
@@ -31,4 +31,4 @@
 		</form>
 	</div>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/wiki/delete.php b/sections/wiki/delete.php
index 656ea2fd..a8088da9 100644
--- a/sections/wiki/delete.php
+++ b/sections/wiki/delete.php
@@ -12,7 +12,7 @@
 
 list($Title) = $DB->next_record(MYSQLI_NUM, false);
 //Log
-write_log("Wiki article ".$ID." (".$Title.") was deleted by ".$LoggedUser['Username']);
+Misc::write_log("Wiki article ".$ID." (".$Title.") was deleted by ".$LoggedUser['Username']);
 //Delete
 $DB->query("DELETE FROM wiki_articles WHERE ID = $ID");
 $DB->query("DELETE FROM wiki_aliases WHERE ArticleID = $ID");
diff --git a/sections/wiki/edit.php b/sections/wiki/edit.php
index b237559e..ec490e14 100644
--- a/sections/wiki/edit.php
+++ b/sections/wiki/edit.php
@@ -8,7 +8,7 @@
 	error('You do not have access to edit this article.');
 }
 
-show_header('Edit '.$Title);
+View::show_header('Edit '.$Title);
 ?>
 <div class="thin">
 	<div class="box pad">
@@ -35,4 +35,4 @@
 		</form>
 	</div>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/wiki/index.php b/sections/wiki/index.php
index 121cd7e4..63ef3fbf 100644
--- a/sections/wiki/index.php
+++ b/sections/wiki/index.php
@@ -18,7 +18,7 @@ function class_list($Selected=0){
 			if($Selected == $Class['Level']){
 				$Return.=' selected="selected"';
 			}
-			$Return.='>'.cut_string($Class['Name'], 20, 1).'</option>'."\n";
+			$Return.='>'.Format::cut_string($Class['Name'], 20, 1).'</option>'."\n";
 		}
 	}
 	reset($Classes);
diff --git a/sections/wiki/link.php b/sections/wiki/link.php
index 984ab1c3..367b6ba1 100644
--- a/sections/wiki/link.php
+++ b/sections/wiki/link.php
@@ -1,5 +1,5 @@
 <?
-show_header('Link an article');
+View::show_header('Link an article');
 ?>
 <div class="thin">
 	<div class="box pad">
@@ -15,4 +15,4 @@
 		</form>
 	</div>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/wiki/revisions.php b/sections/wiki/revisions.php
index ee40cc37..38385c45 100644
--- a/sections/wiki/revisions.php
+++ b/sections/wiki/revisions.php
@@ -7,7 +7,7 @@
 if($Read > $LoggedUser['EffectiveClass']){ error(404); }
 if($Edit > $LoggedUser['EffectiveClass']){ error(403); }
 
-show_header("Revisions of ".$Title);
+View::show_header("Revisions of ".$Title);
 ?>
 <div class="thin">
 	<div class="header">
@@ -28,7 +28,7 @@
 			<tr>
 				<td><?=$Revision?></td>
 				<td><?=$Title?></td>
-				<td><?=format_username($AuthorID, false, false, false)?></td>
+				<td><?=Users::format_username($AuthorID, false, false, false)?></td>
 				<td><?=time_diff($Date)?></td>
 				<td><input type="radio" name="old" value="<?=$Revision?>" disabled /></td>
 				<td><input type="radio" name="new" value="<?=$Revision?>" /></td>
@@ -46,7 +46,7 @@
 			<tr>
 				<td><?=$Revision?></td>
 				<td><?=$Title?></td>
-				<td><?=format_username($AuthorID, false, false, false)?></td>
+				<td><?=Users::format_username($AuthorID, false, false, false)?></td>
 				<td><?=time_diff($Date)?></td>
 				<td><input type="radio" name="old" value="<?=$Revision?>" /></td>
 				<td><input type="radio" name="new" value="<?=$Revision?>" /></td>
@@ -60,4 +60,4 @@
 		</table>
 	</form>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/wiki/search.php b/sections/wiki/search.php
index 233bb9f4..47c490de 100644
--- a/sections/wiki/search.php
+++ b/sections/wiki/search.php
@@ -7,7 +7,7 @@
 }
 
 define('ARTICLES_PER_PAGE', 25);
-list($Page,$Limit) = page_limit(ARTICLES_PER_PAGE);
+list($Page,$Limit) = Format::page_limit(ARTICLES_PER_PAGE);
 
 $OrderVals = array('Title', 'Created', 'Edited');
 $WayVals = array('Ascending', 'Descending');
@@ -50,7 +50,7 @@
 $DB->query("SELECT FOUND_ROWS()");
 list($NumResults) = $DB->next_record();
 
-show_header('Search articles');
+View::show_header('Search articles');
 $DB->set_query_id($RS);
 ?>
 <div class="thin">
@@ -105,7 +105,7 @@
 	<br />
 	<div class="linkbox">
 <?
-$Pages=get_pages($Page,$NumResults,ARTICLES_PER_PAGE);
+$Pages=Format::get_pages($Page,$NumResults,ARTICLES_PER_PAGE);
 echo $Pages;
 ?>
 	</div>
@@ -119,10 +119,10 @@
 	<tr>
 		<td><a href="wiki.php?action=article&amp;id=<?=$ID?>"><?=$Title?></a></td>
 		<td><?=$Date?></td>
-		<td><?=format_username($UserID, false, false, false)?></td>
+		<td><?=Users::format_username($UserID, false, false, false)?></td>
 	</tr>
 <? } ?>
 </table>
 	<div class="linkbox"><?=$Pages?></div>
 </div>
-<? show_footer(); ?>
+<? View::show_footer(); ?>
diff --git a/sections/wiki/splash.php b/sections/wiki/splash.php
index 0a4d2e2d..e8193343 100644
--- a/sections/wiki/splash.php
+++ b/sections/wiki/splash.php
@@ -1,4 +1,4 @@
-<?show_header('Wiki');?>
+<?View::show_header('Wiki');?>
 <div class="thin">
 	<div class="header">
 		<h2>Wiki</h2>
@@ -42,4 +42,4 @@
 		</span>
 	</div>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file
diff --git a/sections/wiki/takecreate.php b/sections/wiki/takecreate.php
index d3dd9319..a929d024 100644
--- a/sections/wiki/takecreate.php
+++ b/sections/wiki/takecreate.php
@@ -53,7 +53,7 @@
 
 $Alias->flush();
 
-write_log("Wiki article ".$ArticleID." (".$_POST['title'].") was created by ".$LoggedUser['Username']);
+Misc::write_log("Wiki article ".$ArticleID." (".$_POST['title'].") was created by ".$LoggedUser['Username']);
 
 header('Location: wiki.php?action=article&id='.$ArticleID);
 
diff --git a/sections/wiki/wiki_browse.php b/sections/wiki/wiki_browse.php
index ee37ab1d..b4d23fd7 100644
--- a/sections/wiki/wiki_browse.php
+++ b/sections/wiki/wiki_browse.php
@@ -7,7 +7,7 @@
 	}
 }
 
-show_header($Title);
+View::show_header($Title);
 
 $sql = "SELECT SQL_CALC_FOUND_ROWS 
 	w.ID, 
@@ -41,7 +41,7 @@
 		<tr>
 			<td><a href="wiki.php?action=article&amp;id=<?=$ID?>"><?=$Title?></a></td>
 			<td><?=$Date?></td>
-			<td><?=format_username($UserID, false, false, false)?></td>
+			<td><?=Users::format_username($UserID, false, false, false)?></td>
 		</tr>
 <? 	} ?>
 	</table>
@@ -87,4 +87,4 @@
 		</span>
 	</div>
 </div>
-<? show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
\ No newline at end of file