Added error checking in commented-out code to pull directly from wikipedia