Put goals section into include file + revisions