Added wikipedia functionality, all working now