Experimental cleaned up code for lobby