View simplfications
First pass at pupa scrape integration
Added some tests