Samer Al-Kiswany, University of Waterloo