Add goal_met? calculations