Complete revamp; Use BeautifulSoup instead of REs