Made changes to tasks did a 'merge' with Matt and Conor