finished v1 of wikify