Matt's commit

Matt was here! (albeit only a few minutes before the meeting : p)