Refactor how goals work some