wip
Tidy up
Wrapped some tests around crawler
Progress
Removed a load of guff
Something, kinda working