diff --git a/config/index.php b/config/index.php
index caaef9c..b282fd3 100644
--- a/config/index.php
+++ b/config/index.php
@@ -32,8 +32,8 @@
  echo "<a href=\"categories.php\">Project Age Categories</a> <br />";
  echo "<a href=\"divisions.php\">Project Divisons</a> <br />";
  echo "<a href=\"subdivisions.php\">Project Sub-Divisons</a> <br />";
-
  echo "<a href=\"pagetexts.php\">Page Texts</a> <br />";
+ echo "<a href=\"safetyquestions.php\">Project Safety Questions</a> <br />";
  echo "<a href=\"images.php\">Images (Fair Logo)</a> <br />";
  echo "<hr />";
  echo "<a href=\"rollover.php\">Rollover Fair Year</a> <br />";
diff --git a/config/safetyquestions.php b/config/safetyquestions.php
new file mode 100644
index 0000000..7181034
--- /dev/null
+++ b/config/safetyquestions.php
@@ -0,0 +1,151 @@
+<?
+/* 
+   This file is part of the 'Science Fair In A Box' project
+   SFIAB Website: http://www.sfiab.ca
+
+   Copyright (C) 2005 Sci-Tech Ontario Inc <info@scitechontario.org>
+   Copyright (C) 2005 James Grant <james@lightbox.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation, version 2.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+?>
+<?
+ require("../common.inc.php");
+ auth_required('config');
+ send_header("Configuration - Safety Questions");
+ echo "<a href=\"index.php\">&lt;&lt; ".i18n("Back to Configuration")."</a><br />";
+
+ if($_POST['action']=="save" && $_POST['save'])
+ {
+ 	mysql_query("UPDATE safetyquestions SET 
+				question='".mysql_escape_string(stripslashes($_POST['question']))."',
+				`type`='".mysql_escape_string(stripslashes($_POST['type']))."',
+				`required`='".mysql_escape_string(stripslashes($_POST['required']))."',
+				ord='".mysql_escape_string(stripslashes($_POST['ord']))."'
+				WHERE id='".$_POST['save']."' AND year='".$config['FAIRYEAR']."'");
+				echo mysql_error();
+
+	echo happy(i18n("Safety question successfully saved"));
+
+ }
+ if($_POST['action']=="new")
+ {
+ 	mysql_query("INSERT INTO safetyquestions (question,type,required,ord,year) VALUES ( 
+				'".mysql_escape_string(stripslashes($_POST['question']))."',
+				'".mysql_escape_string(stripslashes($_POST['type']))."',
+				'".mysql_escape_string(stripslashes($_POST['required']))."',
+				'".mysql_escape_string(stripslashes($_POST['ord']))."',
+				'".$config['FAIRYEAR']."'
+				)");
+				echo mysql_error();
+
+	echo happy(i18n("Safety question successfully added"));
+
+
+ }
+
+ if($_GET['action']=="remove" && $_GET['remove'])
+ {
+ 	mysql_query("DELETE FROM safetyquestions WHERE id='".$_GET['remove']."' AND year='".$config['FAIRYEAR']."'");
+	echo happy(i18n("Safety question successfully removed"));
+
+ }
+
+ if(($_GET['action']=="edit" && $_GET['edit']) || $_GET['action']=="new")
+ {
+ 	$showform=true;
+	echo "<form method=\"post\" action=\"safetyquestions.php\">";
+ 	if($_GET['action']=="new")
+	{
+		$buttontext="Add safety question";
+		echo "<input type=\"hidden\" name=\"action\" value=\"new\">\n";
+		$r=null;
+	}
+	else if($_GET['action']=="edit")
+	{
+		$buttontext="Save safety question";
+		echo "<input type=\"hidden\" name=\"action\" value=\"save\">\n";
+		echo "<input type=\"hidden\" name=\"save\" value=\"$r->id\">\n";
+		$q=mysql_query("SELECT * FROM safetyquestions WHERE id='".$_GET['edit']."' AND year='".$config['FAIRYEAR']."'");
+		if(!$r=mysql_fetch_object($q))
+		{
+			$showform=false;
+			echo error(i18n("Invalid safety question"));
+		}
+
+
+	}
+	if($showform)
+	{
+		echo "<table class=\"summarytable\">";
+		echo "<tr><td>".i18n("Question")."</td><td>";
+		echo "<input size=\"60\" type=\"text\" name=\"question\" value=\"".htmlspecialchars($r->question)."\">\n";
+		echo "</td></tr>";
+		echo "<tr><td>".i18n("Type")."</td><td>";
+		echo "<select name=\"type\">";
+		if($r->type=="check") $sel="selected=\"selected\""; else $sel="";
+			echo "<option $sel value=\"check\">".i18n("Check box")."</option>\n";
+		if($r->type=="yesno") $sel="selected=\"selected\""; else $sel="";
+			echo "<option $sel value=\"yesno\">".i18n("Yes/No")."</option>\n";
+		echo "</select>";
+		echo "</td>";
+		echo "<tr><td>".i18n("Required?")."</td><td>";
+		echo "<select name=\"required\">";
+		if($r->required=="yes") $sel="selected=\"selected\""; else $sel="";
+			echo "<option $sel value=\"yes\">".i18n("Yes")."</option>\n";
+		if($r->required=="no") $sel="selected=\"selected\""; else $sel="";
+			echo "<option $sel value=\"no\">".i18n("No")."</option>\n";
+		echo "</select>";
+		echo "</td>";
+		echo "<tr><td>".i18n("Display Order")."</td><td>";
+		echo "<input size=\"5\" type=\"text\" name=\"ord\" value=\"".htmlspecialchars($r->ord)."\">\n";
+		echo "</td></tr>";
+		echo "<tr><td colspan=\"2\" align=\"center\">";
+		echo "<input type=\"submit\" value=\"".i18n($buttontext)."\" />\n";
+		echo "</td></tr>";
+		echo "</table>";
+		echo "</form>";
+		echo "<br />";
+		echo "<hr />";
+	}
+	else
+	{
+	}
+ }
+ echo "<br />";
+ echo "<a href=\"safetyquestions.php?action=new\">Add new safety question</a>";
+
+ echo "<table class=\"summarytable\">";
+ $q=mysql_query("SELECT * FROM safetyquestions WHERE year='".$config['FAIRYEAR']."' ORDER BY ord");
+ echo "<tr><th>".i18n("Question")."</th><th>".i18n("Type")."</th><th>".i18n("Required")."</th><th>".i18n("Actions")."</th></tr>";
+ while($r=mysql_fetch_object($q))
+ {
+ 	echo "<tr><td>$r->question</td>";
+	echo "<td align=\"center\">$r->type</td>";
+	echo "<td align=\"center\">$r->required</td>";
+	echo "<td align=\"center\">";
+	echo "<a title=\"Edit\" href=\"".$_SERVER['PHP_SELF']."?action=edit&amp;edit=$r->id\"><img src=\"".$config['SFIABDIRECTORY']."/images/16/edit.".$config['icon_extension']."\" border=0></a>";
+	echo "&nbsp; &nbsp;";
+	echo "<a title=\"Remove\" onClick=\"return confirmClick('".i18n("Are you sure you want to remove this safety question?")."');\" href=\"".$_SERVER['PHP_SELF']."?action=remove&amp;remove=$r->id\"><img src=\"".$config['SFIABDIRECTORY']."/images/16/button_cancel.".$config['icon_extension']."\" border=0></a>";
+
+	echo "</td>";
+	echo "</tr>";
+
+
+ }
+ echo "</table>";
+
+ send_footer();
+?>