diff --git a/static/js/smileteacher.js b/static/js/smileteacher.js
index 0ea7a3b..b3fd265 100644
--- a/static/js/smileteacher.js
+++ b/static/js/smileteacher.js
@@ -28,11 +28,11 @@
  #SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  **/
 
-var VERSION = '1.0.1';
-var SMILESTATE = "1";
+var VERSION = '0.0.2';
+//var SMILESTATE = "1";
 var SMILEROUTES = {
     "currentmessage": "/smile/currentmessage",
-    "checkserver": "/smile/",
+    "all": "/smile/all",
     "createsession": "/smile/createsession"
 };
 
@@ -67,11 +67,10 @@ var GlobalViewModel = {
     teacher_name: ko.observable(""),
     session_name: ko.observable(""),
     group_name: ko.observable(""),
-    hasSubmitted: ko.observable(false),
     version: ko.observable(VERSION)
 };
 
-GlobalViewModel.doLogin = function() {
+GlobalViewModel.createSession = function() {
     var self = this;
     
     if (!self.teacher_name() || self.teacher_name() === "") {
@@ -86,46 +85,105 @@ GlobalViewModel.doLogin = function() {
         
         self.group_name('Default Group'); 
     }
+    
+    $.ajax({ 
+        cache: false, 
+        type: "POST", 
+        dataType: "text", 
+        url: SMILEROUTES["createsession"], 
+        data: {"teacherName":GlobalViewModel.teacher_name,"groupName":GlobalViewModel.group_name,"sessionName":GlobalViewModel.session_name}, 
+        
+        error: function(xhr, text, err) {
+            smileAlert('#globalstatus', 'Unable to post session values.  Reason: ' + xhr.status + ':' + xhr.responseText + '.  Please verify your connection or server status.', 'trace');
+        }, 
+        success: function(data) {
+            smileAlert('#globalstatus', 'Success ('+self.teacher_name()+','+self.session_name()+','+self.group_name()+')', 'green', 5000);
+            switchSection('div[data-slug=chooseActivityFlow]');
+        }
+    });
 
-    if (!self.hasSubmitted()) {
-        console.log('doLogin');
-        smileAlert('#globalstatus', 'Logging in ('+self.teacher_name()+','+self.teacher_name()+','+self.teacher_name()+')', 'green', 5000);
-        doSmileLogin();
-    }
+    return false;
+}
+
+GlobalViewModel.recoverSession = function() {
+
+    smileAlert('#globalstatus', 'Session recovered', 'green', 5000);
+    return false;
+}
 
-    self.hasSubmitted(true);
+GlobalViewModel.startMakingQuestions = function() {
 
+    smileAlert('#globalstatus', 'Start making questions', 'green', 5000);
     return false;
 }
 
+GlobalViewModel.usePreparedQuestions = function() {
+
+    smileAlert('#globalstatus', 'Load iqsets', 'green', 5000);
+    return false;
+}
 
-GlobalViewModel.doLoginReset = function() {
+
+GlobalViewModel.resetSessionValues = function() {
 
     this.teacher_name("");
     this.session_name("");
     this.group_name("");
-    this.hasSubmitted(false);
 
     //
     // XXX This is silly, fix this, cleanup the object model and reset the state
     // For now just reload the page
     //
-    window.location.href = window.location.pathname;
-    window.location.reload(true);
+    //window.location.href = window.location.pathname;
+    //window.location.reload(true);
     return false;
 }
 
+GlobalViewModel.initializePage = function() {
+
+    //var alreadyRunning = false;
+
+    $.ajax({ 
+        cache: false, 
+        type: "GET", 
+        dataType: "text", 
+        url: SMILEROUTES["all"], 
+        data: {}, 
+        
+        error: function(xhr, text, err) {
+            smileAlert('#globalstatus', 'Unable to call /smile/all.  Reason: ' + xhr.status + ':' + xhr.responseText + '.  Please verify your connection or server status.', 'trace');
+        }, 
+        success: function(data) {
+
+            // If a session is already running, we replace the session values fields by a "recovering session" button
+            if(data.indexOf('SessionID') !== -1 ){
+                //$('div[data-slug=create-session]').parent().removeClass('active');
+                //$('div[data-slug=recover-session]').parent().addClass('active');
+                switchSection('div[data-slug=recover-session]');
+            }
+        }
+    });
+}
 
 $(document).ready(function() {
     
-    //
     // Init Data Model
-    //
     ko.applyBindings(GlobalViewModel);
 
+    GlobalViewModel.initializePage();
+
 });
 
 // NEEDED
+function foobar() {
+    smileAlert('#globalstatus', 'Not yet implemented', 'blue',5000);
+}
+
+function switchSection(newSection) {
+    
+    $('section.active').removeClass('active');
+    $(newSection).parent().addClass('active');
+}
 
 //
 // App functions
@@ -169,27 +227,4 @@ function smileAlert(targetid, text, alerttype, lifetime) {
             $(targetid).find('.alert-box').fadeOut().remove();
         }, lifetime)
     }
-}
-
-function doSmileLogin() {
-    
-    var clientip;
-    
-    $.ajax({ 
-        cache: false, 
-        type: "POST", 
-        dataType: "text", 
-        url: SMILEROUTES["createsession"], 
-        data: {"teacherName":GlobalViewModel.teacher_name,"groupName":GlobalViewModel.group_name,"sessionName":GlobalViewModel.session_name}, 
-        
-        error: function(xhr, text, err) {
-            smileAlert('#globalstatus', 'Unable to login.  Reason: ' + xhr.status + ':' + xhr.responseText + '.  Please verify your connection or server status.', 'trace');
-            GlobalViewModel.hasSubmitted(false); // Reset this so clicks will work
-        }, 
-        success: function(data) {
-            smileAlert('#globalstatus', 'Successfully logged in', 'green', 10000);
-            // Move to state 2 now
-            SMILESTATE = '2';
-        }
-    });
 }
