basic working version with beautiful soup
fixed conflicts