Refactors crawling - wip