Moved goals to end of doc