Oops, left some debug code in there.