add goals but its not perfect yet