Yung's branch

Hey Rich have all of interation 1 done, and we have applied andrew's pretty front-end.