Added goals + yaml formatting