Added lotsa scrapey stuff
Working more on oracle, currently buggy
Fixed scope issues