Yolo commit: partially done with fundraiser edit