merge wilfred and ccollins

woot!