added a bit more of the goal infrastructure