Added goal add, subgoal linking...