Various updates. Take screenshot of page. class-ify stuff