diff --git a/schoolaccess.php b/schoolaccess.php
index 7d5e434..ba6cf48 100644
--- a/schoolaccess.php
+++ b/schoolaccess.php
@@ -57,7 +57,8 @@ function draw_dashboard(){
 			echo '<li><a href="schoolinvite.php">' . i18n("Participant Registration") . "</a></li>\n";
 		}
 	}else if($conference['type'] == 'scienceolympics'){
-		echo  '<li><a href="manage_teams.php">' . i18n("Manage Teams") . "</a></li>\n";
+		echo  '<li><a href="schoolstudents.php">' . i18n("Manage Students") . "</a></li>\n";
+		echo  '<li><a href="schoolteams.php">' . i18n("Manage Teams") . "</a></li>\n";
 	}
 	echo '<li><a href="schoolfeedback.php">' . i18n("School Feedback / Questions") . "</a></li>";
 	echo "</ul>\n";
diff --git a/schoolstudents.php b/schoolstudents.php
new file mode 100644
index 0000000..2e53c39
--- /dev/null
+++ b/schoolstudents.php
@@ -0,0 +1,17 @@
+<?php
+require_once('common.inc.php');
+require_once('user.inc.php');
+
+if($_SESSION['schoolid'] && $_SESSION['schoolaccesscode'] && $conference['type'] == 'scienceolympics'){
+	$title = i18n("Manage Students");
+	send_header($title, array("School Access" => "schoolaccess.php"));
+	draw_list();
+}else{
+	header('Location: schoolaccess.php');
+}
+
+// draw an editable list of all students for this school in the users_stunt table
+function draw_list(){
+	
+
+}
diff --git a/manage_teams.php b/schoolteams.php
similarity index 95%
rename from manage_teams.php
rename to schoolteams.php
index 37fbae6..2e18c21 100644
--- a/manage_teams.php
+++ b/schoolteams.php
@@ -80,7 +80,7 @@ function draw_page(){
 
 		function delete_team(teamId){
 			var data = $("#editTeam_" + teamId).serializeArray();
-			$("#debug").load("manage_teams.php?action=delete", data, function(){
+			$("#debug").load("schoolteams.php?action=delete", data, function(){
 				$('#teamHeader_' + teamId).remove();
 				$('#team_' + teamId).remove();
 			});
@@ -89,7 +89,7 @@ function draw_page(){
 		function saveData(teamId){
 			var data = $("#editTeam_" + teamId).serializeArray();
 
-			$("#debug").load("manage_teams.php?action=save&", data, function(){
+			$("#debug").load("schoolteams.php?action=save&", data, function(){
 				if(newname != undefined){
 					newname = '<span class="ui-icon ui-icon-triangle-1-e"></span><a href="#" tabindex="-1">' + newname + '</a>';
 					$('#teamHeader_' + teamId).html(newname);
@@ -114,7 +114,7 @@ function draw_page(){
 	}
 	echo '<h3><a href="#">' . i18n("New Team") . '</a></h3>';
 	echo '<div id="newTeam">';
-	echo '<form method="POST" action="manage_teams.php?action=saveNew">';
+	echo '<form method="POST" action="schoolteams.php?action=saveNew">';
 	echo '<label>' . i18n('Name') . '</label><input type="text" style="width:100%" name="teamname"></input>' . "\n";
 	echo '<div style="height:1em;"></div>';
 	echo '<input type="submit" value="' . i18n("Save") . '"></input>';