diff --git a/admin/award_download.php b/admin/award_download.php
index 4ba835a..56a0c87 100644
--- a/admin/award_download.php
+++ b/admin/award_download.php
@@ -46,8 +46,8 @@
 
 	if($fair['type'] == 'ysc') {
 		$req=array("awardrequest"=>array(
-				"username"=>$r->username,
-				"password"=>$r->password,
+				"username"=>$fair['username'],
+				"password"=>$fair['password'],
 				"year"=>$config['FAIRYEAR'],
 				)
 			);
diff --git a/admin/award_upload.php b/admin/award_upload.php
index cb9af2c..a1b2e79 100644
--- a/admin/award_upload.php
+++ b/admin/award_upload.php
@@ -20,12 +20,164 @@
    Boston, MA 02111-1307, USA.
 */
 
- require_once("xml.inc.php");
- require_once("../user.inc.php");
+require_once('../common.inc.php');
+require_once('../user.inc.php');
+require_once('../projects.inc.php');
+require_once('curl.inc.php');
+user_auth_required('committee', 'admin');
+
+//function get_cwsf_award_winners()
+function get_winners($awardid)
+{
+ 	global $config;
+
+	/* Mappings of the name we want => to the column name returned in MYSQL */
+	$school_fields = array( 'schoolname'=>'school',
+				'schoollang'=>'schoollang',
+				'schoollevel'=>'schoollevel',
+				'board'=>'board',
+				'district'=>'district',
+				'phone'=>'phone',
+				'fax'=>'fax',
+				'address'=>'address',
+				'city'=>'city',
+				'province_code'=>'province_code',
+				'postalcode'=>'postalcode',
+				'principal'=>'principal',
+				'schoolemail'=>'schoolemail',
+				'sciencehead'=>'sciencehead',
+				'scienceheademail'=>'scienceheademail',
+				'scienceheadphone'=>'scienceheadphone');
+
+	$student_fields = array('firstname'=>'firstname',
+				'lastname'=>'lastname',
+				'email'=>'email',
+				'gender'=>'sex',
+				'grade'=>'grade',
+				'language'=>'lang',
+				'birthdate'=>'dateofbirth',
+				'address'=>'address',
+				'city'=>'city',
+				'province'=>'province',
+				'postalcode'=>'postalcode',
+				'phone'=>'phone',
+				'teachername'=>'teachername',
+				'teacheremail'=>'teacheremail');
+
+
+
+	/* Get the award */
+ 	$q=mysql_query("SELECT * FROM award_awards WHERE id='$awardid' AND year='{$config['FAIRYEAR']}'");
+	if(mysql_num_rows($q)!=1) {
+		error_("Can't find award id $awardid");
+		return false;
+	}
+	$award=mysql_fetch_assoc($q);
+
+ 	$winners=array(	'prizes' => array(),
+			'external_identifier' => $award['external_identifier'],
+			'postback' => $award['external_postback']);
+
+	/* Get the prizes */
+	$q=mysql_query("SELECT * FROM award_prizes WHERE award_awards_id='{$award['id']}'");
+	while($prize=mysql_fetch_assoc($q)) {
+		$pid = $prize['id'];
+		$wq=mysql_query("SELECT projects.* FROM award_prizes
+					LEFT JOIN winners ON winners.awards_prizes_id=award_prizes.id
+					LEFT JOIN projects ON projects.id=winners.projects_id
+				WHERE 
+					awards_prizes_id='$pid' AND 
+					winners.year='{$config['FAIRYEAR']}'");
+		echo mysql_error();
+		/* Get all projects assigned to this prize */
+		$prizewinners = array();
+		while($project=mysql_fetch_assoc($wq)) {
+
+			/* Get the students */
+			$sq=mysql_query("SELECT * FROM students WHERE registrations_id='{$project['registrations_id']}'
+						AND year='{$config['FAIRYEAR']}'");
+			$students=array();
+			while($s=mysql_fetch_assoc($sq)) {
+
+				/* Get the student's school */
+				$schoolq=mysql_query("SELECT * FROM schools WHERE id='{$s['schools_id']}'");
+				$schoolr=mysql_fetch_assoc($schoolq);
+				$school = array("xml_type"=>"school");/* for ysc compatability */
+				foreach($school_fields as $k=>$v) 
+					$school[$k] = $schoolr[$v];
+
+				/* Pack up the student data too */
+				$student = array('xml_type'=>'student',/* for ysc compatability */
+						'school' => $school);
+				foreach($student_fields as $k=>$v) 
+					$student[$k] = $s[$v];
+				
+				$students[] = $student;
+
+			}
+			/* Save the project info => students */
+			$prizewinners[]=array(	'xml_type' => 'project',/* for ysc compatability */
+						'projectid'=>$project['id'],
+						'projectnumber'=>$project['projectnumber'],
+						'title'=>$project['title'],
+						'abstract'=>$project['summary'],
+						'students'=>$students );
+		}
+		/* Save the prize info => projects */
+		$winners['prizes'][$prize['prize']] = array(
+				'xml_type'=>'prize', /* For ysc compatability */
+				'identifier'=>$prize['prize'], /* for ysc compatability */
+				'projects'=>$prizewinners);
+	}
+	return $winners;
+}
+
+switch($_GET['action']) {
+case 'award_upload':
+	$award_awards_id = intval($_GET['id']);
+	$winners = get_winners($award_awards_id);
+
+	/* Get the fair */
+	$q = mysql_query("SELECT award_source_fairs_id FROM award_awards WHERE id='$award_awards_id'");
+	$a = mysql_fetch_assoc($q);
+	$q = mysql_query("SELECT * FROM fairs WHERE id='{$a['award_source_fairs_id']}'");
+	$fair = mysql_fetch_assoc($q);
+
+	echo 'Award<br />';
+	if($winners == false) {
+		echo notice(i18n('No winners selected for this award'));
+	} else {
+		if($fair['type'] == 'ysc') {
+			$req=array("awardwinners"=>array(
+					"username"=>$fair['username'],
+					"password"=>$fair['password'],
+					"identifier"=>$winners['external_identifier'];
+					"prizes"=>$winners;
+					)
+				);
+			$url = $winners['external_postback'];
+		} else {
+			$req = array('award_upload' => $winners);
+			$req['award_upload']['year'] = $config['FAIRYEAR'];
+			$url = ''; /* url is ignored for type = sfiab */
+		}
+				
+		$data = curl_query($fair, $req, $url);
+
+		if($data['error'] != 0) {
+			echo error("Server said: $data");
+		} else {
+			echo notice("Server Said: $data");
+		}
+		echo "<pre>";
+		print_r($winners);
+		echo "</pre>";
+	}
+	
+	exit;
+}
+
 
- require("../common.inc.php");
- require("../projects.inc.php");
- user_auth_required('committee', 'admin');
  send_header("Award Upload",
  		array('Committee Main' => 'committee_main.php',
 			'Administration' => 'admin/index.php',
@@ -33,239 +185,55 @@
 			);
  echo "<br />";
 
- //function get_cwsf_award_winners()
- function get_winners_for_award($awardid)
- {
- 	global $config;
- 	$winners=array();
-
- 	$q=mysql_query("SELECT * FROM award_awards WHERE id='$awardid' AND year='".$config['FAIRYEAR']."'");
-	if(mysql_num_rows($q)==1)
-	{
-		$award=mysql_fetch_object($q);
-		$pq=mysql_query("SELECT * FROM award_prizes WHERE award_awards_id='$award->id'");
-		while($prize=mysql_fetch_object($pq))
-		{
-			$wq=mysql_query("SELECT 
-						projects.id,
-						projects.projectnumber,
-						projects.title,
-						projects.summary,
-						projects.registrations_id,
-						projects.projectdivisions_id
-						
-					FROM 
-						winners,
-						projects
-					WHERE 
-						winners.projects_id=projects.id AND
-						awards_prizes_id='$prize->id' AND 
-						winners.year='".$config['FAIRYEAR']."'");
-						echo mysql_error();
-			while($project=mysql_fetch_object($wq))
-			{
-				$sq=mysql_query("SELECT * FROM students WHERE registrations_id='$project->registrations_id' AND year='".$config['FAIRYEAR']."'");
-				$students=array();
-				while($s=mysql_fetch_object($sq))
-				{
-					$schoolq=mysql_query("SELECT * FROM schools WHERE id='$s->schools_id'");
-					$school=array();
-					if($schoolr=mysql_fetch_object($schoolq)) {
-						$school=array(
-									"xml_type"=>"school",
-									"schoolname"=>$schoolr->school,
-									"schoollang"=>$schoolr->schoollang,
-									"schoollevel"=>$schoolr->schoollevel,
-									"board"=>$schoolr->board,
-									"district"=>$schoolr->district,
-									"phone"=>$schoolr->phone,
-									"fax"=>$schoolr->fax,
-									"address"=>$schoolr->address,
-									"city"=>$schoolr->city,
-									"province_code"=>$schoolr->province_code,
-									"postalcode"=>$schoolr->postalcode,
-									"principal"=>$schoolr->principal,
-									"schoolemail"=>$schoolr->schoolemail,
-									"sciencehead"=>$schoolr->sciencehead,
-									"scienceheademail"=>$schoolr->scienceheademail,
-									"scienceheadphone"=>$schoolr->scienceheadphone
-								);
-					}
-					$students[]=array(
-								"xml_type"=>"student",
-								"firstname"=>$s->firstname,
-								"lastname"=>$s->lastname,
-								"email"=>$s->email,
-								"gender"=>$s->sex,
-								"grade"=>$s->grade,
-								"language"=>$s->lang,
-								"birthdate"=>$s->dateofbirth,
-								"address1"=>$s->address,
-								"address2"=>"",
-								"city"=>$s->city,
-								"province"=>$s->province,
-								"postalcode"=>$s->postalcode,
-								"phone"=>$s->phone,
-								"teachername"=>$s->teachername,
-								"teacheremail"=>$s->teacheremail,
-								"school"=>$school
-							);
-
-				}
-				$prizewinners[]=array(
-						"xml_type"=>"project",
-						"projectid"=>$project->id,
-						"projectnumber"=>$project->projectnumber,
-						"title"=>$project->title,
-						"abstract"=>$project->summary,
-						"students"=>$students,
-						);
-			}
-			$winners[]=array(
-			"xml_type"=>"prize",
-			"identifier"=>$prize->external_identifier,
-			"projects"=>$prizewinners
-			);
-		}
-		//print_r($award);
-	}
-	return $winners;
- }
-
-
- if($_GET['action']=="send")
- {
- 	if(count($_GET['send'])) {
-		require_once("xml.inc.php");
-		foreach($_GET['send'] AS $awardid) {
-
-
-			 $q=mysql_query("SELECT award_awards.id, 
-	 			award_awards.name AS awardname,
-	 			award_awards.external_identifier,
-	 			award_awards.external_postback,
-				award_sources.name AS sourcename,
-				award_sources.username,
-				award_sources.password
-	 			FROM 
-					award_awards 
-				JOIN award_sources ON award_awards.award_sources_id=award_sources.id
-				WHERE award_sources.enabled='yes' 
-				AND award_awards.id='$awardid'");
-
-			if($r=mysql_fetch_object($q)) {
-				echo i18n("Sending award winners for %1 to %2...",array($r->awardname,$r->sourcename));
-				if(!($r->username && $r->password && $r->external_postback)) {
-					echo error(i18n("Username, Password or Postback Address missing, cannot send winners for this award"));
-					continue;
-				}
-				$winners=get_winners_for_award($r->id);
-				echo "<br />";
-				if(count($winners)==0) {
-					echo "&nbsp;&nbsp;".i18n("No winner(s) selected for this award... reporting no winners")."<br />";
-				}
-
-				$reg=array("awardwinners"=>array(
-					"username"=>$r->username,
-					"password"=>$r->password,
-					"identifier"=>$r->external_identifier,
-					"prizes"=>$winners
-					)
-				);
-
-				$output="";
-				xmlCreateRecurse($reg);
-				$xmldata=$output;
-
-				$ch = curl_init(); /// initialize a cURL session
-				curl_setopt ($ch, CURLOPT_URL,$r->external_postback);
-				curl_setopt ($ch, CURLOPT_HEADER, 0); /// Header control
-				curl_setopt ($ch, CURLOPT_POST, 1);  /// tell it to make a POST, not a GET
-				curl_setopt ($ch, CURLOPT_POSTFIELDS, "xml=$xmldata");  /// put the query string here starting with "?"
-				curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1); /// This allows the output to be set into a variable $datastream
-				curl_setopt ($ch, CURLOPT_POSTFIELDSIZE, 0);
-				curl_setopt ($ch, CURLOPT_TIMEOUT, 360);
-				curl_setopt ($ch, CURLOPT_SSLVERSION, 3);
-			    curl_setopt ($ch, CURLOPT_SSL_VERIFYPEER, false);
-				$datastream = curl_exec ($ch); /// execute the curl session and return the output to a variable $datastream
-				$datastream = str_replace(" standalone=\"yes\"","",$datastream);
-				// echo "curl close <br />";
-				curl_close ($ch); /// close the curl session
-				echo i18n("Response from server:");
-				$response=xml_parsexml($datastream);
-				if($response && is_array($response)) {
-					$keys=array_keys($response);
-					if($keys[0]=="awardwinnersresponse") {
-						$status=$response['awardwinnersresponse'][0]['status'][0];
-						$statusmessage=$response['awardwinnersresponse'][0]['statusmessage'][0];
-						if($status=="success")
-							echo happy(i18n("Success: %1",array($statusmessage)));
-						else
-							echo error(ucfirst($status).": ".$statusmessage); //not translated, because it came right from the server!
-					}
-					else
-					{
-						echo error(i18n("Invalid XML response.  Expecting '%1', received '%2'",array("awardwinnersresponse",$keys[0])));
-						echo "datastream: ".htmlspecialchars($datastream);
-					}
-				}
-				else
-				{
-					echo error(i18n("Invalid response.  Couldn't parse XML or no data returned",array("awardwinnersresponse",$keys[0])));
-					echo "datastream: ".htmlspecialchars($datastream);
-
-				}
-
-			}
-			echo "<br />";
-		}
-	}
- }
- else
- {
-	if(!function_exists('curl_init'))
-	{
-		echo error(i18n("CURL Support Missing"));
-		echo notice(i18n("Your PHP installation does not support CURL.  You will need to have CURL support added by your system administrator before being able to access external award sources"));
-		$links=false;
-	}
-	else
-		$links=true;
-
-	 $q=mysql_query("SELECT award_awards.id, 
-	 			award_awards.name AS awardname,
-				 award_sources.name AS sourcename
-	 			FROM 
-					award_awards 
-				JOIN award_sources ON award_awards.award_sources_id=award_sources.id
-				WHERE award_sources.enabled='yes' 
-                AND award_awards.year={$config['FAIRYEAR']}
-				ORDER BY award_sources.name, award_awards.name");
-				echo mysql_error();
-	 echo "<table class=\"tableview\">";
-	 echo "<tr><th>".i18n("Award Name")."</th>";
-	 echo "<th>".i18n("Source Name")."</th>";
-	 echo "<th>".i18n("Send")."</th>";
-	 echo "</tr>";
-	 while($r=mysql_fetch_object($q)) {
-		echo "<tr>";
-		echo "<td>$r->awardname</td>\n";
-		echo "<td>$r->sourcename</td>";
-		echo "<td align=\"center\">";
-		if($links)
-			echo "<a href=\"award_upload.php?action=send&send[]=$r->id\">".i18n("send")."</a>";
-		else
-			echo "n/a";
-		echo "</td>";
-		echo "</tr>";
-		$sendurl.="&send[]=$r->id";
-	 }
-	 echo "</table>\n";
-	 echo "<br />";
-	 
-	 if($links)
-		 echo "<a href=\"award_upload.php?action=send$sendurl\">".i18n("Send all awards")."</a>";
-
- }
- send_footer();
+?>
+<script type="text/javascript">
+function award_upload(id)
+{
+	$("#award_upload_status").load("<?=$_SERVER['PHP_SELF']?>?action=award_upload&id="+id);
+}
+
+
+
+</script>
+<?
+
+
+if(!function_exists('curl_init')) {
+	echo error(i18n("CURL Support Missing"));
+	echo notice(i18n("Your PHP installation does not support CURL.  You will need to have CURL support added by your system administrator before being able to access external award sources"));
+	send_footer();
+	exit;
+}
+
+$q = mysql_query("SELECT award_awards.id, award_awards.name AS awardname,
+			  fairs.name as fairname, award_sourcE_fairs_id FROM award_awards 
+			LEFT JOIN fairs ON fairs.id=award_awards.award_source_fairs_id 
+			WHERE award_awards.award_source_fairs_id IS NOT NULL
+				AND award_awards.year='{$config['FAIRYEAR']}'
+			ORDER BY fairs.name, award_awards.name");
+echo mysql_error();
+
+?>
+
+<table class="tableview">
+<tr><th><?=i18n("Award Name")?></th>
+<th><?=i18n("Source Name")?></th>
+<th><?=i18n("Send")?></th>
+</tr>
+<?
+while($r=mysql_fetch_object($q)) {
+	echo "<tr><td>{$r->awardname}</td>\n";
+	echo "<td>{$r->fairname}</td>";
+	echo "<td align=\"center\">";
+	echo "<a href=\"#\" onClick=\"award_upload({$r->id})\" >".i18n("send")."</a>";
+	echo "</td></tr>";
+}
+?>
+</table>
+<br />
+
+<a href="award_upload.php?action=send<?=$sendurl?>"><?=i18n("Send all awards")?></a>
+<div id="award_upload_status"></div>
+<?
+send_footer();
 ?>