Heather mucking about... removed a bunch of stuff, added some stuff