Add fold-this and company