diff --git a/public/css/style.less b/public/css/style.less
index 0850e2b562..13c2f43c56 100644
--- a/public/css/style.less
+++ b/public/css/style.less
@@ -260,3 +260,16 @@ footer.footer {
 		}
 	}
 }
+
+
+#thread_active_users {
+	float: right;
+	color: rgb(153,153,153);
+
+}
+
+#thread_active_users strong {
+	color: rgb(100,100,100);
+	font-weight: 600;
+	cursor: pointer;
+}
\ No newline at end of file
diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 90f13142fa..c4aea9a599 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -26,10 +26,7 @@ var ajaxify = {};
 
 	ajaxify.go = function(url, callback) {
 		// leave room and join global
-		if (current_room != 'global') {
-			socket.emit('event:enter_room', 'global');
-			current_room = 'global';
-		}
+		app.enter_room('global');
 
 		var url = url.replace(/\/$/, "");
 		var tpl_url = (url === '' || url === '/') ? 'home' : url.split('/')[0];
@@ -37,19 +34,22 @@ var ajaxify = {};
 		if (templates[tpl_url]) {
 			window.history.pushState({}, url, "/" + url);
 
-			jQuery('#content, #footer').fadeOut(100);
-			
-			load_template(function() {
-				exec_body_scripts(content);
-
-				ajaxify.enable();
-				if (callback) {
-					callback();
-				}
-				
-				jQuery('#content, #footer').fadeIn(200);
+			jQuery('#footer').fadeOut(100);
+			jQuery('#content').fadeOut(100, function() {
+				load_template(function() {
+
+					exec_body_scripts(content);
+
+					ajaxify.enable();
+					if (callback) {
+						callback();
+					}
+					
+					jQuery('#content, #footer').fadeIn(250);
+				});
 			});
 			
+			
 			return true;
 		}
 
@@ -62,7 +62,6 @@ var ajaxify = {};
 
 	ajaxify.onclick = function(ev) {
 		if (this.href == window.location.href + "#") return;
-		console.log(this.href);
 		var url = this.href.replace(rootUrl +'/', '');
 
 		if (ajaxify.go(url)) {
diff --git a/public/src/app.js b/public/src/app.js
index 68f4894a43..90d8c8fbc2 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -1,7 +1,6 @@
 var socket,
 	config,
 	app = {},
-	current_room,
 	API_URL = null;
 
 // todo: cleanup,etc
@@ -172,11 +171,21 @@ var socket,
 		jQuery(post_window).slideToggle(250);
 	};
 
+
+	app.current_room = null; 
+	app.enter_room = function(room) {
+		if (app.current_room === room) return;
+
+		socket.emit('event:enter_room', {
+			'enter': room,
+			'leave': app.current_room
+		});
+
+		app.current_room = room;
+	};
+
 	jQuery('document').ready(function() {
-		if (current_room != 'global') {
-			socket.emit('event:enter_room', 'global');
-			current_room = 'global';
-		}
+		app.enter_room('global');
 
 
 		// On menu click, change "active" state
diff --git a/public/src/templates.js b/public/src/templates.js
index 8ab24d7fc9..ee900c66c5 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -49,7 +49,7 @@ var templates = {};
 
 	function init() {
 		loadTemplates([
-			'header', 'footer', 'register', 'home', 'topic',
+			'header', 'footer', 'register', 'home', 'topic','account',
 			'login', 'reset', 'reset_code', 'account',
 			'confirm',
 			'emails/reset', 'emails/reset_plaintext', 'emails/email_confirm', 'emails/email_confirm_plaintext'
diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index faee1a8f33..2b1ce5b327 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -18,6 +18,10 @@
 	<span>Member for </span>
 	<span id="membersince">{user.joindate}</span>
 	<br/>
+	
+	<span>Reputation </span>
+	<span id="membersince">{user.reputation}</span>
+	<br/>
 
 
 	<!-- END user -->
diff --git a/public/templates/footer.tpl b/public/templates/footer.tpl
index f3719254f7..e6ca609cf3 100644
--- a/public/templates/footer.tpl
+++ b/public/templates/footer.tpl
@@ -43,8 +43,11 @@
 		socket.on('api:user.active.get_record', function(data) {
 			active_record.innerHTML = "most users ever online was <strong>" + data.record + "</strong> on <strong>" + (new Date(parseInt(data.timestamp,10))).toUTCString() + "</strong>";
 		});
-		socket.emit('api:user.get', { fields: ['username', 'picture'] });
-		socket.once('api:user.get', function(data) {
+
+		socket.emit('api:updateHeader', { fields: ['username', 'picture'] });
+
+		socket.once('api:updateHeader', function(data) {
+			
 			if (data.uid > 0) {
 				var	gravatar = document.createElement('img'),
 					name = document.createElement('span')
@@ -53,7 +56,7 @@
 				logoutEl.innerHTML = '<a href="/logout">Log out</a>';
 
 				name.innerHTML = data['username'];
-				gravatar.src = data['picture'];
+				gravatar.src = data['picture']+"?s=24";
 
 				user_label.innerHTML = '';
 				user_label.appendChild(gravatar);
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index 5bd8dc23f8..29628a6641 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -2,9 +2,8 @@
 	<ul class="breadcrumb">
 		<li><a href="/">Home</a> <span class="divider">/</span></li>
 		<li class="active">{topic_name}</li>
+		<div id="thread_active_users"></div>
 	</ul>
-
-	<small>psychobunny, null, and 2 guests are browsing this thread</small><br />
 </div>
 
 <ul id="post-container" class="post-container container">
@@ -38,15 +37,35 @@
 
 
 <script type="text/javascript">
+
 jQuery('document').ready(function() {
-	// join room for this thread - DRY failure, see ajaxify and app.js
-	socket.emit('event:enter_room', 'topic_' + '{topic_id}');
-	current_room = 'topic_' + '{topic_id}';
+	var room = 'topic_' + '{topic_id}';
+	app.enter_room(room);
 	set_up_posts();
 });
 
 
-ajaxify.register_events(['event:rep_up', 'event:rep_down', 'event:new_post']);
+ajaxify.register_events(['event:rep_up', 'event:rep_down', 'event:new_post', 'api:get_users_in_room']);
+socket.on('api:get_users_in_room', function(users) {
+	var anonymous = users.anonymous,
+		usernames = users.usernames,
+		usercount = usernames.length;
+
+	for (var i = 0, ii=usercount; i<ii; i++) {
+		usernames[i] = '<strong>' + usernames[i] + '</strong>';
+	}
+
+	// headexplosion.gif for fun, to see if I could do this in one line of code. feel free to refactor haha
+	var active =
+		((usercount === 1) ? usernames[0] : '')
+		+ ((usercount === 2 && anonymous === 0) ? usernames[0] + ' and ' + usernames[1] : '')
+		+ ((usercount > 2 && anonymous === 0) ? usernames.join(', ').replace(/,([^,]*)$/, ", and$1") : '')
+		+ (usercount > 1 && anonymous > 0 ? usernames.join(', ') : '')
+		+ ((anonymous > 0) ? (usercount > 0 ? ' and ': '') + anonymous + ' guest' + (anonymous.length > 1  ? 's are': ' is') : '')
+		+ (anonymous === 0 ? (usercount > 1 ? ' are' : ' is') : '') + ' browsing this thread';
+
+	document.getElementById('thread_active_users').innerHTML = active;
+});
 
 socket.on('event:rep_up', function(data) {
 	adjust_rep(1, data.pid, data.uid);
@@ -56,6 +75,7 @@ socket.on('event:rep_down', function(data) {
 	adjust_rep(-1, data.pid, data.uid);
 });
 
+
 socket.on('event:new_post', function(data) {
 	var html = templates.prepare(templates['topic'].blocks['posts']).parse(data),
 		uniqueid = new Date().getTime();
@@ -64,6 +84,8 @@ socket.on('event:new_post', function(data) {
 	set_up_posts(uniqueid);
 });
 
+
+
 function adjust_rep(value, pid, uid) {
 	var post_rep = jQuery('.post_rep_' + pid),
 		user_rep = jQuery('.user_rep_' + uid);
@@ -109,11 +131,11 @@ function set_up_posts(div) {
 		
 		if (this.children[1].className == 'icon-star-empty') {
 			this.children[1].className = 'icon-star';
-			socket.emit('api:posts.favourite', {pid: pid, room_id: current_room});
+			socket.emit('api:posts.favourite', {pid: pid, room_id: app.current_room});
 		}
 		else {
 			this.children[1].className = 'icon-star-empty';
-			socket.emit('api:posts.unfavourite', {pid: pid, room_id: current_room});
+			socket.emit('api:posts.unfavourite', {pid: pid, room_id: app.current_room});
 		}
 	});
 }
diff --git a/src/posts.js b/src/posts.js
index d15d9c15d5..d4f6ccf64f 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -150,8 +150,8 @@ var	RDB = require('./redis.js'),
 				timeout: 2000
 			});
 
-			user.get_user_postdetails([uid], function(user_details) {
-				user.get_gravatars_by_uids([uid], '', function(gravatars) {
+			user.get_user_postdetails(uid, function(user_details) {
+				user.get_gravatars_by_uids(uid, '', function(gravatars) {
 					var timestamp = new Date().getTime();
 
 					socket.in('topic_' + tid).emit('event:new_post', {
@@ -201,7 +201,9 @@ var	RDB = require('./redis.js'),
 			Posts.hasFavourited(pid, uid, function(hasFavourited) {
 				if (hasFavourited == false) {
 					RDB.sadd('pid:' + pid + ':users_favourited', uid);
-					RDB.incr('uid:' + uid_of_poster + ':rep');
+
+					RDB.db.hincrby(String(uid_of_poster), 'reputation', 1);
+					
 					RDB.incr('pid:' + pid + ':rep');
 
 					if (room_id) {
@@ -217,7 +219,7 @@ var	RDB = require('./redis.js'),
 			Posts.hasFavourited(pid, uid, function(hasFavourited) {
 				if (hasFavourited == true) {
 					RDB.srem('pid:' + pid + ':users_favourited', uid);
-					RDB.decr('uid:' + uid_of_poster + ':rep');
+					RDB.db.hincrby(String(uid_of_poster), 'reputation', -1);
 					RDB.decr('pid:' + pid + ':rep');
 
 					if (room_id) {
diff --git a/src/redis.js b/src/redis.js
index eb1891fc13..140e2e11d6 100644
--- a/src/redis.js
+++ b/src/redis.js
@@ -6,6 +6,8 @@
 		config = require('../config.js'),
 		db = redis.createClient(config.redis.port, config.redis.host, config.redis.options);
 
+	RedisDB.db = db;
+
 	// todo (holy cow): append,auth,bgrewriteaof,bgsave,bitcount,bitop,blpop,brpop,brpoplpush,client kill,client list,client getname,client setname,config get,config set,config resetstat,dbsize,debug object,debug segfault,decrby,discard,dump,echo,eval,evalsha,exec,exists,expireat,flushall,flushdb,getbit,getrange,getset,hdel,hexists,hget,hgetall,hincrby,hincrbyfloat,hkeys,hlen,hmget,hmset,hset,hsetnx,hvals,incrby,incrbyfloat,info,lastsave,lindex,linsert,llen,lpop,lpushx,lrem,lset,ltrim,migrate,monitor,move,mset,msetnx,object,persist,pexpire,pexpireat,ping,psetex,psubscribe,pttl,publish,punsubscribe,quit,randomkey,rename,renamenx,restore,rpop,rpoplpush,rpush,rpushx,sadd,save,scard,script exists,script flush,script kill,script load,sdiff,sdiffstore,select,setbit,setex,setnx,setrange,shutdown,sinter,sinterstore,sismember,slaveof,slowlog,smembers,smove,sort,spop,srandmember,srem,strlen,subscribe,sunion,sunionstore,sync,time,ttl,type,unsubscribe,unwatch,watch,zadd,zcard,zcount,zincrby,zinterstore,zrange,zrangebyscore,zrank,zrem,zremrangebyrank,zremrangebyscore,zrevrange,zrevrangebyscore,zrevrank,zscore,zunionstore
 	// done: get, set, incr, decr, del, mget, multi, expire, lpush, lrange, keys
 
diff --git a/src/user.js b/src/user.js
index fd979933ae..750c88c242 100644
--- a/src/user.js
+++ b/src/user.js
@@ -8,137 +8,67 @@ var	config = require('../config.js'),
 
 (function(User) {
 
-	User.get = function(socket, uid, fields) {
-		if (uid > 0) {
-			var	keys = [],
-				returnData = {
-					uid: uid
-				},
-				removeEmail = false;
-
-			if (!(fields instanceof Array)) 
-				fields = ['username', 'email', 'joindate'];
-
-			if (fields.indexOf('picture') !== -1 && fields.indexOf('email') === -1) {
-				fields.push('email');
-				removeEmail = true;
-			}
 
-			for(var f = 0, numFields = fields.length; f<numFields; f++) {
-				keys.push('uid:' + uid + ':' + fields[f]);
-			}
-
-			RDB.mget(keys, function(data) {
-				for(var x=0,numData=data.length;x<numData;x++) {
-					returnData[fields[x]] = data[x];
-				}
+	User.getUserField = function(uid, field, callback) {
+		RDB.db.hget(String(uid), field, function(err, data){
+			if(err === null)
+				callback(data);
+			else
+				console.log(err);
+		});
+	}
+	
+	User.getUserFields = function(uid, fields, callback) {
+		RDB.db.hmget(String(uid), fields, function(err, data){
+			if(err === null) {
+				var returnData = {};
 				
-				if (returnData.picture !== undefined) {
-					var	md5sum = crypto.createHash('md5');
-					if (!returnData.email) returnData.email = '';
-					md5sum.update(returnData.email.toLowerCase());
-					returnData.picture = 'http://www.gravatar.com/avatar/' + md5sum.digest('hex') + '?s=24';
-					if (removeEmail) delete returnData.email;
+				for(var i=0, ii=fields.length; i<ii; ++i) {
+					returnData[fields[i]] = data[i];
 				}
-				socket.emit('api:user.get', returnData);
-			});
-		} else {
-			socket.emit('api:user.get', {
-				username: "Anonymous User",
-				email: '',
-				picture: 'http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e?s=24'
-			});
-		}
+
+				callback(returnData);
+			}
+			else
+				console.log(err);
+		});		
 	}
 
 	User.getUserData = function(uid, callback) {
-		var fields = ['username', 'email', 'joindate', 'picture'];
-		var keys = [];
-		
-		for(var i = 0, numFields = fields.length; i<numFields; i++) {
-			keys.push('uid:' + uid + ':' + fields[i]);
-		}
-		
-		RDB.mget(keys, function(data) {
-			
-			var returnData = {
-				uid: uid
-			};
-			
-			for(var i=0, numData=data.length; i<numData; i++) {
-				returnData[fields[i]] = data[i];
-			}
-				
-			var md5sum = crypto.createHash('md5');
-			
-			md5sum.update(returnData.email.toLowerCase());
-			returnData.picture = 'http://www.gravatar.com/avatar/' + md5sum.digest('hex') + '?s=24';
 
-			callback(returnData);
-	
+		RDB.db.hgetall(String(uid), function(err, data){
+			if(err === null)
+			{
+				if(data && data['password'])
+					delete data['password'];
+				callback(data);
+			}
+			else
+				console.log(err);
 		});
-		
 	}
 
+	User.setUserField = function(uid, field, value) {
+		RDB.db.hset(String(uid),	field, value);				
+	}
 
 	User.get_gravatars_by_uids = function(uids, size, callback) {
-		var keys = [];
-		for (var i = 0, ii= uids.length; i<ii; i++) {
-			keys.push('uid:' + uids[i] + ':email');
-		}
-
-		var gravatars = [];
 		
+		var gravatars = [];
 
-		RDB.mget(keys, function(data) {
-			for (var i=0, ii=data.length; i<ii; i++) {
-				if (!data[i]) {
-					gravatars.push("http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e?s=" + size);
-				} else {
-					var	md5sum = crypto.createHash('md5');
-					md5sum.update((data[i]).toLowerCase());
-					gravatars.push('http://www.gravatar.com/avatar/' + md5sum.digest('hex') + '?s=' + size);	
-				}
-				
-			}
-
-			callback(gravatars);
-		});
-		
-	};
-
-	User.login = function(socket, user) {
-		if (user.username == null || user.password == null) {
-			return socket.emit('user.login', {'status': 0, 'message': 'Missing fields'});
-		}
-
-		RDB.get('username:' + user.username + ':uid', function(uid) {
-			if (uid == null) {
-				return socket.emit('user.login', {'status': 0, 'message': 'Username does not exist.'});
-			}
-
-			RDB.get('uid:' + uid + ':password', function(password) {
-				if (user.password != password) {
-					return socket.emit('user.login', {'status': 0, 'message': 'Incorrect username / password combination.'});
-				} else {
-					// Start, replace, or extend a session
-					RDB.get('sess:' + user.sessionID, function(session) {
-						if (session !== user.sessionID) {
-							RDB.set('sess:' + user.sessionID + ':uid', uid, 60*60*24*14);	// Login valid for two weeks
-							RDB.set('uid:' + uid + ':session', user.sessionID, 60*60*24*14);
-						} else {
-							RDB.expire('sess:' + user.sessionID + ':uid', 60*60*24*14);	// Defer expiration to two weeks from now
-							RDB.expire('uid:' + uid + ':session', 60*60*24*14);
-						}
-					});
-
-					return socket.emit('user.login', {'status': 1, 'message': 'Logged in!'});
-				}
+		for(var i=0, ii=uids.length; i<ii; ++i) {
+						
+			User.getUserField(uids[i], 'picture', function(picture) {
+				console.log(picture);
+				gravatars.push(picture);
+				if(gravatars.length >= uids.length)
+					callback(gravatars);
 			});
-		});
+		}
 	};
 
 	User.loginViaLocal = function(username, password, next) {
+
 		if (!username || !password) {
 			return next({
 				status: 'error',
@@ -152,8 +82,9 @@ var	config = require('../config.js'),
 						message: 'invalid-user'
 					});
 				}
-
-				RDB.get('uid:' + uid + ':password', function(user_password) {
+				
+				User.getUserField(uid, 'password', function(user_password) {
+					
 					bcrypt.compare(password, user_password, function(err, res) {
 						if (res === true) {
 							next({
@@ -260,56 +191,36 @@ var	config = require('../config.js'),
 	}
 
 	User.create = function(username, password, email, callback) {
-		User.exists(null, username, function(exists) {
-			if (exists) {
-				return callback('user-exists', 0);
-			}
 
-			RDB.incr('global:next_user_id', function(uid) {
-				RDB.set('username:' + username + ':uid', uid);
-				RDB.set('uid:' + uid + ':username', username);
-				if (password) {
-					bcrypt.genSalt(10, function(err, salt) {
-						bcrypt.hash(password, salt, function(err, hash) {
-							RDB.set('uid:' + uid + ':password', hash);
-						});
-					});
-				}
-				
-				if (email) {
-					var	confirm_code = utils.generateUUID(),
-						confirm_link = config.url + 'confirm/' + confirm_code,
-						confirm_email = global.templates['emails/header'] + global.templates['emails/email_confirm'].parse({'CONFIRM_LINK': confirm_link}) + global.templates['emails/footer'],
-						confirm_email_plaintext = global.templates['emails/email_confirm_plaintext'].parse({ 'CONFIRM_LINK': confirm_link });
+		if(!username) {
+			console.log("invalid registration data! username ["+username+"], password ["+password+"], email ["+email+"]");
+			return;
+		}
+	
+		// TODO : check if username email is unique!! -baris
+	
 
-					RDB.set('uid:' + uid + ':email', email);
-					RDB.set('email:' + email, uid);
+		RDB.incr('global:next_user_id', function(uid) {
+			
+			console.log("Registering uid : " + uid);
 
-					// Email confirmation code
-					RDB.set('email:' + email + ':confirm', confirm_code, 60*60*2);
-					RDB.set('confirm:' + confirm_code + ':email', email, 60*60*2);	// Expire after 2 hours
+			User.hashPassword(password, function(hash) {
 
-					// Send intro email w/ confirm code
-					var message = emailjs.message.create({
-						text: confirm_email_plaintext,
-						from: config.mailer.from,
-						to: email,
-						subject: '[NodeBB] Registration Email Verification',
-						attachment: [
-							{
-								data: confirm_email,
-								alternative: true
-							}
-						]
-					});
-					
-					emailjsServer.send(message, function(err, success) {
-						if (err) console.log(err);
-					});
-				}
+				RDB.db.hmset(String(uid), {
+					'username' : username,
+					'email' : email,
+					'joindate' : new Date().getTime(),
+					'password' : hash,
+					'picture' : User.createGravatarURLFromEmail(email),
+					'reputation': 0
+				});
 				
-				RDB.set('uid:' + uid + ':joindate', new Date().getTime());
+				RDB.set('username:' + username + ':uid', uid);
+				RDB.set('email:' + email +':uid', uid);			
 				
+				if(email)
+					User.sendConfirmationEmail(email);
+			
 				RDB.incr('user:count', function(count) {
 					io.sockets.emit('user.count', {count: count});
 				});
@@ -318,17 +229,77 @@ var	config = require('../config.js'),
 				io.sockets.emit('user.latest', {username: username});
 
 				callback(null, uid);
+				
 			});
+
 		});
+
 	};
 
+	User.createGravatarURLFromEmail = function(email) {
+		if(email) {
+			var md5sum = crypto.createHash('md5');
+			md5sum.update(email.toLowerCase());
+			var gravatarURL = 'http://www.gravatar.com/avatar/' + md5sum.digest('hex');
+			return gravatarURL;
+		}
+		else {
+			return "http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e";	
+		}
+	}
+
+	User.hashPassword = function(password, callback) {
+		if(!password) {
+			callback(password);
+			return;
+		}
+		
+		bcrypt.genSalt(10, function(err, salt) {
+			bcrypt.hash(password, salt, function(err, hash) {
+				callback(hash);	
+			});
+		});
+	}
+
+	User.sendConfirmationEmail = function (email) {
+		var confirm_code = utils.generateUUID(),
+			confirm_link = config.url + 'confirm/' + confirm_code,
+			confirm_email = global.templates['emails/header'] + global.templates['emails/email_confirm'].parse({'CONFIRM_LINK': confirm_link}) + global.templates['emails/footer'],
+			confirm_email_plaintext = global.templates['emails/email_confirm_plaintext'].parse({ 'CONFIRM_LINK': confirm_link });
+
+		// Email confirmation code
+		RDB.set('email:' + email + ':confirm', confirm_code, 60*60*2);
+		RDB.set('confirm:' + confirm_code + ':email', email, 60*60*2);	// Expire after 2 hours
+
+			// Send intro email w/ confirm code
+		var message = emailjs.message.create({
+			text: confirm_email_plaintext,
+			from: config.mailer.from,
+			to: email,
+			subject: '[NodeBB] Registration Email Verification',
+			attachment: [
+				{
+					data: confirm_email,
+					alternative: true
+				}
+			]
+		});
+			
+		emailjsServer.send(message, function(err, success) {
+			if (err) 
+				console.log(err);
+		});	
+	}
+
 
 	User.exists = function(socket, username, callback) {
 		User.get_uid_by_username(username, function(exists) {
 			exists = !!exists;
 
-			if (callback) callback(exists);
-			else socket.emit('user.exists', {exists: exists});
+			if (callback) 
+				callback(exists);
+			else 
+				socket.emit('user.exists', {exists: exists});
 		});
 	};
 	
@@ -349,42 +320,50 @@ var	config = require('../config.js'),
 	};
 
 	User.get_username_by_uid = function(uid, callback) {
-		RDB.get('uid:' + uid+ ':username', callback);
+		User.getUserField(uid, 'username', callback);
 	};
 
 	User.get_usernames_by_uids = function(uids, callback) {
-		var userIds = [];
-		for(var i=0, ii=uids.length; i<ii; i++) {
-			userIds.push('uid:' + uids[i] + ':username');
-		}
 		
-		RDB.mget(userIds, function(data) {
-			callback(data);
-		});
-	};
+		var usernames = [];
+		
+		for(var i=0, ii=uids.length; i<ii; ++i) {
+		
+			User.get_username_by_uid(uids[i], function(username){
 
-	User.get_user_postdetails = function(uids, callback) {
-		var username = [],
-			rep = [];
+				usernames.push(username);
 
-		for(var i=0, ii=uids.length; i<ii; i++) {
-			username.push('uid:' + uids[i] + ':username');
-			rep.push('uid:' + uids[i] + ':rep');
+				if(usernames.length >= uids.length)
+					callback(usernames);
+			});
 		}
+	};
+
+	User.get_user_postdetails = function(uids, callback) {
 		
-		RDB.multi()
-			.mget(username)
-			.mget(rep)
-			.exec(function(err, replies) {
-				callback({
-					'username': replies[0],
-					'rep' : replies[1]
-				});
+		var usernames = [];
+		var reputations = [];
+		
+		for(var i=0, ii=uids.length; i<ii; ++i) {
+		
+			User.getUserFields(uids[i], ['username','reputation'], function(data){
+				
+				usernames.push(data['username']);
+				reputations.push(data['reputation']);
+				
+				if(usernames.length >= uids.length) {
+					
+					callback({
+						'username':usernames,
+						'rep':reputations
+					});
+				}
 			});
+		}
 	}
 
 	User.get_uid_by_email = function(email, callback) {
-		RDB.get('email:' + email, callback)
+		RDB.get('email:' + email + ':uid', callback)
 	};
 
 	User.get_uid_by_session = function(session, callback) {
@@ -494,7 +473,8 @@ var	config = require('../config.js'),
 			this.validate(code, function(validated) {
 				if (validated) {
 					RDB.get('reset:' + code + ':uid', function(uid) {
-						RDB.set('uid:' + uid + ':password', password);
+
+						RDB.db.hset(String(uid), 'password', password);
 						RDB.del('reset:' + code + ':uid');
 						RDB.del('reset:' + code + ':expiry');
 
diff --git a/src/webserver.js b/src/webserver.js
index 30362cba30..87a01550c5 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -124,7 +124,7 @@ passport.deserializeUser(function(uid, done) {
 
 	// Basic Routes (entirely client-side parsed, goal is to move the rest of the crap in this file into this one section)
 	(function() {
-		var routes = ['', 'login', 'register'];
+		var routes = ['', 'login', 'register', 'account'];
 
 		for (var i=0, ii=routes.length; i<ii; i++) {
 			(function(route) {
@@ -178,6 +178,11 @@ passport.deserializeUser(function(uid, done) {
 						res.send(JSON.stringify(data));
 					}, req.params.id, (req.user) ? req.user.uid : 0);
 				break;
+			case 'account' : 
+					get_account_fn(req, res, function(userData) {
+						res.send(JSON.stringify(userData));
+					});
+				break;
 			case 'confirm':
 					global.modules.user.email.confirm(req.params.id, function(data) {
 						if (data.status === 'ok') {
@@ -270,7 +275,28 @@ passport.deserializeUser(function(uid, done) {
 		});
 	});
 
-	app.get('/account', function(req, res) {
+	app.get('/baristest', function(req, res) {
+		/*user.getUserField(req.user.uid, 'email', function(data) {
+			console.log(" I GOT FIELD " +data);
+		});*/
+/*		user.getUserData(req.user.uid, function(data) {
+			console.log(" USER DATA : " + JSON.stringify(data));
+		});*/
+//		user.getUserFields(req.user.uid, ['email','username'], function(data) {
+		/*user.getUserFields(req.user.uid, ['username','email'], function(data) {
+			console.log(" I GOT FIELDS " +JSON.stringify(data));
+		});*/
+		
+		user.get_usernames_by_uids(["17","1"], function(data){
+			console.log("I GOT "+JSON.stringify(data));
+			
+		});
+	});
+
+	//to baris, move this into account.js or sth later - just moved this out here for you to utilize client side tpl parsing
+	//I didn't want to change too much so you should probably sort out the params etc
+	function get_account_fn(req, res, callback) {
+		console.log("GOING TO ACCOUNT");
 
  		if (req.user === undefined) 
  			return res.redirect('/403');
@@ -278,13 +304,26 @@ passport.deserializeUser(function(uid, done) {
 		user.getUserData(req.user.uid, function(data) {
 
 			data.joindate = utils.relativeTime(data.joindate);
-			var account = templates['account'];
-			var userData = {user:data};
-			account = account.parse(userData);
+
+			console.log("user data" + JSON.stringify(data));
 			
-			res.send(templates['header'] + account + templates['footer']);
+			var userData = {user:data};
+			callback(userData);
 		});
+	}
+
+	
+	app.get('/uid/:uid', function(req, res) {
+		
+		if(!req.params.uid)
+			return res.redirect('/403');
 		
+		user.getUserData(req.params.uid, function(data){
+			if(data)
+				res.send(data);
+			else
+				res.send("User doesn't exist!");
+		});
 		
 	});
 
diff --git a/src/websockets.js b/src/websockets.js
index 6eaf8b780a..e7dc1276b5 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -5,7 +5,12 @@ var	SocketIO = require('socket.io').listen(global.server,{log:false}),
 
 (function(io) {
 	var	modules = null,
-			users = {};
+			users = {},
+			rooms = {
+				'users' : {},
+				'anonymous' : {}
+			};
+
 	global.io = io;
 	module.exports.init = function() {
 		modules = global.modules;
@@ -51,11 +56,11 @@ var	SocketIO = require('socket.io').listen(global.server,{log:false}),
 			modules.templates.init();
 		}
 		
-		process.on('uncaughtException', function(err) {
+		/*process.on('uncaughtException', function(err) {
     		// handle the error safely
     		console.log("error message "+err);
     		socket.emit('event:consolelog',{type:'uncaughtException', stack:err.stack, error:err.toString()});
-		});
+		});*/
 
 		socket.emit('event:connect', {status: 1});
 		
@@ -67,14 +72,62 @@ var	SocketIO = require('socket.io').listen(global.server,{log:false}),
    		});
 
 		
+
+		socket.on('event:enter_room', function(data) {
+			if (data.leave !== null) socket.leave (data.leave);
+			socket.join(data.enter);
+
+			rooms.users[data.enter] = rooms.users[data.enter] || {};
+			if (uid) {
+				rooms.users[data.enter][uid] = true;
+				if (rooms.users[data.leave]) {
+					delete rooms.users[data.leave][uid];
+				}
+			} else {
+				rooms.anonymous[data.enter] = (rooms.anonymous[data.enter] || 0) + 1;
+				rooms.anonymous[data.leave] = rooms.anonymous[data.leave] || 0;
+			}
+
+			var uids = Object.keys(rooms.users[data.enter] || {});
+
+			if (uids.length == 0) {
+				socket.emit('api:get_users_in_room', {
+					usernames: [],
+					uids: [],
+					anonymous: rooms.anonymous[data.enter] || 0
+				});
+			}
+			modules.user.get_usernames_by_uids(uids, function(usernames) {
+				socket.emit('api:get_users_in_room', {
+					usernames: usernames,
+					uids: uids,
+					anonymous: rooms.anonymous[data.enter] || 0
+				});
+			});
+
+			
+		});
+
 		// BEGIN: API calls (todo: organize)
 		//   julian: :^)
-		socket.on('event:enter_room', function(room) {
-			socket.join(room);
-		});
 
-		socket.on('api:user.get', function(data) {
-			modules.user.get(socket, uid, data.fields);
+		socket.on('api:updateHeader', function(data) {
+			if(uid) {
+						
+				modules.user.getUserFields(uid, data.fields, function(fields) {
+					fields.uid = uid;
+					socket.emit('api:updateHeader', fields);
+				});
+			}
+			else {
+				socket.emit('api:updateHeader', {
+					uid:0,
+					username: "Anonymous User",
+					email: '',
+					picture: 'http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e?s=24'
+				});
+			}
+				
 		});
 		
 		socket.on('api:user.getNameByUid', function(data) {
@@ -95,11 +148,6 @@ var	SocketIO = require('socket.io').listen(global.server,{log:false}),
 			modules.user.latest(socket, data);
 		});
 
-		socket.on('user.login', function(data) {
-			data.sessionID = sessionID;
-			modules.user.login(socket, data);
-		});
-
 		socket.on('user.email.exists', function(data) {
 			modules.user.email.exists(socket, data.email);
 		});