\ No newline at end of file
diff --git a/static/smile-teacher.html b/static/smile-teacher.html
index b086644..d8e3ec2 100644
--- a/static/smile-teacher.html
+++ b/static/smile-teacher.html
@@ -56,8 +56,7 @@ <h2>Welcome to SMILE Teacher Web</h2>
 		<div class="row">
 			<div class="large-9 small-9 columns">
 				<h3>
-					SMILE Teacher
-					<span data-bind="text: version"></span>
+					SMILE Teacher <span data-bind="text: version"></span>
 				</h3>
 
 				<div class="row">
@@ -75,31 +74,73 @@ <h3>
       									
       									<section class="active">
        						 				
-        									<div class="content" data-slug="login-pane1" data-section-content>
+        									<div class="content" data-slug="create-session" data-section-content>
           										<!-- NICE DEBUG TRICK -->
 												<!-- KO:<span data-bind="text: ko.toJSON($data)"></span>
 												<form action="return false;"> -->
 
 												<label>Teacher Name</label>
-												<input data-bind='value: teacher_name, valueUpdate: "afterkeydown"' type="text" placeholder="Teacher Name (default: Default Teacher)" />
+												<input data-bind='value: teacher_name, valueUpdate: "afterkeydown"' type="text" placeholder="Default Teacher" />
 												<label>Session Name</label>
-												<input data-bind='value: session_name, valueUpdate: "afterkeydown"' type="text" placeholder="Session Name (default: Default Session)" />
+												<input data-bind='value: session_name, valueUpdate: "afterkeydown"' type="text" placeholder="Default Session" />
 												<label>Group Name</label>
-												<input data-bind='value: group_name, valueUpdate: "afterkeydown"' type="text" placeholder="Group Name (default: Default Group)" />
+												<input data-bind='value: group_name, valueUpdate: "afterkeydown"' type="text" placeholder="Default Group" />
 
 												<ul class="button-group even two-up">
 													<li>
-														<a href="#" data-bind='click: doLogin, disable: hasSubmitted'
-															class="button">Submit</a>
+														<a href="#" data-bind='click: createSession'
+															class="button">Next</a>
 													</li>
 													<li>
-														<a href="#" data-bind='click: doLoginReset' class="button">Reset</a>
+														<a href="#" data-bind='click: resetSessionValues' class="button">Reset</a>
 													</li>
 												</ul>
 												</form>
         									</div>
       									</section>
 
+
+      									<section>
+       						 				
+        									<div class="content" data-slug="recover-session" data-section-content>
+												<ul class="button-group even two-up">
+													<li>
+														<a href="#" data-bind='click: recoverSession' class="button">Recovering session</a>
+													</li>
+												</ul>
+												</form>
+        									</div>
+      									</section>
+
+      									<section>
+       						 				
+        									<div class="content" data-slug="chooseActivityFlow" data-section-content>
+												<ul class="button-group even two-up">
+													<li>
+														<a href="#" data-bind='click: startMakingQuestions' class="button">Start making questions</a>
+													</li>
+													<li>
+														<a href="#" data-bind='click: usePreparedQuestions' class="button">Use Prepared Questions</a>
+													</li>
+												</ul>
+												</form>
+        									</div>
+      									</section>
+
+      									<!--section>
+       						 				
+        									<div class="content" data-slug="chooseActivityFlow" data-section-content>
+												<ul class="button-group even two-up">
+													<li>
+														<a href="#" data-bind='click: startMakingQuestions' class="button">Start making questions</a>
+													</li>
+													<li>
+														<a href="#" data-bind='click: usePreparedQuestions' class="button">Use Prepared Questions</a>
+													</li>
+												</ul>
+												</form>
+        									</div>
+      									</section-->
     								</div>
 								</nav>
 							</div>
@@ -111,9 +152,8 @@ <h3>
 				<!-- <div data-bind="with: logindata"> -->
 				<div id="login-info">
 					<h4>
-						Instructions for
-						<div data-bind="text: ip_server" id="ip_server">Teacher</div>
-
+						Instructions for 
+						<div data-bind="text: teacher_name">Teacher</div>
 					</h4>
 					
 					<p><img src="images/jamsj_slim.png" />