More/edited files from Caroline and Kate for lab8