Added an extremely shameful way of handling goals + keywords