Adding better html grabbing