First checkin of Autumn 2012 code